diff --git a/DungeonWorldSpanish/DungeonWorldSpanish.html b/DungeonWorldSpanish/DungeonWorldSpanish.html
index 05bf24b174..ebca41f2fe 100644
--- a/DungeonWorldSpanish/DungeonWorldSpanish.html
+++ b/DungeonWorldSpanish/DungeonWorldSpanish.html
@@ -6,7 +6,7 @@
 <div class="sheet-statistics">
 	<div class="sheet-header">
 		<div class="sheet-section-name">Daño</div>
-		<button type='roll' name='roll_RollDamage' value='/me tira un [[1@{dtype}]] para daño.'></button>
+		<button type='roll' name='roll_RollDamage' value='&{template:default} {{name=Tirada de Daño}} {{Resultado=[[1@{dtype}]]}}'></button>
 		<input type="text" name="attr_dtype">
 	</div>
 	<div class="sheet-header">
@@ -54,7 +54,7 @@
 
 		<div class="sheet-row-3">
 			<input type="number" name="attr_strmod" value="round(0.00072*(@{strength}*@{strength}*@{strength}) - 0.025*(@{strength}*@{strength}) + 0.6 * @{strength} - 4.35) - @{weak}" disabled="true">
-			<button type="roll" name="roll_TestStrength" value="/me tira un [[2d6 + @{strmod}]] en FUE."></button>
+			<button type="roll" name="roll_TestStrength" value="&{template:default} {{name=Tirada de Fuerza}} {{Resultado=[[2d6 + @{strmod}]]}}"></button>
 		</div>
 
 		<label class="sheet-bottom" for="attr_strmod">FUE</label>
@@ -75,7 +75,7 @@
 
 		<div class="sheet-row-3">
 			<input type="number" name="attr_dexmod" value="round(0.00072*(@{dexterity}*@{dexterity}*@{dexterity}) - 0.025*(@{dexterity}*@{dexterity}) + 0.6 * @{dexterity} - 4.35) - @{shaky}" disabled="true">
-			<button type="roll" name="roll_TestDexterity" value="/me tira un [[2d6 + @{dexmod}]] en DES."></button>
+			<button type="roll" name="roll_TestDexterity" value="&{template:default} {{name=Tirada de Destreza}} {{Resultado=[[2d6 + @{dexmod}]]}}"></button>
 		</div>
 
 		<label class="sheet-bottom" for="attr_dexmod">DES</label>
@@ -96,7 +96,7 @@
 
 		<div class="sheet-row-3">
 			<input type="number" name="attr_conmod" value="round(0.00072*(@{constitution}*@{constitution}*@{constitution}) - 0.025*(@{constitution}*@{constitution}) + 0.6 * @{constitution} - 4.35) - @{sick}" disabled="true">
-			<button type="roll" name="roll_TestConstitution" value="/me tira un [[2d6 + @{conmod}]] en CON."></button>
+			<button type="roll" name="roll_TestConstitution" value="&{template:default} {{name=Tirada de Constitución}} {{Resultado=[[2d6 + @{conmod}]]}}"></button>
 		</div>
 
 		<label class="sheet-bottom" for="attr_conmod">CON</label>
@@ -117,7 +117,7 @@
 
 		<div class="sheet-row-3">
 			<input type="number" name="attr_intmod" value="round(0.00072*(@{intelligence}*@{intelligence}*@{intelligence}) - 0.025*(@{intelligence}*@{intelligence}) + 0.6 * @{intelligence} - 4.35) - @{stunned}" disabled="true">
-			<button type="roll" name="roll_TestIntelligence" value="/me tira un [[2d6 + @{intmod}]] en INT."></button>
+			<button type="roll" name="roll_TestIntelligence" value="&{template:default} {{name=Tirada de Inteligencia}} {{Resultado=[[2d6 + @{intmod}]]}}"></button>
 		</div>
 
 		<label class="sheet-bottom" for="attr_intmod">INT</label>
@@ -138,7 +138,7 @@
 
 		<div class="sheet-row-3">
 			<input type="number" name="attr_wismod" value="round(0.00072*(@{wisdom}*@{wisdom}*@{wisdom}) - 0.025*(@{wisdom}*@{wisdom}) + 0.6 * @{wisdom} - 4.35) - @{confused}" disabled="true">
-			<button type="roll" name="roll_TestWisdom" value="/me tira un [[2d6 + @{wismod}]] en SAB."></button>
+			<button type="roll" name="roll_TestWisdom" value="&{template:default} {{name=Tirada de Sabiduría}} {{Resultado=[[2d6 + @{wismod}]]}}"></button>
 		</div>
 
 		<label class="sheet-bottom" for="attr_wismod">SAB</label>
@@ -159,7 +159,7 @@
 
 		<div class="sheet-row-3">
 			<input type="number" name="attr_chamod" value="round(0.00072*(@{charisma}*@{charisma}*@{charisma}) - 0.025*(@{charisma}*@{charisma}) + 0.6 * @{charisma} - 4.35) - @{scarred}" disabled="true">
-			<button type="roll" name="roll_TestCharisma" value="/me tira un [[2d6 + @{chamod}]] en CAR."></button>
+			<button type="roll" name="roll_TestCharisma" value="&{template:default} {{name=Tirada de Carisma}} {{Resultado=[[2d6 + @{chamod}]]}}"></button>
 		</div>
 
 		<label class="sheet-bottom" for="attr_chamod">CAR</label>