diff --git a/Estirpe de Whitehall/Estirpe-de-Whitehall.html b/Estirpe de Whitehall/Estirpe-de-Whitehall.html
index c6475720bb..808ae0cf11 100644
--- a/Estirpe de Whitehall/Estirpe-de-Whitehall.html	
+++ b/Estirpe de Whitehall/Estirpe-de-Whitehall.html	
@@ -80,7 +80,7 @@
 	            
 				<div class="cell-encabezado">Da&ntilde;o<hr>
 					<select name="attr_ROLLTODMG" style="background-color: #fff7e6;">
-					   <option value="1,[[1d6cs2cs4cs6cf7]]|2,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|3,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|4,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|5,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|6,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|7,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]]|8,[[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]} y recuerda que por cada resultado **par** debes tachar una casilla de INC">Con un arma cuerpo a cuerpo</option>
+					   <option value="1,[[1d6cs2cs4cs6cf7]]|2,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|3,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|4,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|5,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|6,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|7,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|8,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]} y recuerda que por cada resultado **par** debes tachar una casilla de INC">Con un arma cuerpo a cuerpo</option>
 					   <option value="1,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|2,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|3,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|4,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs1cf4)*((1d3cs4cf5)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|5,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|6,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|7,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]]|8,[[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] [[(2)*((1d3cs4cf5)*((1d2cs2cf3)-1))]] y recuerda que por cada resultado **par** debes tachar una casilla de INC}">Desarmado (No letal)</option>
 					   <option value="1,[[1d16cs17cf18>5]]|2,[[2d16cs17cf18>5]]|3,[[3d16cs17cf18>5]]|4,[[4d16cs17cf18>5]]|5,[[5d16cs17cf18>5]]|6,[[6d16cs17cf18>5]]|7,[[7d16cs17cf18>5]]|8,[[8d16cs17cf18>5]]} casillas de INC">Para incapacitar</option>
 					</select>&nbsp;<button type="roll" name="roll_todmg" class="d6-button" value="&{template:default} {{name=@{character_name} intenta infligir daño a su oponente}} {{El objetivo debe tachar esta/s casilla/s=?{Dados totales|@{ROLLTODMG} }} "></button>
@@ -118,7 +118,7 @@
 			</div>
             <div class="cell-encabezado">Iniciativa&nbsp;<input type="number" name="attr_INIAAFF" class="charstat" value="(@{COMBATEAAFF} + @{FISICO})" disabled="true" />&nbsp;<button type="roll" name="determinar-INI" class="initiative-button" value="@{character_name} participa con INI [[(?{Acción|Arma preparada (disparar),@{combateaaff}+2|Disparar,@{combateaaff}|Acción no de combate,@{FISICO}} + @{FISICO}) &{tracker}]]"></button>				
 			</div>
-            <div class="cell-encabezado">Da&ntilde;o&nbsp;<button type="roll" name="roll_dmgaaff" class="d6-button" value="&{template:default} {{name=@{character_name} inflige daño a su oponente}} {{El objetivo tacha esta/s casilla/s=?{Cantidad total de dados|1,[[1d6cs2cs4cs6cf7]]|2,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|3,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|4,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|5,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|6,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|7,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|8,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]} + ?{Trauma|6,[[1d1+5]]|4/6,[[1d1+3]] [[1d1+5]]} y recuerda que por cada resultado **par** debes tachar una casilla de INC}}"></button>	
+            <div class="cell-encabezado">Da&ntilde;o&nbsp;<button type="roll" name="roll_dmgaaff" class="d6-button" value="&{template:default} {{name=@{character_name} inflige daño a su oponente}} {{El objetivo tacha esta/s casilla/s=?{Cantidad total de dados|1,[[1d6cs2cs4cs6cf7]]|2,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|3,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|4,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|5,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|6,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|7,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]|8,[[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]] [[1d6cs2cs4cs6cf7]]} + ?{Trauma|6,[[1d1+5]]|4/6,[[1d1+3]] [[1d1+5]]} y recuerda que por cada resultado **par** debes tachar una casilla de INC}}"></button>	
 			</div>					
 
 			<div class="invisiblediv" style="text-align: center; border: 0px; grid-column: span 3; display: grid; grid-template-columns: 3fr 1fr 1fr 1fr 3fr 1fr 1fr;">	
@@ -197,7 +197,7 @@
 		<div class="invisiblediv cell-encabezado" style="display: grid; grid-template-columns: 40fr 15fr ; padding-bottom: 5px; boder: 0px;">	
 				<div class="">Tensión mental
 				</div>
-				<div class="">Sufrir un impacto&nbsp;<button type="roll" name="roll_TENSION" class="d6-button" value="&{template:default} {{name=@{character_name} sufre un impacto a su Estabilidad Mental}} {{Debes marcar estas casillas=?{Cantidad total de dados|1,[[1d6cs7cf8]]|2,[[1d6cs7cf8]] [[1d6cs7cf8]]|3,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|4,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|5,[[1d6cs7cf8]] [1d6cs7cf8] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|6,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|7,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|8,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]} }}"></button>
+				<div class="">Sufrir un impacto&nbsp;<button type="roll" name="roll_TENSION" class="d6-button" value="&{template:default} {{name=@{character_name} sufre un impacto a su Estabilidad Mental}} {{Debes marcar estas casillas=?{Cantidad total de dados|1,[[1d6cs7cf8]]|2,[[1d6cs7cf8]] [[1d6cs7cf8]]|3,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|4,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|5,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|6,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|7,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]|8,[[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]] [[1d6cs7cf8]]} }}"></button>
 				</div>
 		</div>