diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index f4bc17ae7a..760b8d1750 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -1731,7 +1731,7 @@
 					<input type="text" name="attr_powerDice01" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll01" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll01" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName01} - @{powerEffect01}}} {{desc=@{powerText01}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll01}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice01}]]}} {{END=[[@{powerEND01}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll01" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName01} - @{powerEffect01}}} {{desc=@{powerText01}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll01}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice01}]]}} {{END=[[@{powerEND01}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-left">
 					<h1>Base CP:</h1>
@@ -1793,7 +1793,7 @@
 					<input type="text" name="attr_powerDice02" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll02" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll02" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName02} - @{powerEffect02}}} {{desc=@{powerText02}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll02}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice02}]]}} {{END=[[@{powerEND02}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll02" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName02} - @{powerEffect02}}} {{desc=@{powerText02}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll02}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice02}]]}} {{END=[[@{powerEND02}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-left">
 					<h1>Base CP:</h1>
@@ -1855,7 +1855,7 @@
 					<input type="text" name="attr_powerDice03" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll03" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll03" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName03} - @{powerEffect03}}} {{desc=@{powerText03}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll03}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice03}]]}} {{END=[[@{powerEND03}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll03" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName03} - @{powerEffect03}}} {{desc=@{powerText03}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll03}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice03}]]}} {{END=[[@{powerEND03}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-left">
 					<h1>Base CP:</h1>
@@ -1917,7 +1917,7 @@
 					<input type="text" name="attr_powerDice04" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll04" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll04" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName04} - @{powerEffect04}}} {{desc=@{powerText04}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll04}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice04}]]}} {{END=[[@{powerEND04}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll04" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName04} - @{powerEffect04}}} {{desc=@{powerText04}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll04}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice04}]]}} {{END=[[@{powerEND04}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-left">
 					<h1>Base CP:</h1>
@@ -1979,7 +1979,7 @@
 					<input type="text" name="attr_powerDice05" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll05" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll05" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName05} - @{powerEffect05}}} {{desc=@{powerText05}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll05}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice05}]]}} {{END=[[@{powerEND05}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll05" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName05} - @{powerEffect05}}} {{desc=@{powerText05}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll05}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice05}]]}} {{END=[[@{powerEND05}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-left">
 					<h1>Base CP:</h1>
@@ -2044,7 +2044,7 @@
 					<input type="text" name="attr_powerDice06" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll06" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll06" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName06} - @{powerEffect06}}} {{desc=@{powerText06}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll06}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice06}]]}} {{END=[[@{powerEND06}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll06" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName06} - @{powerEffect06}}} {{desc=@{powerText06}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll06}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice06}]]}} {{END=[[@{powerEND06}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-right">
 					<h1>Base CP:</h1>
@@ -2106,7 +2106,7 @@
 					<input type="text" name="attr_powerDice07" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll07" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll07" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName07} - @{powerEffect07}}} {{desc=@{powerText07}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll07}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice07}]]}} {{END=[[@{powerEND07}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll07" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName07} - @{powerEffect07}}} {{desc=@{powerText07}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll07}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice07}]]}} {{END=[[@{powerEND07}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-right">
 					<h1>Base CP:</h1>
@@ -2168,7 +2168,7 @@
 					<input type="text" name="attr_powerDice08" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll08" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll08" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName08} - @{powerEffect08}}} {{desc=@{powerText08}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll08}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice08}]]}} {{END=[[@{powerEND08}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll08" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName08} - @{powerEffect08}}} {{desc=@{powerText08}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll08}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice08}]]}} {{END=[[@{powerEND08}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-right">
 					<h1>Base CP:</h1>
@@ -2230,7 +2230,7 @@
 					<input type="text" name="attr_powerDice09" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll09" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll09" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName09} - @{powerEffect09}}} {{desc=@{powerText09}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll09}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice09}]]}} {{END=[[@{powerEND09}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll09" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName09} - @{powerEffect09}}} {{desc=@{powerText09}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll09}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice09}]]}} {{END=[[@{powerEND09}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-right">
 					<h1>Base CP:</h1>
@@ -2292,7 +2292,7 @@
 					<input type="text" name="attr_powerDice10" value="0d6" maxlength="16"/>
 					<h1>Roll:</h1>
 					<input type="number" name="attr_powerSkillRoll10" value="18" min="0" max="30"/>
-					<button type="roll" class="button buttonRollPower" name="roll_powerRoll10" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName10} - @{powerEffect10}}} {{desc=@{powerText10}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll10}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice10}]]}} {{END=[[@{powerEND10}]]}}">Roll</button>
+					<button type="roll" class="button buttonRollPower" name="roll_powerRoll10" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName10} - @{powerEffect10}}} {{desc=@{powerText10}}} {{Activate On = [[?{Modifiers|0}+@{powerSkillRoll10}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Attack Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice10}]]}} {{END=[[@{powerEND10}]]}}">Roll</button>
 				</div>
 				<div class="subitem-flex-power-active-cost-right">
 					<h1>Base CP:</h1>