diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index c70494add0..9329533aad 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -1642,19 +1642,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-left">
 					<input type="text" name="attr_powerName01" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP01" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-left">
-					<input type="text" name="attr_powerEffect01" maxlength="25"/>
-					<input type="text" name="attr_powerDice01" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll01" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName01} - @{powerEffect01}}} {{desc=@{powerText01}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice01}]]}} {{END=[[@{powerEND01}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-left" name="act_buttonPower01">END:</button><br>
-					<input type="number" name="attr_powerEND01" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select">
 						<select name="attr_powerType01">
 							<option value="single" selected>Single Power</option>
@@ -1664,13 +1651,25 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost01" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost01" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll01" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName01} - @{powerEffect01}}} {{desc=@{powerText01}}} {{Activate On = [[@{powerSkillRoll01}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice01}]]}} {{END=[[@{powerEND01}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-left" name="act_buttonPower01">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-left">
+					<input type="text" name="attr_powerEffect01" maxlength="25"/>
+					<input type="text" name="attr_powerDice01" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll01" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND01" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-left">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost01" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost01" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP01" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-left">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages01" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
@@ -1705,19 +1704,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-left">
 					<input type="text" name="attr_powerName02" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP02" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-left">
-					<input type="text" name="attr_powerEffect02" maxlength="25"/>
-					<input type="text" name="attr_powerDice02" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll02" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName02} - @{powerEffect02}}} {{desc=@{powerText02}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice02}]]}} {{END=[[@{powerEND02}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-left" name="act_buttonPower02">END:</button><br>
-					<input type="number" name="attr_powerEND02" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select">
 						<select name="attr_powerType02">
 							<option value="single" selected>Single Power</option>
@@ -1727,13 +1713,25 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost02" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost02" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll02" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName02} - @{powerEffect02}}} {{desc=@{powerText02}}} {{Activate On = [[@{powerSkillRoll02}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice02}]]}} {{END=[[@{powerEND02}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-left" name="act_buttonPower02">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-left">
+					<input type="text" name="attr_powerEffect02" maxlength="25"/>
+					<input type="text" name="attr_powerDice02" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll02" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND02" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-left">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost02" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost02" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP02" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-left">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages02" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
@@ -1768,19 +1766,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-left">
 					<input type="text" name="attr_powerName03" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP03" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-left">
-					<input type="text" name="attr_powerEffect03" maxlength="25"/>
-					<input type="text" name="attr_powerDice03" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll03" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName03} - @{powerEffect03}}} {{desc=@{powerText03}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice03}]]}} {{END=[[@{powerEND03}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-left" name="act_buttonPower03">END:</button><br>
-					<input type="number" name="attr_powerEND03" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select">
 						<select name="attr_powerType03">
 							<option value="single" selected>Single Power</option>
@@ -1790,13 +1775,25 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost03" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost03" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll03" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName03} - @{powerEffect03}}} {{desc=@{powerText03}}} {{Activate On = [[@{powerSkillRoll03}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice03}]]}} {{END=[[@{powerEND03}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-left" name="act_buttonPower03">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-left">
+					<input type="text" name="attr_powerEffect03" maxlength="25"/>
+					<input type="text" name="attr_powerDice03" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll03" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND03" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-left">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost03" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost03" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP03" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-left">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages03" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
@@ -1831,19 +1828,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-left">
 					<input type="text" name="attr_powerName04" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP04" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-left">
-					<input type="text" name="attr_powerEffect04" maxlength="25"/>
-					<input type="text" name="attr_powerDice04" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll04" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName04} - @{powerEffect04}}} {{desc=@{powerText04}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice04}]]}} {{END=[[@{powerEND04}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-left" name="act_buttonPower04">END:</button><br>
-					<input type="number" name="attr_powerEND04" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select">
 						<select name="attr_powerType04">
 							<option value="single" selected>Single Power</option>
@@ -1853,13 +1837,25 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost04" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost04" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll04" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName04} - @{powerEffect04}}} {{desc=@{powerText04}}} {{Activate On = [[@{powerSkillRoll04}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice04}]]}} {{END=[[@{powerEND04}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-left" name="act_buttonPower04">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-left">
+					<input type="text" name="attr_powerEffect04" maxlength="25"/>
+					<input type="text" name="attr_powerDice04" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll04" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND04" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-left">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost04" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost04" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP04" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-left">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages04" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
@@ -1894,19 +1890,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-left">
 					<input type="text" name="attr_powerName05" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP05" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-left">
-					<input type="text" name="attr_powerEffect05" maxlength="25"/>
-					<input type="text" name="attr_powerDice05" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll05" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName05} - @{powerEffect05}}} {{desc=@{powerText05}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice05}]]}} {{END=[[@{powerEND05}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-left" name="act_buttonPower05">END:</button><br>
-					<input type="number" name="attr_powerEND05" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select">
 						<select name="attr_powerType05">
 							<option value="single" selected>Single Power</option>
@@ -1916,13 +1899,25 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost05" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost05" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll05" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName05} - @{powerEffect05}}} {{desc=@{powerText05}}} {{Activate On = [[@{powerSkillRoll05}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice05}]]}} {{END=[[@{powerEND05}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-left" name="act_buttonPower05">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-left">
+					<input type="text" name="attr_powerEffect05" maxlength="25"/>
+					<input type="text" name="attr_powerDice05" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll05" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND05" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-left">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost05" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost05" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP05" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-left">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages05" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
@@ -1960,19 +1955,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-right">
 					<input type="text" name="attr_powerName06" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP06" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-right">
-					<input type="text" name="attr_powerEffect06" maxlength="25"/>
-					<input type="text" name="attr_powerDice06" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll06" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName06} - @{powerEffect06}}} {{desc=@{powerText06}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice06}]]}} {{END=[[@{powerEND06}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-right" name="act_buttonPower06">END:</button><br>
-					<input type="number" name="attr_powerEND06" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select-alternate">
 						<select name="attr_powerType06">
 							<option value="single" selected>Single Power</option>
@@ -1982,19 +1964,31 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost06" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost06" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll06" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName06} - @{powerEffect06}}} {{desc=@{powerText06}}} {{Activate On = [[@{powerSkillRoll06}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice06}]]}} {{END=[[@{powerEND06}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-right" name="act_buttonPower06">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-right">
+					<input type="text" name="attr_powerEffect06" maxlength="25"/>
+					<input type="text" name="attr_powerDice06" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll06" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND06" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-right">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost06" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost06" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP06" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-right">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages06" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
 					<input type="number" name="attr_powerLimitations06" min="0" value="0" step="0.25" />
 					<h1>END:</h1>
-					<div class="custom-select-alternate">
+					<div class="custom-select">
 						<select name="attr_powerReducedEND06">
 							<option value="noEND">None</option>
 							<option value="costsENDhalf">Costs END (half)</option>
@@ -2023,19 +2017,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-right">
 					<input type="text" name="attr_powerName07" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP07" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-right">
-					<input type="text" name="attr_powerEffect07" maxlength="25"/>
-					<input type="text" name="attr_powerDice07" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll07" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName07} - @{powerEffect07}}} {{desc=@{powerText07}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice07}]]}} {{END=[[@{powerEND07}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-right" name="act_buttonPower07">END:</button><br>
-					<input type="number" name="attr_powerEND07" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select-alternate">
 						<select name="attr_powerType07">
 							<option value="single" selected>Single Power</option>
@@ -2045,19 +2026,31 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost07" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost07" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll07" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName07} - @{powerEffect07}}} {{desc=@{powerText07}}} {{Activate On = [[@{powerSkillRoll07}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice07}]]}} {{END=[[@{powerEND07}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-right" name="act_buttonPower07">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-right">
+					<input type="text" name="attr_powerEffect07" maxlength="25"/>
+					<input type="text" name="attr_powerDice07" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll07" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND07" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-right">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost07" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost07" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP07" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-right">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages07" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
 					<input type="number" name="attr_powerLimitations07" min="0" value="0" step="0.25" />
 					<h1>END:</h1>
-					<div class="custom-select-alternate">
+					<div class="custom-select">
 						<select name="attr_powerReducedEND07">
 							<option value="noEND">None</option>
 							<option value="costsENDhalf">Costs END (half)</option>
@@ -2086,19 +2079,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-right">
 					<input type="text" name="attr_powerName08" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP08" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-right">
-					<input type="text" name="attr_powerEffect08" maxlength="25"/>
-					<input type="text" name="attr_powerDice08" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll08" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName08} - @{powerEffect08}}} {{desc=@{powerText08}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice08}]]}} {{END=[[@{powerEND08}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-right" name="act_buttonPower08">END:</button><br>
-					<input type="number" name="attr_powerEND08" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select-alternate">
 						<select name="attr_powerType08">
 							<option value="single" selected>Single Power</option>
@@ -2108,19 +2088,31 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost08" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost08" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll08" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName08} - @{powerEffect08}}} {{desc=@{powerText08}}} {{Activate On = [[@{powerSkillRoll08}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice08}]]}} {{END=[[@{powerEND08}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-right" name="act_buttonPower08">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-right">
+					<input type="text" name="attr_powerEffect08" maxlength="25"/>
+					<input type="text" name="attr_powerDice08" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll08" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND08" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-right">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost08" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost08" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP06" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-right">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages08" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
 					<input type="number" name="attr_powerLimitations08" min="0" value="0" step="0.25" />
 					<h1>END:</h1>
-					<div class="custom-select-alternate">
+					<div class="custom-select">
 						<select name="attr_powerReducedEND08">
 							<option value="noEND">None</option>
 							<option value="costsENDhalf">Costs END (half)</option>
@@ -2149,19 +2141,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-right">
 					<input type="text" name="attr_powerName09" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP09" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-right">
-					<input type="text" name="attr_powerEffect09" maxlength="25"/>
-					<input type="text" name="attr_powerDice09" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll09" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName09} - @{powerEffect09}}} {{desc=@{powerText09}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice09}]]}} {{END=[[@{powerEND09}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-right" name="act_buttonPower09">END:</button><br>
-					<input type="number" name="attr_powerEND09" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select-alternate">
 						<select name="attr_powerType09">
 							<option value="single" selected>Single Power</option>
@@ -2171,19 +2150,31 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost09" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost09" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll09" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName09} - @{powerEffect09}}} {{desc=@{powerText09}}} {{Activate On = [[@{powerSkillRoll09}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice09}]]}} {{END=[[@{powerEND09}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-right" name="act_buttonPower09">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-right">
+					<input type="text" name="attr_powerEffect09" maxlength="25"/>
+					<input type="text" name="attr_powerDice09" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll09" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND09" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-right">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost09" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost09" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP09" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-right">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages09" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
 					<input type="number" name="attr_powerLimitations09" min="0" value="0" step="0.25" />
 					<h1>END:</h1>
-					<div class="custom-select-alternate">
+					<div class="custom-select">
 						<select name="attr_powerReducedEND09">
 							<option value="noEND">None</option>
 							<option value="costsENDhalf">Costs END (half)</option>
@@ -2212,19 +2203,6 @@
 			<div class="item-flex-power">
 				<div class="subitem-flex-power-heading-right">
 					<input type="text" name="attr_powerName10" maxlength="35"/>
-					<h1>Real CP:</h1>
-					<input type="number" name="attr_powerCP10" value="0" min="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-effect-right">
-					<input type="text" name="attr_powerEffect10" maxlength="25"/>
-					<input type="text" name="attr_powerDice10" value="0d6" maxlength="16"/>
-					
-					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll10" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName10} - @{powerEffect10}}} {{desc=@{powerText10}}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice10}]]}} {{END=[[@{powerEND10}]]}}">Roll</button>
-					
-					<button type="action" class="button button-Power-END-right" name="act_buttonPower10">END:</button><br>
-					<input type="number" name="attr_powerEND10" value="0" readonly/>
-				</div>
-				<div class="subitem-flex-power-activeCost">
 					<div class="custom-select-alternate">
 						<select name="attr_powerType10">
 							<option value="single" selected>Single Power</option>
@@ -2234,19 +2212,31 @@
 							<option value="powerPool">Power Pool</option>
 						</select>
 					</div>
-					
-					<h1>Base:</h1>
-					<input type="number" name="attr_powerBaseCost10" min="0" value="0" />
-					<h1>Active:</h1>
-					<input type="number" name="attr_powerActiveCost10" min="0" value="0" readonly/>
+					<button type="roll" class="button button-Power-Roll" name="roll_powerRoll10" value="&{template:custom-power-attack} {{title=@{character_name} - @{character_title}}} {{subtitle= @{powerName10} - @{powerEffect10}}} {{desc=@{powerText10}}} {{Activate On = [[@{powerSkillRoll10}]] **or less**}} {{Success Roll=[[3d6cf<0cs>0]]}} {{Effect Roll=[[@{hiddenPowerDice10}]]}} {{END=[[@{powerEND10}]]}}">Roll</button>
+					<button type="action" class="button button-Power-END-right" name="act_buttonPower10">END</button>
 				</div>
-				<div class="subitem-flex-power-limitations">
+				<div class="subitem-flex-power-effect-right">
+					<input type="text" name="attr_powerEffect10" maxlength="25"/>
+					<input type="text" name="attr_powerDice10" value="0d6" maxlength="16"/>
+					<h1>Skill:</h1>
+					<input type="number" name="attr_powerSkillRoll10" value="18" min="0" max="30"/>
+					<input type="number" name="attr_powerEND10" value="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-active-cost-right">
+					<h1>Base CP:</h1>
+					<input type="number" name="attr_powerBaseCost10" min="0" value="0" />
+					<h1>Active CP:</h1>
+					<input type="number" name="attr_powerActiveCost10" min="0" value="0" readonly/>
+					<h1>Real CP:</h1>
+					<input type="number" name="attr_powerCP10" value="0" min="0" readonly/>
+				</div>
+				<div class="subitem-flex-power-limitations-right">
 					<h1>Adv:</h1>
 					<input type="number" name="attr_powerAdvantages10" min="0" value="0" step="0.25"/>
 					<h1>Lim:</h1>
 					<input type="number" name="attr_powerLimitations10" min="0" value="0" step="0.25" />
 					<h1>END:</h1>
-					<div class="custom-select-alternate">
+					<div class="custom-select">
 						<select name="attr_powerReducedEND10">
 							<option value="noEND">None</option>
 							<option value="costsENDhalf">Costs END (half)</option>