diff --git a/Rotted Capes/RottedCapes.html b/Rotted Capes/RottedCapes.html
index 39fedcf3c5..f0ee6e4653 100644
--- a/Rotted Capes/RottedCapes.html	
+++ b/Rotted Capes/RottedCapes.html	
@@ -1,4 +1,3 @@
-
 <!-- ******* HEADER **************** -->
 
 <div  class="sheet-3colrow" width="100%">
@@ -6,7 +5,7 @@
     <div class="sheet-col">
         <div class="sheet-input">
             <div class="sheet-input-name"></div>
-			<input type="text" name="attr_Hero_Name" title="The Character's Name" />
+			<input type="text" name="attr_Hero_Name" readonly value="@{character_name}" title="The Character's Name" style="font-weight:bold;" />
         </div>
     </div>
     <div class="sheet-col" align="center" style="margin-top: 10px;">
@@ -18,10 +17,11 @@
 </div>
 
 <!-- ******* BODY **************** -->
-<div style="min-width: 900px;"> <!-- Note: min width is needed as on chrome the information image wraps to the next row and the invisible checkbox stays behind; this creates the impression it does not work -->
+<div> 
+
+	<input type="checkbox" name="attr_roll-toggle" class="sheet-roll-semiprivate" value="0" title="check to make roll details, such as modifiers, private" /><Span class="sheet-block-text"> Hide Roll Details (Cast Members)</span><br>
+	<input type="checkbox" class="sheet-block-switch" name="attr_selectview" title="Check for a single page, cast member view."> <Span class="sheet-block-text">Cast Member View</span><br>
 
-	<input type="checkbox" class="sheet-block-switch" name="attr_selectview" title="Check for a single page, cast member view."> <Span class="sheet-block-text">Switch to Cast Member View</span>
-	
 	<!-- ************************************** Main Characters and NPC's ************************************** -->
 
 	<div class="sheet-block-a">
@@ -35,86 +35,10 @@
 		<input type="radio" name="attr_page" class="sheet-tab sheet-tab6" value="6"  /><span class="sheet-tab sheet-tab6">Advancement</span>
 
 		<hr class="sheet-two" width="100%"/>
-	
+				
 		<!-- TAB 1: Character Details -->
 		<div class="sheet-section sheet-section-pc1">
-
-			<!--All-Purpose Action Roller -->
-			<div class="sheet-header">All-Purpose Action Roller</div>
-				<div class="sheet-subsection"> 	<!-- Beginning of generic roll subsection -->
-					<table>			
-						<tbody>	
-							<tr>					
-								<th class="sheet-width-W40"><h3 class="sheet-header-override">Roll Name</h3></th>
-								<th class="sheet-width-W10"><h3 class="sheet-header-override">Action</h3></th>
-								<th class="sheet-width-W10"><h3 class="sheet-header-override">Attribute Dice</h3></th>
-								<th class="sheet-width-W7"><h3>Rank</h3></th>
-								<th class="sheet-width-W7"><h3>Foci Mod</h3></th>
-								<th class="sheet-width-W7"><h3>Pow Mod</h3></th>
-								<th class="sheet-width-W7"><h3>Adv Mod</h3></th>	
-								<th class="sheet-width-W7"><h3>Circ Mod</h3></th>
-								<th class="sheet-width-W5"><h3>Roll</h3></th>					
-							</tr>
-						</tbody>
-						<tbody>
-							<tr>
-								<td class="sheet-width-W40"><input class="sheet-width-W95" type="text" name="attr_GRoll_Name" title="What do you want to call this roll?"/></td>	
-								<td class="sheet-width-W10">
-									<select class="sheet-width-W95 sheet-dropdown" name="attr_GAction" value="0" title="Select the type of action." >
-									<option value="0" selected="true"></option>
-									<option value="Skill">Skill</option>
-									<option value="Power">Power</option>
-									<option value="Attribute">Attribute</option>
-									<option value="Attack">Attack</option>
-									<option value="Other Action">Other Action</option>
-									</select>
-								</td>						
-								<td class="sheet-width-W10"><select class="sheet-select-attr sheet-width-W95" name="attr_GRDice" value="1D6!"  
-									title="Defaults to 0; select the dice according to the attribute plus any die bumps.">
-									<option value="1d0" selected="true">None</option>
-									<option value="1D4!">1d4</option> 
-									<option value="1D6!" >1D6</option>
-									<option value="1D8!">1D8</option>
-									<option value="1D10!">1D10</option>
-									<option value="1D12!">1D12</option>
-									<option value="1D12!+1d4!">1D12+1d4</option>
-									<option value="1D12!+1d6!">1D12+1d6</option>
-									<option value="1D12!+1d8!">1D12+1d8</option>
-									<option value="1D12!+1d10!">1D12+1d10</option>
-									<option value="2D12!">2D12</option>
-									<option value="2D12!+1d4!">2D12+1d4</option>
-									<option value="2D12!+1d6!">2D12+1d6</option>
-									<option value="2D12!+1d8!">2D12+1d8</option>
-									<option value="2D12!+1d10!">2D12+1d10</option>
-									<option value="3D12!">3D12</option>
-									<option value="3D12!+1d4!">3D12+1d4</option>
-									<option value="3D12!+1d6!">3D12+1d6</option>
-									<option value="3D12!+1d8!">3D12+1d8</option>
-									<option value="3D12!+1d10!">3D12+1d10</option>
-									<option value="4D12!">4D12</option>
-									<option value="4D12!+1d4!">4D12+1d4</option>
-									<option value="4D12!+1d6!">4D12+1d6</option>
-									<option value="4D12!+1d8!">4D12+1d8</option>
-									<option value="4D12!+1d10!">4D12+1d10</option>
-									<option value="5D12!">5D12</option>
-									</select>
-								</td>						
-								<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_GRank" value="0" title="Enter the rank to use; leave zero if none." /></td>
-								<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_GFociMod" value="0" title="If applicable, enter the skill Foci modifier." /></td>						
-								<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_GPowMod"  value="0" title="If applicable, enter the power modifier."/></td>						
-								<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_GAdvMod"  value="0" title="If applicable, enter the advantage modifier."/></td>						
-								<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_GMscMod"  value="0" title="If applicable, enter other modifiers."/></td>						
-								<td class="sheet-width-W5 sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="All Purpose Action Roller" 
-									value="&{template:general_roll} {{name=@{Hero_Name} @{GRoll_Name}}} {{Action=@{GAction}}} {{Rolled=@{GRDice}}} {{wndpen=@{hiddenWoundPenalty}}} {{Rank=@{GRank}}} {{APARMod=[[@{GFociMod} + @{GPowMod} + @{GAdvMod} + @{GMscMod}]]}} {{GeneralRoll=[[ 2d10cs>2cf<9 + @{GRank} + @{GFociMod} + @{GPowMod}+ @{GAdvMod}+ @{GMscMod} + @{hiddenWoundPenalty} + @{GRDice}cs0cf0]] }}"
-									name="roll_MakeAGeneralRoll">										
-									</button>
-								</td>																																																							
-							</tr>				
-						</tbody>
-					</table>
-				</div>	<!-- End of generic roll subsection -->
-				
+			
 			<!-- General Character Details -->
 			<div class="sheet-2colrow" width="100%">	
 				<!-- COLUMN 1 - Personal details -->
@@ -210,12 +134,16 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-width-W40">
 									<!-- -->
 									<input  type="hidden" value="" name="attr_PlotDieDisplay"/>
-									<button class="sheet-diebutton" type="roll" 
+									<button class="sheet-diebutton-public" type="roll" 
 										title="Click to roll a plot die" 
-										value="&{template:plotdie_roll} {{name=@{Hero_Name} Rolls Plot Die}} {{die=@{PlotDieDisplay}}} {{plotdieroll=[[ @{PlotDie}cs0cf0 ]]}}"
+										value="&{template:plotdie_roll} {{name=@{Hero_Name} Rolls Plot Die}} {{plotdie=@{PlotDieDisplay}}} {{plotdieroll=[[ @{PlotDie}cs0cf0 ]]}}"
+										name="roll_MakeAPlotDieRoll">										
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to roll a plot die" 
+										value="&{template:plotdie_roll_private} {{name=@{Hero_Name} Rolls Plot Die}} {{plotdie=@{PlotDieDisplay}}}  {{roll=[[0 + 0]}} {{roll=[[ @{PlotDie}cs0cf0 ]]}}"
 										name="roll_MakeAPlotDieRoll">										
 									</button>
-									
 								</td>	
 							</tr>
 						</tbody>
@@ -374,71 +302,100 @@ title="spend  to Ignore wound penalties,
 					<table>
 						<tbody>
 							<tr>
-								<th class="sheet-width-W25"><H3 class="header-override">Attribute</H3></th>
-								<th class="sheet-width-W10"><H3>Score</H3></th>         
-								<th class="sheet-width-W20"><H3>Attribute Dice</H3></th>  
+								<th class="sheet-width-W15"><H3 class="header-override">Attribute</H3></th>
+								<th class="sheet-width-W18"><H3>Base Score</H3></th>  
+								<th class="sheet-width-W10"><H3>Score</H3></th>  
+								<th class="sheet-width-W20"><H3>Attr Dice</H3></th>  
 								<th class="sheet-width-W10"><H3>Bump</H3></th>              
-								<th class="sheet-width-W10"><H3>Passive</H3></th>
-								<th class="sheet-width-W15"><H3>Roll Mod</H3></th>
-								<th class="sheet-width-W10"><H3>Roll</H3></th>
+								<th class="sheet-width-W10"><H3>P Mod</H3></th>
+								<th class="sheet-width-W10"><H3>Die Mod</H3></th>
+								<th class="sheet-width-W7"><H3>Roll</H3></th>
 							</tr>
 							<tr>
-								<td><H5>Might (Mi)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_MightScore" value="3" /></span></td>
+								<td><H5>Might</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_MightScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedMi" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_MightDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_MightDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_MightDieBump" value="0" title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_MightModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_MightRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Might Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Might}} {{attribute=Might}} {{rolldice=@{MightDieDisplay}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulk}}} {{rollmod=@{MightRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{MightDie}cs0cf0 + @{MightRollMod} + @{hiddenWoundPenalty} - @{Bulk}]]}}"
-									name="roll_MightRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Might Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Might}} {{attribute=Might}} {{rolldice=@{MightDieDisplay}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulk}}} {{rollmod=@{MightRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{MightDie}cs0cf0 + @{MightRollMod} + @{hiddenWoundPenalty} - @{Bulk}]]}}"
+										name="roll_MightRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Might Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Might}} {{attribute=Might}} {{rolldice=@{MightDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{MightDie}cs0cf0 + @{MightRollMod} + @{hiddenWoundPenalty} - @{Bulk}]]}}"
+										name="roll_MightRoll" style="font-size: 175%;">
 									</button>
 								</td>
 							</tr>
 							<tr>
-								<td><H5>Prowess (Pr)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_ProwessScore" value="3" /></span></td>
+								<td><H5>Prowess</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ProwessScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedPr" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_ProwessDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_ProwessDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_ProwessDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_ProwessModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ProwessRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Prowess Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Prowess}} {{attribute=Prowess}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{ProwessDieDisplay}}} {{bulkpen=0}} {{rollmod=@{ProwessRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{ProwessDie}cs0cf0 + @{ProwessRollMod} + @{hiddenWoundPenalty} ]]}}"
-									name="roll_ProwessRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Prowess Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Prowess}} {{attribute=Prowess}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{ProwessDieDisplay}}} {{bulkpen=0}} {{rollmod=@{ProwessRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{ProwessDie}cs0cf0 + @{ProwessRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ProwessRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Prowess Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Prowess}} {{attribute=Prowess}} {{rolldice=@{ProwessDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{ProwessDie}cs0cf0 + @{ProwessRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ProwessRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>
 							<tr>
-								<td><H5>Quickness (Qu)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_QuicknessScore" value="3" /></span></td>
+								<td><H5>Quickness</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_QuicknessScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedQu" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_QuicknessDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_QuicknessDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_QuicknessDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_QuicknessModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_QuicknessRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Quickness Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Quickness}} {{attribute=Quickness}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{QuicknessDieDisplay}}} {{bulkpen=@{bulk}}} {{rollmod=@{QuicknessRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{QuicknessDie}cs0cf0 + @{QuicknessRollMod} + @{hiddenWoundPenalty} - @{Bulk} ]]}}"
-									name="roll_QuicknessRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Quickness Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Quickness}} {{attribute=Quickness}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{QuicknessDieDisplay}}} {{bulkpen=@{bulk}}} {{rollmod=@{QuicknessRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{QuicknessDie}cs0cf0 + @{QuicknessRollMod} + @{hiddenWoundPenalty} - @{Bulk} ]]}}"
+										name="roll_QuicknessRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Quickness Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Quickness}} {{attribute=Quickness}} {{rolldice=@{QuicknessDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{QuicknessDie}cs0cf0 + @{QuicknessRollMod} + @{hiddenWoundPenalty} - @{Bulk} ]]}}"
+										name="roll_QuicknessRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>
 							<tr>
-								<td><H5>Vigor (Vi)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_VigorScore" value="3" /></span></td>
+								<td><H5>Vigor</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_VigorScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedVi" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_VigorDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_VigorDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_VigorDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_VigorModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_VigorRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Vigor Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Vigor}} {{attribute=Vigor}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{VigorDieDisplay}}} {{bulkpen=0}} {{rollmod=@{VigorRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{VigorDie}cs0cf0 + @{VigorRollMod} + @{hiddenWoundPenalty} ]]}}"
-									name="roll_VigorRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Vigor Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Vigor}} {{attribute=Vigor}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{VigorDieDisplay}}} {{bulkpen=0}} {{rollmod=@{VigorRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{VigorDie}cs0cf0 + @{VigorRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_VigorRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Vigor Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Vigor}} {{attribute=Vigor}} {{rolldice=@{VigorDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{VigorDie}cs0cf0 + @{VigorRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_VigorRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>            
@@ -454,73 +411,102 @@ title="spend  to Ignore wound penalties,
 					<table>
 						<tbody>
 							<tr>
-								<th class="sheet-width-W25"><H3 class="header-override">Attribute</H3></th>
-								<th class="sheet-width-W10"><H3>Score</H3></th>         
-								<th class="sheet-width-W20"><H3>Attribute Dice</H3></th>  
+								<th class="sheet-width-W15"><H3 class="header-override">Attribute</H3></th>
+								<th class="sheet-width-W18"><H3>Base Score</H3></th>  
+								<th class="sheet-width-W10"><H3>Score</H3></th>  
+								<th class="sheet-width-W20"><H3>Attr Dice</H3></th>  
 								<th class="sheet-width-W10"><H3>Bump</H3></th>              
-								<th class="sheet-width-W10"><H3>Passive</H3></th>
-								<th class="sheet-width-W15"><H3>Roll Mod</H3></th>
-								<th class="sheet-width-W10"><H3>Roll</H3></th>
+								<th class="sheet-width-W10"><H3>P Mod</H3></th>
+								<th class="sheet-width-W10"><H3>Die Mod</H3></th>
+								<th class="sheet-width-W7"><H3>Roll</H3></th>
 							</tr>
 						</tbody>
 						<tbody>
 							<tr>
-								<td><H5>Charisma (Ch)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_CharismaScore" value="3" /></span></td>
+								<td><H5>Charisma</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CharismaScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedCh" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_CharismaDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_CharismaDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_CharismaDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_CharismaModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CharismaRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Charisma Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Charisma}} {{attribute=Charisma}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{CharismaDieDisplay}}} {{bulkpen=0}} {{rollmod=@{CharismaRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{CharismaDie}cs0cf0 + @{CharismaRollMod} + @{hiddenWoundPenalty} ]]}}"
-									name="roll_CharismaRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Charisma Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Charisma}} {{attribute=Charisma}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{CharismaDieDisplay}}} {{bulkpen=0}} {{rollmod=@{CharismaRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{CharismaDie}cs0cf0 + @{CharismaRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_CharismaRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Charisma Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Charisma}} {{attribute=Charisma}} {{rolldice=@{CharismaDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CharismaDie}cs0cf0 + @{CharismaRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_CharismaRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>            
 							<tr>
-								<td><H5>Insight (In)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_InsightScore" value="3" /></span></td>
+								<td><H5>Insight</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InsightScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedIn" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_InsightDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_InsightDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_InsightDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_InsightModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InsightRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make an Insight Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Insight}} {{attribute=Insight}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{InsightDieDisplay}}} {{bulkpen=0}} {{rollmod=@{InsightRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{InsightDie}cs0cf0 + @{InsightRollMod} + @{hiddenWoundPenalty} ]]}}"
-									name="roll_InsightRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make an Insight Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Insight}} {{attribute=Insight}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{InsightDieDisplay}}} {{bulkpen=0}} {{rollmod=@{InsightRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{InsightDie}cs0cf0 + @{InsightRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_InsightRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make an Insight Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Insight}} {{attribute=Insight}} {{rolldice=@{InsightDieDisplay}}} {{rollmod=@{InsightRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{InsightDie}cs0cf0 + @{InsightRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_InsightRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>            
 							<tr>
-								<td><H5>Logic (Lo)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_LogicScore" value="3" /></span></td>
+								<td><H5>Logic</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_LogicScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedLo" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_LogicDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_LogicDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_LogicDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_LogicModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_LogicRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Logic Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Logic}} {{attribute=Logic}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{LogicDieDisplay}}} {{bulkpen=0}} {{rollmod=@{LogicRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{LogicDie}cs0cf0 + @{LogicRollMod} + @{hiddenWoundPenalty} ]]}}"
-									name="roll_LogicRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Logic Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Logic}} {{attribute=Logic}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{LogicDieDisplay}}} {{bulkpen=0}} {{rollmod=@{LogicRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{LogicDie}cs0cf0 + @{LogicRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_LogicRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Logic Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Logic}} {{attribute=Logic}} {{rolldice=@{LogicDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{LogicDie}cs0cf0 + @{LogicRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_LogicRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>	            
 							<tr>
-								<td><H5>Resolve (Re)</H5></td>
-								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_ResolveScore" value="3" /></span></td>
+								<td><H5>Resolve</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResolveScore" value="3" /></td>
+								<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ModifiedRe" value="0" /></span></td>
 								<td class="sheet-center"><input  class="sheet-width-W95 sheet-attr-display sheet-center" type="text" value="1d6" name="attr_ResolveDieDisplay" readonly title="Die used throughout for any type of attribute roll"/>
 									<input  type="hidden" value="1d6!" name="attr_ResolveDie"/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_ResolveDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_ResolveModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResolveRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Resolve Roll" 
-									value="&{template:action_roll} {{name=@{Hero_Name} rolls Resolve}} {{attribute=Resolve}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{ResolveDieDisplay}}} {{bulkpen=0}} {{rollmod=@{ResolveRollMod}}} {{attributeroll=[[ 2d10cs>2cf<9 + @{ResolveDie}cs0cf0 + @{ResolveRollMod} + @{hiddenWoundPenalty} ]]}}"
-									name="roll_ResolveRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Resolve Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Resolve}} {{attribute=Resolve}} {{wndpen=@{hiddenWoundPenalty}}} {{rolldice=@{ResolveDieDisplay}}} {{bulkpen=0}} {{rollmod=@{ResolveRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{ResolveDie}cs0cf0 + @{ResolveRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ResolveRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Resolve Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Resolve}} {{attribute=Resolve}} {{rolldice=@{ResolveDieDisplay}}} {{rollmod=@{ResolveRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{ResolveDie}cs0cf0 + @{ResolveRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ResolveRoll" style="font-size: 175%;">
 									</button>
 								</td>	
 							</tr>								
@@ -529,8 +515,6 @@ title="spend  to Ignore wound penalties,
 				</div>
 			</div>	
 		</div>
-	
-
 		<!-- SKILLS -->
 		<div class="sheet-header">Skills</div>
 		<div class="sheet-subsection">	
@@ -543,7 +527,7 @@ title="spend  to Ignore wound penalties,
 						<th class="sheet-width-W10"><H3 title="Dice used for the roll; needs to be selected -- this allows for bumping.">Attribute Dice</H3></th> 
 						<th class="sheet-width-W6"><H3 title="Bump the dice up or down the die ladder.">Bump</H3></th>     
 						<th class="sheet-width-W5"><H3 title="Skill Rank; automatically added to the die roll.">Rank</H3></th>
-						<th class="sheet-width-W5"><H3 title="Skill Passive Score" title="Passive Score; automatically generated.">Passive</H3></th>
+						<th class="sheet-width-W5"><H3 title="Skill Passive Score" title="Passive Score; automatically generated.">P Value</H3></th>
 						<th class="sheet-width-W6 sheet-right"><H3 title="Foci Modifiers; all Foci modifiers that apply to the skill -- automatically added to the die roll.">Foci Mod</H3></th>
 						<th class="sheet-width-W6"><H3 title="Power Modifiers; all Power modifiers that apply to the skill -- automatically added to the die roll.">Pow Mod</H3></th>
 						<th class="sheet-width-W6"><H3 title="Advantage Modifiers; all Advantage modifiers that apply to the skill -- automatically added to the die roll.">Adv Mod</H3></th>	
@@ -582,11 +566,17 @@ title="spend  to Ignore wound penalties,
 					<td class="sheet-width-W6 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_SkillA_PowMod"  value="0" title="The highest Power Modifier that can be applied to the roll; Power modifiers do not stack" /></td>						
 					<td class="sheet-width-W6 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_SkillA_AdvMod"  value="0" title="The highest Advantage Modifier that can be applied to the roll; Advantage modifiers do not stack" /></td>						
 					<td class="sheet-width-W6 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_SkillA_MscMod"  value="0" title="The total of all other modifiers (typically circumstantial) that applies to the roll"/></td>						
-					<td class="sheet-width-W5 sheet-center"><input type="hidden" value="0" name="attr_bulkskillpen"/><button class="sheet-diebutton" type="roll" 
+					<td class="sheet-width-W5 sheet-center"><input type="hidden" value="0" name="attr_bulkskillpen"/>
+						<button class="sheet-diebutton-public" type="roll" 
 							title="Click to make a skill roll" 
 							value="&{template:skill_roll} {{name=@{Hero_Name} makes a skill roll}} {{rolled=@{SkillA_Name}}} {{rank=@{SkillA_Rank}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkskillpen}}} {{rolldice=@{SkillDieDisplay}}} {{rollmod=[[@{SkillA_FociMod} + @{SkillA_PowMod} + @{SkillA_AdvMod} + @{SkillA_MscMod}]]}} {{roll=[[ 2d10cs>2cf<9 + @{SkillDie}cs0cf0 + @{SkillA_Rank} + @{SkillA_FociMod} + @{SkillA_PowMod}+ @{SkillA_AdvMod}+ @{SkillA_MscMod} + @{hiddenWoundPenalty} + @{bulkskillpen}]]}}" 
 							name="roll_MakeASkillRoll">
 						</button>
+						<button class="sheet-diebutton-private" type="roll" 
+							title="Click to make a skill roll" 
+							value="&{template:skill_roll_private} {{name=@{Hero_Name} makes a skill roll}} {{rolled=@{SkillA_Name}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkskillpen}}} {{rolldice=@{SkillDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{SkillDie}cs0cf0 + @{SkillA_Rank} + @{SkillA_FociMod} + @{SkillA_PowMod}+ @{SkillA_AdvMod}+ @{SkillA_MscMod} + @{hiddenWoundPenalty} + @{bulkskillpen}]]}}" 
+							name="roll_MakeASkillRoll">
+						</button>
 					</td>				
 				</tr>
 			</tbody> 
@@ -621,10 +611,16 @@ title="spend  to Ignore wound penalties,
 							<td class="sheet-width-W25 sheet-right"><span class="sheet-background sheet-pad-text sheet-right">Init Modifier:</span></td>
 							<td class="sheet-width-W15 sheet-left"><input class="sheet-width-W100 sheet-spin-button" type="number" value="0" name="attr_InitModifier" title="Modifies the number of initiative dice."/></td>					
 							<td class="sheet-width-W15 sheet-center"><span class="sheet-circle"><input type="number" name="attr_init" disabled="true" value="((@{QuicknessModifier} + @{InitModifier}))"  title="number of d10 rolled for initiative"/></span></td>
-							<td class="sheet-width-W10 sheet-center"><button class="sheet-diebutton" type="roll" 
-								title="Click to roll for initiative" 
-								value="&{template:init_roll} {{name=@{character_name} rolls Initiative}} {{initroll=[[@{Init}d10kl1cs0cf0 &{tracker} &{noerror}]]}}"
-								name="roll initiative">
+							<td class="sheet-width-W10 sheet-center">
+								<button class="sheet-diebutton-public" type="roll" 
+									title="Click to roll for initiative" 
+									value="&{template:init_roll} {{name=@{character_name} rolls Initiative}} {{initroll=[[@{Init}d10kl1cs0cf0 &{tracker} &{noerror}]]}}"
+									name="roll initiative">
+						    	</button>
+								<button class="sheet-diebutton-private" type="roll" 
+									title="Click to roll for initiative" 
+									value="&{template:init_roll_private} {{name=@{character_name} rolls Initiative}} {{roll=[[0 + 0]}} {{roll=[[@{Init}d10kl1cs0cf0 &{tracker} &{noerror}]]}}"
+									name="roll initiative">
 						    	</button>
 							</td>
 						</tr>
@@ -888,10 +884,16 @@ title="spend  to Ignore wound penalties,
 							<td class="sheet-width-W5 sheet-center"><span class="sheet-circle"><input type="number" name="attr_AttackRank" value="0" title="Rank for skill or power; leave 0 if none."/></span></td>
 							<td class="sheet-width-W6 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_AttackMod" value="0" title="Total of Foci, Power, and Advantage Mods (only one of each may be applied); leave 0 if none." /></td>
 							<td class="sheet-width-W6 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_CircMod" value="0" title="Total of all Circumstance Mods; leave 0 if none." /></td>
-							<td class="sheet-width-W4 sheet-center"><input type="hidden" value ="0" name="attr_bulkattackpen"/><button class="sheet-diebutton" type="roll" 
-								title="Click to roll the attack" 
-								value="&{template:attack_roll} {{name=@{Hero_Name} Attacks}} {{attackname=@{AttackName}}} {{maneuver=@{AttackManeuver}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkattackpen}}} {{manmod=@{AttackMnvMod}}} {{dice=@{AttackDieDisplay}}} {{defense=@{AttackDefense}}} {{ticks=@{AttackSpeed}}} {{rank=@{AttackRank}}} {{rollmod=[[@{AttackMod} + @{CircMod}]]}} {{roll=[[ 2d10cs>2cf<9  + @{AttackRank} + @{AttackMnvMod} + @{AttackMod} + @{CircMod} + @{hiddenWoundPenalty} + @{bulkattackpen} + @{AttackDie}cs0cf0}]]}}"
-								name="roll_Attack" >
+							<td class="sheet-width-W4 sheet-center"><input type="hidden" value ="0" name="attr_bulkattackpen"/>
+								<button class="sheet-diebutton-public" type="roll" 
+									title="Click to roll the attack" 
+									value="&{template:attack_roll} {{name=@{Hero_Name} Attacks}} {{attackname=@{AttackName}}} {{maneuver=@{AttackManeuver}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkattackpen}}} {{manmod=@{AttackMnvMod}}} {{dice=@{AttackDieDisplay}}} {{defense=@{AttackDefense}}} {{ticks=@{AttackSpeed}}} {{rank=@{AttackRank}}} {{rollmod=[[@{AttackMod} + @{CircMod}]]}} {{roll=[[ 2d10cs>2cf<9  + @{AttackRank} + @{AttackMnvMod} + @{AttackMod} + @{CircMod} + @{hiddenWoundPenalty} + @{bulkattackpen} + @{AttackDie}cs0cf0}]]}}"
+									name="roll_Attack" >
+								</button>
+								<button class="sheet-diebutton-private" type="roll" 
+									title="Click to roll the attack" 
+									value="&{template:attack_roll_private} {{name=@{Hero_Name} Attacks}} {{attackname=@{AttackName}}} {{maneuver=@{AttackManeuver}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkattackpen}}} {{manmod=@{AttackMnvMod}}} {{dice=@{AttackDieDisplay}}} {{defense=@{AttackDefense}}} {{ticks=@{AttackSpeed}}} {{roll=[[0 + 0]}} {{roll=[[@{AttackMod} + @{CircMod}]]}} {{roll=[[ 2d10cs>2cf<9  + @{AttackRank} + @{AttackMnvMod} + @{AttackMod} + @{CircMod} + @{hiddenWoundPenalty} + @{bulkattackpen} + @{AttackDie}cs0cf0}]]}}"
+									name="roll_Attack">
 								</button>
 							</td>			
 						</tr>
@@ -995,10 +997,15 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-width-W5 sheet-center"><span class="sheet-circle"><input class="sheet-width-w95" type="number" name="attr_DmgRollImpact"  value="0" title="Impact value for the damage attack roll to determine massive damage (not automated)"/></span></td>
 								<td class="sheet-width-W20 sheet-center"><input class="sheet-width-W95" type="text" name="attr_DmgSpecial"  value="none" title="List of special conditions that apply to the damage"/></td>
 								<td class="sheet-width-W5 sheet-center">
-									<button class="sheet-diebutton" type="roll" 
-											title="Click to make a Damage Roll" 
-											value="&{template:damage_roll} {{name=@{Hero_Name} rolls Damage}} {{attname=@{FirstAttack}}} {{basedmgdice=@{BaseDamageDie}}} {{attributedmgdice=@{DamageDieDisplay}}} {{conditions=@{DmgSpecial}}} {{impact=@{DmgRollImpact}}} {{rollmod=@{DamageMod}}} {{damageroll=[[ {@{BaseDamageDie}cs0cf0 + @{DamageDie}cs0cf0 + @{DamageMod}, 1d1}kh1 ]]}}"
-											name="roll_DamageRoll">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Damage Roll" 
+										value="&{template:damage_roll} {{name=@{Hero_Name} rolls Damage}} {{attname=@{FirstAttack}}} {{basedmgdice=@{BaseDamageDie}}} {{attributedmgdice=@{DamageDieDisplay}}} {{conditions=@{DmgSpecial}}} {{impact=@{DmgRollImpact}}} {{rollmod=@{DamageMod}}} {{roll=[[ {@{BaseDamageDie}cs0cf0 + @{DamageDie}cs0cf0 + @{DamageMod}, 1d1}kh1 ]]}}"
+										name="roll_DamageRoll">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Damage Roll" 
+										value="&{template:damage_roll_private} {{name=@{Hero_Name} rolls Damage}} {{attname=@{FirstAttack}}} {{basedmgdice=@{BaseDamageDie}}} {{attributedmgdice=@{DamageDieDisplay}}} {{conditions=@{DmgSpecial}}} {{impact=@{DmgRollImpact}}} {{rollmod=@{DamageMod}}} {{roll=[[0 + 0]}} {{roll=[[ {@{BaseDamageDie}cs0cf0 + @{DamageDie}cs0cf0 + @{DamageMod}, 1d1}kh1 ]]}}"
+										name="roll_DamageRoll">
 									</button>
 								</td>
 							</tr>
@@ -1022,10 +1029,16 @@ title="spend  to Ignore wound penalties,
 							<td class="sheet-width-W10 sheet-right"><span class="sheet-background">Current:</span></td>
 							<td class="sheet-width-W10 sheet-left"><input class="sheet-width-W95 sheet-spin-button" type="number" name="attr_CurrentBO" title="The total of all modifications to Burnout Threshold."/></span></td>
 							<td class="sheet-width-W10 sheet-right"><span class="sheet-background">Roll:</span></td>							
-							<td class="sheet-width-W10"><button class="sheet-diebutton" type="roll"
-								title="Click to make a Burnout Check" 
-								value="&{template:burnout_roll} {{name=@{Hero_Name} rolls Burnout}} {{text= Burnout on 1-2}}{{boroll=[[ 1d6cf<2 ]]}}"
-								name="roll_Burnout">
+							<td class="sheet-width-W10">
+								<button class="sheet-diebutton-public" type="roll"
+									title="Click to make a Burnout Check" 
+									value="&{template:burnout_roll} {{name=@{Hero_Name} rolls Burnout}} {{text= Burnout on 1-2}}{{boroll=[[ 1d6cf<2 ]]}}"
+									name="roll_Burnout">
+								</button>
+								<button class="sheet-diebutton-private" type="roll"
+									title="Click to make a Burnout Check" 
+									value="&{template:burnout_roll_private} {{name=@{Hero_Name} rolls Burnout}} {{text= Burnout on 1-2}} {{roll=[[0 + 0]}} {{roll=[[ 1d6cf<2 ]]}}"
+									name="roll_Burnout">
 								</button>
 							</td>	
 						</tr>	
@@ -1064,7 +1077,7 @@ title="spend  to Ignore wound penalties,
 					<th class="sheet-width-W10"><H3 title="Dice used for the roll; needs to be selected -- this allows for bumping.">Attribute Dice</H3></th> 
 					<th class="sheet-width-W6"><H3 title="Bump the dice up or down the die ladder.">Bump</H3></th>    		
 					<th class="sheet-width-W5"><H3 title="Rank of the Power">Rank</H3></th>
-					<th class="sheet-width-W5"><H3 title="Power Passive Value (Based on Prim Attr + Rank)" >Passive</H3></th>
+					<th class="sheet-width-W5"><H3 title="Power Passive Value (Based on Prim Attr + Rank)" >P Value</H3></th>
 					<th class="sheet-width-W6"><H3 title="Power Burnout">Burnout</H3></th>
 					<th class="sheet-width-W5"><H3 title="Range of the power in areas">Range</H3></th>
 					<th class="sheet-width-W5"><H3 title="Speed of the power in ticks">Ticks</H3></th>
@@ -1110,9 +1123,14 @@ title="spend  to Ignore wound penalties,
 						<td class="sheet-width-W6 sheet-center" ><input class="sheet-spin-button" type="number" name="attr_PowerModifier" value="0" title="Total modifiers from Skill Foci, Advantages, and Power mods applicable to the power roll"/></td>						
 						<td class="sheet-width-W6 sheet-center" ><input class="sheet-spin-button" type="number" name="attr_PowerCircumstancesMod"  value="0" title="Total of all circumstance modifiers applicable to the power roll"/></td>				
 						<td class="sheet-width-W5 sheet-center"><input type="hidden" value ="0" name="attr_bulkpowerpen"/>
-							<button class="sheet-diebutton" type="roll" 
+							<button class="sheet-diebutton-public" type="roll" 
 								title="Power Roll" 
-								value="&{template:power_roll} {{name=@{Hero_Name} makes a power roll}} {{rolled=@{PowerNameR}}} {{rank=@{PowerRankR}}} {{burnout=@{PowerBOR}}} {{range=@{PowerRangeR}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkpowerpen}}} {{rolldice=@{PowerDieDisplay}}} {{rollmod=[[@{PowerModifier} + @{PowerCircumstancesMod}]]}} {{roll=[[ 2d10cs>2cf<9 + @{PowerDie}cs0cf0 + @{PowerRankR} + @{PowerModifier} + @{PowerCircumstancesMod} + @{hiddenWoundPenalty} + @{bulkpowerpen} ]]}}" 
+								value="&{template:power_roll} {{name=@{Hero_Name} makes a power roll}} {{rolled=@{PowerNameR}}} {{rank=@{PowerRankR}}} {{ticks=@{PowerSpeedR}}} {{burnout=@{PowerBOR}}} {{range=@{PowerRangeR}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkpowerpen}}} {{rolldice=@{PowerDieDisplay}}} {{rollmod=[[@{PowerModifier} + @{PowerCircumstancesMod}]]}} {{roll=[[ 2d10cs>2cf<9 + @{PowerDie}cs0cf0 + @{PowerRankR} + @{PowerModifier} + @{PowerCircumstancesMod} + @{hiddenWoundPenalty} + @{bulkpowerpen} ]]}}" 
+								name="roll_MakeAPowerRoll">
+							</button>
+							<button class="sheet-diebutton-private" type="roll" 
+								title="Power Roll" 
+								value="&{template:power_roll_private} {{name=@{Hero_Name} makes a power roll}} {{rolled=@{PowerNameR}}} {{ticks=@{PowerSpeedR}}} {{burnout=@{PowerBOR}}} {{range=@{PowerRangeR}}} {{wndpen=@{hiddenWoundPenalty}}} {{bulkpen=@{bulkpowerpen}}} {{rolldice=@{PowerDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{PowerDie}cs0cf0 + @{PowerRankR} + @{PowerModifier} + @{PowerCircumstancesMod} + @{hiddenWoundPenalty} + @{bulkpowerpen} ]]}}" 
 								name="roll_MakeAPowerRoll">
 							</button>
 						</td>
@@ -1187,30 +1205,48 @@ title="spend  to Ignore wound penalties,
 				<div class="sheet-subsection">	
 					<table> 
 							<tr> 
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Avoidance:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0" name="attr_AvoidanceMod" title="The total of all modifications to Avoidance."/></span></td>
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Fortitude:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_FortitudeMod" title="The total of all modifications to Fortitude."/></span></td>
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Discipline:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_DisciplineMod" title="The total of all modifications to Discipline."/></span></td>												
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Bal AR:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_BallisticARMod" title="The total of all modifications to Ballistic Armor Rating."/></span></td>												
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Melee AR:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_MeleeARMod" title="The total of all modifications to Melee Armor Rating."/></span></td>												
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Energy AR:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_EnergyARMod" title="The total of all modifications to Energy Armor Rating."/></span></td>	
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Might:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_MiScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Prowess:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_PrScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Quickness:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_QuScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Vigor:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_ViScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Charisma:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_ChScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Insight:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_InScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Logic:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_LoScoreMod" value="0" /></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Resolve:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input class="sheet-spin-button" type="number" name="attr_ReScoreMod" value="0" /></td>
 							</tr>
-							<tr>
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Stamina:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_StaminaMod" title="The total of all modifications to Stamina."/></span></td>
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Wounds:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_WoundsMod" title="The total of all modifications to Wounds."/></span></td>
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Burnout:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_BOMod" title="The total of all modifications to Burnout Threshold."/></span></td>		
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Horror:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_HorrorMod" title="The total of all modifications to Horror Points."/></span></td>
-								<td class="sheet-width-W7 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Pace:</span></td>
-								<td class="sheet-width-W7 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_PaceMod" title="The total of all modifications to Pace."/></span></td>
+							<tr> 
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Avoidance:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0" name="attr_AvoidanceMod" title="The total of all modifications to Avoidance."/></span></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Fortitude:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_FortitudeMod" title="The total of all modifications to Fortitude."/></span></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Discipline:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_DisciplineMod" title="The total of all modifications to Discipline."/></span></td>			
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Stamina:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_StaminaMod" title="The total of all modifications to Stamina."/></span></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Wounds:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_WoundsMod" title="The total of all modifications to Wounds."/></span></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Burnout:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_BOMod" title="The total of all modifications to Burnout Threshold."/></span></td>		
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Horror:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_HorrorMod" title="The total of all modifications to Horror Points."/></span></td>
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >Pace:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_PaceMod" title="The total of all modifications to Pace."/></span></td>
+							</tr>
+							<tr>										
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >AR Bal:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_BallisticARMod" title="The total of all modifications to Ballistic Armor Rating."/></span></td>												
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >AR Mel:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_MeleeARMod" title="The total of all modifications to Melee Armor Rating."/></span></td>												
+								<td class="sheet-width-W6 sheet-right"><span class="sheet-large-textblock sheet-spin-button" >AR Eng:</span></td>
+								<td class="sheet-width-W6 sheet-center"><input  class="sheet-width-W95 sheet-large-textblock sheet-spin-button" type="number" value="0"  name="attr_EnergyARMod" title="The total of all modifications to Energy Armor Rating."/></span></td>
 							</tr>
 					</table>
 				</div>	
@@ -1336,7 +1372,6 @@ title="spend  to Ignore wound penalties,
 				</fieldset>
 			</div>  		
 		</div>
-		
 	</div>
   
 	<!-- ************************************** Cast  Member  ************************************** -->
@@ -1403,10 +1438,15 @@ title="spend  to Ignore wound penalties,
 							</td>	
 							<td class="sheet-width-W35 sheet-right"><span class="sheet-background">Roll Plot Die:</span></td>
 							<td class="sheet-width-W15 sheet-left">
-								<button class="sheet-diebutton" type="roll" 
-									title="Roll Cast Member Plot Die Roll" 
-									value="&{template:cast_plotdie_roll} {{name=@{Hero_Name} Rolls Plot Die}} {{die=@{PlotDie}}} {{roll=[[ @{PlotDie}cs0cf0 ]]}}"
-									name="roll_MakeAPlotDieRoll"  title="Click to roll a plot die for the cast member">										
+								<button class="sheet-diebutton-public" type="roll" 
+										title="Click to roll a plot die for the cast member" 
+										value="&{template:plotdie_roll} {{name=@{Hero_Name} Rolls Plot Die}} {{plotdie=@{PlotDie}}} {{plotdieroll=[[ @{PlotDie}cs0cf0 ]]}}"
+										name="roll_MakeAPlotDieRoll">										
+								</button>
+								<button class="sheet-diebutton-private" type="roll" 
+										title="Click to roll a plot die for the cast member" 
+										value="&{template:plotdie_roll_private} {{name=@{Hero_Name} Rolls Plot Die}} {{plotdie=@{PlotDie}}}  {{roll=[[0 + 0]}} {{roll=[[ @{PlotDie}cs0cf0 ]]}}"
+										name="roll_MakeAPlotDieRoll">										
 								</button>
 							</td>
 						</tr>
@@ -1446,11 +1486,17 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_MightModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_MightRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
 								<td class="sheet-center">
-									<button class="sheet-diebutton" type="roll" 
-									title="Click to make a Might Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Might}} {{attribute=Might}} {{rolldice=@{MightDieDisplay}}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rollmod=@{MightRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{MightDie}cs0cf0 + @{MightRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_MightRoll" style="font-size: 175%;">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Might Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Might}} {{attribute=Might}} {{rolldice=@{MightDieDisplay}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{bulkpen=@{bulk}}} {{rollmod=@{MightRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{MightDie}cs0cf0 + @{MightRollMod} + @{hiddenWoundPenalty} - @{Bulk}]]}}"
+										name="roll_MightRoll" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Might Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Might}} {{attribute=Might}} {{rolldice=@{MightDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{MightDie}cs0cf0 + @{MightRollMod} + @{hiddenWoundPenalty} - @{Bulk}]]}}"
+										name="roll_MightRoll" style="font-size: 175%;">
+									</button>
+								</td>
 								</td>
 							</tr>
 							<tr>
@@ -1461,10 +1507,16 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_ProwessDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_ProwessModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ProwessRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Prowess Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Prowess}} {{attribute=Prowess}} {{rolldice=@{ProwessDieDisplay}}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rollmod=@{ProwessRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{ProwessDie}cs0cf0 + @{ProwessRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_ProwessRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Prowess Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Prowess}} {{attribute=Prowess}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{ProwessDieDisplay}}} {{bulkpen=0}} {{rollmod=@{ProwessRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{ProwessDie}cs0cf0 + @{ProwessRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ProwessRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Prowess Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Prowess}} {{attribute=Prowess}} {{rolldice=@{ProwessDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{ProwessDie}cs0cf0 + @{ProwessRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ProwessRoll" style="font-size: 175%;">
 									</button>
 								</td>								
 							</tr>
@@ -1476,10 +1528,16 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_QuicknessDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_QuicknessModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_QuicknessRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Quickness Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Quickness}} {{attribute=Quickness}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rolldice=@{QuicknessDieDisplay}}} {{rollmod=@{QuicknessRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{QuicknessDie}cs0cf0 + @{QuicknessRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_QuicknessRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Quickness Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Quickness}} {{attribute=Quickness}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{QuicknessDieDisplay}}} {{bulkpen=@{bulk}}} {{rollmod=@{QuicknessRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{QuicknessDie}cs0cf0 + @{QuicknessRollMod} + @{hiddenWoundPenalty} - @{Bulk} ]]}}"
+										name="roll_QuicknessRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Quickness Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Quickness}} {{attribute=Quickness}} {{rolldice=@{QuicknessDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{QuicknessDie}cs0cf0 + @{QuicknessRollMod} + @{hiddenWoundPenalty} - @{Bulk} ]]}}"
+										name="roll_QuicknessRoll" style="font-size: 175%;">
 									</button>
 								</td>									
 							</tr>
@@ -1491,10 +1549,16 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_VigorDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_VigorModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_VigorRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Vigor Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Vigor}} {{attribute=Vigor}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rolldice=@{VigorDieDisplay}}} {{rollmod=@{VigorRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{VigorDie}cs0cf0 + @{VigorRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_VigorRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Vigor Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Vigor}} {{attribute=Vigor}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{VigorDieDisplay}}} {{bulkpen=0}} {{rollmod=@{VigorRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{VigorDie}cs0cf0 + @{VigorRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_VigorRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Vigor Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Vigor}} {{attribute=Vigor}} {{rolldice=@{VigorDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{VigorDie}cs0cf0 + @{VigorRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_VigorRoll" style="font-size: 175%;">
 									</button>
 								</td>		
 							</tr>
@@ -1506,12 +1570,18 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_CharismaDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_CharismaModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CharismaRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Charisma Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Charisma}} {{attribute=Charisma}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rolldice=@{CharismaDieDisplay}}} {{rollmod=@{CharismaRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CharismaDie}cs0cf0 + @{CharismaRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_CharismaRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Charisma Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Charisma}} {{attribute=Charisma}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{CharismaDieDisplay}}} {{bulkpen=0}} {{rollmod=@{CharismaRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{CharismaDie}cs0cf0 + @{CharismaRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_CharismaRoll" style="font-size: 175%;">
 									</button>
-								</td>		
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Charisma Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Charisma}} {{attribute=Charisma}} {{rolldice=@{CharismaDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CharismaDie}cs0cf0 + @{CharismaRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_CharismaRoll" style="font-size: 175%;">
+									</button>
+								</td>			
 							</tr>            
 							<tr>
 								<td><H5>Insight (In)</H5></td>
@@ -1521,12 +1591,18 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_InsightDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_InsightModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InsightRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make an Insight Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Insight}} {{attribute=Insight}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rolldice=@{InsightDieDisplay}}} {{rollmod=@{InsightRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{InsightDie}cs0cf0 + @{InsightRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_InsightRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Insight Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Insight}} {{attribute=Insight}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{InsightDieDisplay}}} {{bulkpen=0}} {{rollmod=@{InsightRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{InsightDie}cs0cf0 + @{InsightRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_InsightRoll" style="font-size: 175%;">
 									</button>
-								</td>	
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Insight Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Insight}} {{attribute=Insight}} {{rolldice=@{InsightDieDisplay}}} {{rollmod=@{InsightRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{InsightDie}cs0cf0 + @{InsightRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_InsightRoll" style="font-size: 175%;">
+									</button>
+								</td>		
 							</tr>            
 							<tr>
 								<td><H5>Logic (Lo)</H5></td>
@@ -1536,12 +1612,18 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_LogicDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_LogicModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_LogicRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Logic Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Logic}} {{attribute=Logic}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rolldice=@{LogicDieDisplay}}} {{rollmod=@{LogicRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{LogicDie}cs0cf0 + @{LogicRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_LogicRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Logic Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Logic}} {{attribute=Logic}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{LogicDieDisplay}}} {{bulkpen=0}} {{rollmod=@{LogicRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{LogicDie}cs0cf0 + @{LogicRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_LogicRoll" style="font-size: 175%;">
 									</button>
-								</td>	
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Logic Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Logic}} {{attribute=Logic}} {{rolldice=@{LogicDieDisplay}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{LogicDie}cs0cf0 + @{LogicRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_LogicRoll" style="font-size: 175%;">
+									</button>
+								</td>
 							</tr>	            
 							<tr>
 								<td><H5>Resolve (Re)</H5></td>
@@ -1551,10 +1633,16 @@ title="spend  to Ignore wound penalties,
 								<td class="sheet-center"><input class="sheet-spin-button sheet-small-textblock" type="number" name="attr_ResolveDieBump" value="0"  title="The value applied to bump the attribute die up or down; this ripples to all skills, attacks, damage, and powers using this attribute"/></td>
 								<td class="sheet-center"><span class="sheet-circle"><input type="number" name="attr_ResolveModifier"  value="2" readonly title="Attribute Passive Modifier used for Skill and Power Passive Value's"/></span></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResolveRollMod"  value="0" title="Modifier applied to the attribute roll"/></td>						
-								<td class="sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Resolve Roll" 
-									value="&{template:cast_action_roll} {{name=@{Hero_Name} rolls Resolve}} {{attribute=Resolve}} {{wndpen=@{cmvhiddenWoundPenalty}}} {{rolldice=@{ResolveDieDisplay}}} {{rollmod=@{ResolveRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{ResolveDie}cs0cf0 + @{ResolveRollMod} + @{cmvhiddenWoundPenalty} ]]}}"
-									name="roll_ResolveRoll" style="font-size: 175%;">
+								<td class="sheet-center">
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Cast member Resolve Roll" 
+										value="&{template:action_roll} {{name=@{Hero_Name} rolls Resolve}} {{attribute=Resolve}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{ResolveDieDisplay}}} {{bulkpen=0}} {{rollmod=@{ResolveRollMod}}} {{roll=[[ 2d10cs>2cf<9 + @{ResolveDie}cs0cf0 + @{ResolveRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ResolveRoll" style="font-size: 175%;">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Cast member Resolve Roll" 
+										value="&{template:action_roll_private} {{name=@{Hero_Name} rolls Resolve}} {{attribute=Resolve}} {{rolldice=@{ResolveDieDisplay}}} {{rollmod=@{ResolveRollMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{ResolveDie}cs0cf0 + @{ResolveRollMod} + @{hiddenWoundPenalty} ]]}}"
+										name="roll_ResolveRoll" style="font-size: 175%;">
 									</button>
 								</td>
 							</tr>	
@@ -1584,11 +1672,18 @@ title="spend  to Ignore wound penalties,
 							<td class="sheet-width-W25 sheet-right"><span class="sheet-background sheet-pad-text sheet-right">Init Modifier:</span></td>
 							<td class="sheet-width-W15 sheet-left"><input class="sheet-width-W100 sheet-spin-button" type="number" value="0" name="attr_InitModifier" title="Modifies the number of dice rolled for initiative"/></td>					
 							<td class="sheet-width-W15 sheet-center"><span class="sheet-circle"><input type="number" name="attr_init" disabled="true" value="((@{QuicknessModifier} + @{InitModifier}))" title="Modified initiative score for the cast member"/></span></td>
-							<td class="sheet-width-W10 sheet-center"><button class="sheet-diebutton" type="roll" 
-								title="Click to roll initiative" 
-								value="&{template:cast_init_roll} {{name=@{character_name} rolls Initiative}} {{roll=[[@{Init}d10kl1cs0cf0 &{tracker} &{noerror}]]}}"
-								name="roll initiative">
+							<td class="sheet-width-W10 sheet-center">
+								<button class="sheet-diebutton-public" type="roll" 
+									title="Click to roll Cast member initiative" 
+									value="&{template:init_roll} {{name=@{character_name} rolls Initiative}} {{initroll=[[@{Init}d10kl1cs0cf0 &{tracker} &{noerror}]]}}"
+									name="roll initiative">
 						    	</button>
+								<button class="sheet-diebutton-private" type="roll" 
+									title="Click to roll Cast member initiative" 
+									value="&{template:init_roll_private} {{name=@{character_name} rolls Initiative}} {{roll=[[0 + 0]}} {{roll=[[@{Init}d10kl1cs0cf0 &{tracker} &{noerror}]]}}"
+									name="roll initiative">
+						    	</button>
+							</td>
 							</td>
 						</tr>
 					</table>	
@@ -1638,11 +1733,17 @@ title="spend  to Ignore wound penalties,
 							<td class="sheet-width-W10 sheet-left"><input class="sheet-width-W95 sheet-spin-button" type="number" name="attr_CurrentBO" title="The current burnout accumulated during play"/></span></td>
 							<td class="sheet-width-W15 sheet-right"><span class="sheet-background">BO Roll:</span></td>							
 							<td class="sheet-width-W10 sheet-center">
-								<button class="sheet-diebutton" type="roll"
-									title="Click to make a burnout roll for a cast member" 
-									value="&{template:cast_burnout_roll} {{name=@{Hero_Name} rolls Burnout}} {{Text= Burnout on 1-2}}{{roll=[[ 1d6cf<2 ]]}}"
+								<button class="sheet-diebutton-public" type="roll"
+									title="Click to make a Burnout Check" 
+									value="&{template:burnout_roll} {{name=@{Hero_Name} rolls Burnout}} {{text= Burnout on 1-2}}{{boroll=[[ 1d6cf<2 ]]}}"
 									name="roll_Burnout">
 								</button>
+								<button class="sheet-diebutton-private" type="roll"
+									title="Click to make a Burnout Check" 
+									value="&{template:burnout_roll_private} {{name=@{Hero_Name} rolls Burnout}} {{text= Burnout on 1-2}} {{roll=[[0 + 0]}} {{roll=[[ 1d6cf<2 ]]}}"
+									name="roll_Burnout">
+								</button>
+							</td>	
 							</td>	
 						</tr>
 					</table>
@@ -1694,17 +1795,18 @@ title="spend  to Ignore wound penalties,
 			</table>
 			<table> 
 					<tr>					
-						<th class="sheet-width-W20"><h3 class="sheet-header-override" title="Name of the attack" >Attack</h3></th>					
-						<th class="sheet-width-W5">	<h3 title="Click to expand notes section for capturing additional details." >+Info</h3></th>
-						<th class="sheet-width-W10"><h3 class="sheet-header-override" title="Attribute dice rolled for the attack for both the to-hit" >Attr ATK Dice</h3></th>
+						<th class="sheet-width-W15"><h3 class="sheet-header-override" title="Name of the attack" >Attack</h3></th>					
+						<th class="sheet-width-W7">	<h3 title="Click to expand notes section for capturing additional details." >+Info</h3></th>
+						<th class="sheet-width-W8"><h3 class="sheet-header-override" title="Attribute dice rolled for the attack for both the to-hit" >Attr Dice</h3></th>
 						<th class="sheet-width-W5">	<h3 title="Range of the attack (M for Melee).">Rng</h3></th>	
 						<th class="sheet-width-W5">	<h3 title="Speed of the attack (reference Maneuvers)">Ticks</h3></th>
 						<th class="sheet-width-W7">	<h3 title="Total of Rank, Foci, Power, and Advantage modifiers.">ATK Mod</h3></th>
 						<th class="sheet-width-W7">	<h3 title="Total of maneuver and circumstance modifiers.">Circ Mod</h3></th>
 						<th class="sheet-width-W5">	<h3 title="Button for making the roll." >ATK</h3></th>
 						<th class="sheet-width-W7"><h3 class="sheet-header-override" title="Base damage dice rolled for damage" >Dmg Dice</h3></th>
-						<th class="sheet-width-W10"><h3 class="sheet-header-override" title="Attribute dice rolled for the damage" >Attr Dmg Dice</h3></th>
-						<th class="sheet-width-W7"> <H3 title="total of all modifiers to damage." >Dmg Mod</H3></th>
+						<th class="sheet-width-W8"><h3 class="sheet-header-override" title="Attribute dice rolled for the damage" >Attr Dice</h3></th>
+						<th class="sheet-width-W6"> <H3 title="total of all modifiers to damage." >Dmg Mod</H3></th>
+						<th class="sheet-width-W10"> <H3 title="total of all modifiers to damage." >Special</H3></th>
 						<th class="sheet-width-W5"> <H3 title="total of all modifiers to damage." >Impct</H3></th>
 						<th class="sheet-width-W5">	<h3 title="Button for making the roll." >Dmg</h3></th>		
 					</tr>
@@ -1713,12 +1815,12 @@ title="spend  to Ignore wound penalties,
 				<table>
 						<tr> 
 							<!-- Attack and damage -->
-							<td class="sheet-width-W25"><input class="sheet-width-W85 sheet-hover" type="text" name="attr_CastAttackName" title="The weapon or power used to make the attack (pg 90 to 94) with maneuver; whatever is entered here appears in chat." >
+							<td class="sheet-width-W22"><input class="sheet-width-W85 sheet-hover" type="text" name="attr_CastAttackName" title="The weapon or power used to make the attack (pg 90 to 94) with maneuver; whatever is entered here appears in chat." >
 								<span name="attr_Attack-tooltip" class="sheet-tooltip"></span>
 								<input type="checkbox" class="sheet-hover-hidden" title="click to show or hide attack details" /><span></span>
 								<textarea placeholder="Click to open a freeform  field for recording attack details for quick reference" class="sheet-tooltip sheet-width-W75" name="attr_Attack-tooltip"></textarea>
 							</td>					
-							<td class="sheet-width-W10 sheet-center"><select class="sheet-select-attr" name="attr_CastAttackAttrDice" value="0" 
+							<td class="sheet-width-W8 sheet-center"><select class="sheet-select-attr" name="attr_CastAttackAttrDice" value="0" 
 								title="select the attribute dice rolled for making the Action Roll; inlcude any die bumps">
 								<option value="1d0" selected="true">None</option>
 								<option value="1D4!">1d4</option> 
@@ -1752,11 +1854,17 @@ title="spend  to Ignore wound penalties,
 							<td class="sheet-width-W5 sheet-center"><span class="sheet-circle"><input type="text" name="attr_CastAttackSpeed"  value="0" title="total speed of the attack in Ticks: Trivial=1; Simple=2; Complex=4; Demanding=6"/></span></td>
 							<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_CastAttackMod" value="0" title="Total of Foci, Power, and Advantage Mods (only one of each may be applied); leave 0 if none." /></td>
 							<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_CastCircMod" value="0" title="Total of all Circumstance Mods; leave 0 if none." /></td>
-							<td class="sheet-width-W5 sheet-center"><button class="sheet-diebutton" type="roll" 
-									title="Click to make a Cast Member Attack Action Roll" 
-									value="&{template:cast_attack_roll} {{name=@{Hero_Name} makes an Attack}} {{AttName=@{CastAttackName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{Dice=@{CastAttackAttrDice}}} {{Range=@{CastAttackRange}}} {{Ticks=@{CastAttackSpeed}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9  + @{CastAttackMod} + @{CastCircMod} + @{cmvHiddenWoundPenalty} + @{CastAttackAttrDice}cs0cf0}]]}}"
-									name="roll_CastAttack" >
+							<td class="sheet-width-W5 sheet-center">
+								<button class="sheet-diebutton-public" type="roll" 
+									title="Click to roll the attack" 
+									value="&{template:castattack_roll} {{name=@{Hero_Name} Attacks}} {{attackname=@{CastAttackName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{dice=@{CastAttackAttrDice}}} {{ticks=@{CastAttackSpeed}}} {{rollmod=[[@{CastAttackMod} + @{CastCircMod}]]}}  {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9  + @{CastAttackMod} + @{CastCircMod} + @{cmvHiddenWoundPenalty} + @{CastAttackAttrDice}cs0cf0}]]}}"
+									name="roll_Attack">
 								</button>
+								<button class="sheet-diebutton-private" type="roll" 
+									title="Click to roll the attack" 
+									value="&{template:castattack_roll_private} {{name=@{Hero_Name} Attacks}} {{attackname=@{CastAttackName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{dice=@{CastAttackAttrDice}}} {{ticks=@{CastAttackSpeed}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9  + @{CastAttackMod} + @{CastCircMod} + @{cmvHiddenWoundPenalty} + @{CastAttackAttrDice}cs0cf0}]]}}"
+									name="roll_Attack">
+								</button>	
 							</td>
 							<td class="sheet-width-W7"><select class="sheet-dropdown sheet-width-W95" name="attr_CastBaseDamageDie" value="1d6" style="font-size: 75%;" title="The base damage die rolled for the weapon or power; include die bumps" >
 										<option value="1d0">None</option>
@@ -1804,7 +1912,7 @@ title="spend  to Ignore wound penalties,
 										<option value="5D12">5D12</option>
 								</select>
 							</td>				
-							<td class="sheet-width-W10 sheet-center"><select class="sheet-select-attr"  name="attr_CastDmgAttr" value="0"   
+							<td class="sheet-width-W8 sheet-center"><select class="sheet-select-attr"  name="attr_CastDmgAttr" value="0"   
 									title="select the attribute dice rolled for making the damage roll; inlcude any die bumps" style="font-size:75%;">
 									<option value="1d0" selected="true">None</option>
 									<option value="1D4!">1d4</option> 
@@ -1834,14 +1942,20 @@ title="spend  to Ignore wound penalties,
 									<option value="5D12!">5D12</option>
 								</select>
 							</td>
-							<td class="sheet-width-W7 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_DamageMod" value="0" title="Total of all Damage modifiers; leave 0 if none."/></td>
+							<td class="sheet-width-W6 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_DamageMod" value="0" title="Total of all Damage modifiers; leave 0 if none."/></td>
+							<td class="sheet-width-W10 sheet-center"><input class="sheet-width-W100" type="text" name="attr_CastAttackSpecial" title="Special conditions applied to the attack." ></td>
 							<td class="sheet-width-W5 sheet-center"><span class="sheet-circle"><input type="text" name="attr_CastDmgRollImpact"  value="0" title="Impact Value of the attack; will be displayed in chat for quick reference."/></span></td>
 							<td class="sheet-width-W5 sheet-center">
-								<button class="sheet-diebutton" type="roll" 
-										title="Click to make a damage roll for the cast member's attack" 
-										value="&{template:cast_damage_roll} {{name=@{Hero_Name} rolls Damage}} {{AttName=@{CastAttackName}}} {{basedmgdice=@{CastBaseDamageDie}}}  {{special=@{special}}}{{DmgAttr=@{CastDmgAttr}}}  {{Impact=@{CastDmgRollImpact}}} {{rollmod=@{DamageMod}}} {{roll=[[0 + 0]}} {{roll=[[ {@{CastBaseDamageDie}cs0cf0 + @{CastDmgAttr}cs0cf0 + @{DamageMod}, 1d1}kh1 ]]}}"
-										name="roll_CastDamageRoll">
-								</button>
+									<button class="sheet-diebutton-public" type="roll" 
+										title="Click to make a Damage Roll" 
+										value="&{template:damage_roll} {{name=@{Hero_Name} rolls Damage}} {{attname=@{CastAttackName}}} {{conditions=@{CastAttackSpecial}}} {{basedmgdice=@{CastBaseDamageDie}}} {{attributedmgdice=@{CastDmgAttr}}} {{impact=@{CastDmgRollImpact}}} {{rollmod=@{DamageMod}}} {{roll=[[ {@{CastBaseDamageDie}cs0cf0 + @{CastDmgAttr}cs0cf0 + @{DamageMod}, 1d1}kh1 ]]}}"
+										name="roll_DamageRoll">
+									</button>
+									<button class="sheet-diebutton-private" type="roll" 
+										title="Click to make a Damage Roll" 
+										value="&{template:damage_roll_private} {{name=@{Hero_Name} rolls Damage}} {{attname=@{CastAttackName}}} {{conditions=@{CastAttackSpecial}}} {{basedmgdice=@{CastBaseDamageDie}}} {{attributedmgdice=@{CastDmgAttr}}} {{impact=@{CastDmgRollImpact}}} {{rollmod=@{DamageMod}}} {{roll=[[0 + 0]}} {{roll=[[ {@{CastBaseDamageDie}cs0cf0 + @{CastDmgAttr}cs0cf0 + @{DamageMod}, 1d1}kh1 ]]}}"
+										name="roll_DamageRoll">
+									</button>
 							</td>			
 						</tr>
 				</table>
@@ -1907,12 +2021,18 @@ title="spend  to Ignore wound penalties,
 											<option value="5D12!">5D12</option>
 										</select>
 									</td>				
-									<td class="sheet-width-W10 sheet-center"><button class="sheet-diebutton" type="roll" 
-										title="Click to make a Skill Action Roll" 
-										value="&{template:cast_powerskill_roll} {{name=@{Hero_Name} makes a Skill roll}} {{SkillPowerName=@{CastSkillName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{Type=Skill}} {{rolldice=@{CastSkillAttr}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CastSkillAttr}cs0cf0 + @{CastSkillMod} + @{cmvHiddenWoundPenalty} ]]}}" 
-										name="roll_CastSkillRoll">
-										</button>								
-									</td>
+									<td class="sheet-width-W10 sheet-center">
+										<button class="sheet-diebutton-public" type="roll" 
+											title="Click to make a skill roll" 
+											value="&{template:castskill_roll} {{name=@{Hero_Name} makes a skill roll}} {{rolled=@{CastSkillName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{CastSkillAttr}}} {{rollmod=@{CastSkillMod}}} {{roll=[[ 2d10cs>2cf<9 + @{CastSkillAttr}cs0cf0 + @{CastSkillMod} + @{cmvHiddenWoundPenalty} ]]}}" 
+											name="roll_MakeASkillRoll">
+										</button>
+										<button class="sheet-diebutton-private" type="roll" 
+											title="Click to make a skill roll" 
+											value="&{template:castskill_roll_private} {{name=@{Hero_Name} makes a skill roll}} {{rolled=@{CastSkillName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{CastSkillAttr}}} {{rollmod=@{CastSkillMod}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CastSkillAttr}cs0cf0 + @{CastSkillMod} + @{cmvHiddenWoundPenalty} ]]}}" 
+											name="roll_MakeASkillRoll">
+										</button>
+									</td>											
 								</tr>
 						</table>
 					</fieldset>
@@ -1936,9 +2056,9 @@ title="spend  to Ignore wound penalties,
 						<table>
 								<tr>
 									<td class="sheet-width-W45">
-										<input class="sheet-width-W85 sheet-hover" type="text" name="attr_CastPowerName" title="name of the skill"/>
+										<input class="sheet-width-W85 sheet-hover" type="text" name="attr_CastPowerName" title="name of the power"/>
 										<span name="attr_PowerDescR-tooltip" class="sheet-tooltip"></span>
-										<input type="checkbox" class="sheet-hover-hidden" title="click to show or hide skill foci and details." /><span></span>
+										<input type="checkbox" class="sheet-hover-hidden" title="click to show or hide power details." /><span></span>
 										<textarea placeholder="Click to open a freeform field for capturing power details for quick reference: description, modifications, tricks, flaws, perks, etc." class="sheet-tooltip  sheet-width-W75" name="attr_PowerDescR-tooltip"></textarea>
 									</td>				
 									<td class="sheet-width-W15 sheet-center"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_CastPowerMod"  value="0" title="modifier to the power action roll"/></td>											
@@ -1974,10 +2094,15 @@ title="spend  to Ignore wound penalties,
 										</select>
 									</td>									
 									<td class="sheet-width-W10 sheet-center">
-										<button class="sheet-diebutton" type="roll" 
-											title="Click to make a power action roll" 
-											value="&{template:cast_powerskill_roll} {{name=@{Hero_Name} makes a Power roll}} {{SkillPowerName=@{CastPowerName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{Type=Power}} {{rolldice=@{CastPowerAttr}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CastPowerAttr}cs0cf0 + @{CastPowerMod} + @{cmvHiddenWoundPenalty} ]]}}" 
-											name="roll_CastPowerRollR">
+										<button class="sheet-diebutton-public" type="roll" 
+											title="Power Roll" 
+											value="&{template:castpower_roll} {{name=@{Hero_Name} makes a power roll}} {{rolled=@{CastPowerName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{CastPowerAttr}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CastPowerAttr}cs0cf0 + @{CastPowerMod} + @{cmvHiddenWoundPenalty} ]]}}" 
+											name="roll_MakeAPowerRoll">
+										</button>
+										<button class="sheet-diebutton-private" type="roll" 
+											title="Power Roll" 
+											value="&{template:castpower_roll_private} {{name=@{Hero_Name} makes a power roll}} {{rolled=@{CastPowerName}}} {{wndpen=@{cmvHiddenWoundPenalty}}} {{rolldice=@{CastPowerAttr}}} {{roll=[[0 + 0]}} {{roll=[[ 2d10cs>2cf<9 + @{CastPowerAttr}cs0cf0 + @{CastPowerMod} + @{cmvHiddenWoundPenalty} ]]}}" 
+											name="roll_MakeAPowerRoll">
 										</button>
 									</td>			
 								</tr>
@@ -1987,6 +2112,35 @@ title="spend  to Ignore wound penalties,
 			</div>
 		</div>	
 	</div>	
+	
+	
+		<!--Master Table Lookup -->
+		<div class="sheet-header">Master Table Lookup</div>
+		<div class="sheet-subsection"> 	<!-- Beginning of generic roll subsection -->
+			<table>		
+				<tr>					
+					<td class="sheet-width-W10"><h3 class="sheet-header-override">Score</h3></td>
+					<td class="sheet-width-W10"><h3>Base Die</h3></td>
+					<td class="sheet-width-W10"><h3>Psv Mod</h3></td>
+					<td class="sheet-width-W10"><h3>Max Lift</h3></td>
+					<td class="sheet-width-W20"><h3>Examples</h3></td>
+					<td class="sheet-width-W10"><h3>Throw</h3></td>
+					<td class="sheet-width-W10"><h3>Push/Drag</h3></td>
+					<td class="sheet-width-W30"><h3>Top MPH</h3></td>				
+				</tr>
+				<tr>
+					<td class="sheet-width-W10"><input class="sheet-width-W100 sheet-spin-button" type="number" name="attr_MTScore" value="0" title="Enter the score to perform a master table lookup; min 0/max 51." /></td>
+					<td class="sheet-width-W10 sheet-center"><input readonly class="sheet-width-W100 med-textblock sheet-center" type="Text" name="attr_MTBaseDie" value="--" /></td>
+					<td class="sheet-width-W10 sheet-center"><span class="sheet-circle"><input readonly type="number" name="attr_MTPassiveMod" value="0" /></span></td>
+					<td class="sheet-width-W10 sheet-center"><input readonly class="sheet-width-W100 med-textblock sheet-center" type="Text" name="attr_MTMaxLift" value="0" /></td>
+					<td class="sheet-width-W20 sheet-center"><input readonly class="sheet-width-W100 sheet-center" name="attr_MTExample" value="--" /></td>	
+					<td class="sheet-width-W05 sheet-center"><span class="sheet-circle"><input readonly type="number" name="attr_MTThrow" value="0"/></td>
+					<td class="sheet-width-W10 sheet-center"><input readonly class="sheet-width-W100 med-textblock sheet-center" type="Text" name="attr_MTPushDrag" value="0"/></td>
+					<td class="sheet-width-W30 sheet-center"><input readonly class="sheet-width-W100 sheet-center" name="attr_MTTopMPH" value="0"/></td>		
+				</tr>
+			</table>
+		</div>
+	
 </div>	
 
 <!-- ************************************** Hidden Fields for Sheet Workers ************************************** -->
@@ -2012,21 +2166,36 @@ title="spend  to Ignore wound penalties,
         <tr><td><span style="text-align:left; color:darkred"><b>{{attribute}} roll</b></span></td></tr>
         <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
 		<tr><td><span style="text-align:left"><b>Mod:</b>&nbsp;{{rollmod}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Wnd:</b>&nbsp;{{wndpen}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Bulk:</b>&nbsp;{{bulkpen}}</span></td></tr>  
-		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{attributeroll}}</span></td></tr> 
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>	
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-action_roll_private">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{attribute}} roll</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
     </table>	
 </rolltemplate>
-
 <rolltemplate class="sheet-rolltemplate-damage_roll">
 	<table>
         <tr><th colspan="2">{{name}}</th></tr>
         <tr><td><span style="text-align:left; color:darkred"><b>{{attname}}</b></span></td></tr>
         <tr><td><span style="text-align:left"><i>Rolling {{basedmgdice}}+{{attributedmgdice}}</i></span></td></tr>
-        <tr><td><span style="text-align:left"><b>Conditions:</b>{{conditions}}</span></td></tr>
+        <tr><td><span style="text-align:left"><b>Conditions:</b>&nbsp;{{conditions}}</span></td></tr>
 		<tr><td><span style="text-align:left"><b>Mod:</b>&nbsp;{{rollmod}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Impact:</b>&nbsp;{{impact}}</span></td></tr>  
-		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{damageroll}}</span></td></tr> 
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>	
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-damage_roll_private">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{attname}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling {{basedmgdice}}+{{attributedmgdice}}</i></span></td></tr>
+        <tr><td><span style="text-align:left"><b>Conditions:</b>&nbsp;{{conditions}}</span></td></tr>
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
     </table>	
 </rolltemplate>
-
 <rolltemplate class="sheet-rolltemplate-skill_roll">
 	<table>
         <tr><th colspan="2">{{name}}</th></tr>
@@ -2036,7 +2205,31 @@ title="spend  to Ignore wound penalties,
 		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
     </table>
 </rolltemplate>
-
+<rolltemplate class="sheet-rolltemplate-skill_roll_private">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{rolled}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-castskill_roll">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{rolled}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Mods:</b>&nbsp;{{rollmod}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Wnd:</b>&nbsp;{{wndpen}}</span></td></tr>  
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-castskill_roll_private">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{rolled}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-power_roll">
 	<table>
         <tr><th colspan="2">{{name}}</th></tr>
@@ -2047,37 +2240,80 @@ title="spend  to Ignore wound penalties,
 		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
     </table>
 </rolltemplate>
-
+<rolltemplate class="sheet-rolltemplate-power_roll_private">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{rolled}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
+        <tr><td><span style="text-align:left"><b>Ticks:</b>&nbsp;{{ticks}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Range:</b>&nbsp;{{range}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Burnout:</b>&nbsp;{{burnout}}</span></td></tr> 
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-castpower_roll">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{rolled}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}</span></td></tr> 
+		<tr><td><span style="text-align:left"><b>Mods:</b>&nbsp;{{rollmod}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Wnd:</b>&nbsp;{{wndpen}}</span></td></tr>  
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-castpower_roll_private">
+	<table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{rolled}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{rolldice}}</i></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-attack_roll">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span style="text-align:left; color:darkred"><b>{{AttackName}}</b></span></td></tr>
-        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{Dice}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Rank:</b>&nbsp;{{rank}}</i></span></td></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{attackname}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{dice}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Rank:</b>&nbsp;{{rank}}</i></span></td></tr>
         <tr><td><span style="text-align:left"><b>Maneuver:</b>&nbsp;{{maneuver}}&nbsp;({{manmod}})</span></td></tr>
         <tr><td><span style="text-align:left"><b>vs Defense:</b>&nbsp;{{defense}}&nbsp;&nbsp;|&nbsp;&nbsp;Ticks:</b>&nbsp;{{ticks}}</span></td></tr> 
 		<tr><td><span style="text-align:left"><b>Mods:</b>&nbsp;{{rollmod}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Wnd:</b>&nbsp;{{wndpen}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Bulk:</b>&nbsp;{{bulkpen}}</span></td></tr>  
 		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
     </table>
 </rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-general_roll">
+<rolltemplate class="sheet-rolltemplate-attack_roll_private">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Action: </span></td><td><span style="text-align:left">{{Action}}</span></td></tr>
-        <tr><td><span class="tcat">Dice: </span></td><td><span style="text-align:left">{{Rolled}}</span></td></tr>
-        <tr><td><span class="tcat">Rank: </span></td><td><span style="text-align:left">{{Rank}}</span></td></tr>
-        <tr><td><span class="tcat">Modifier: </span></td><td><span style="text-align:left">{{APARMod}}</span></td></tr>
-		<tr><td><span class="tcat">Wnd Pen: </span></td><td><span style="text-align:left">{{wndpen}}</span></td></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{GeneralRoll}}</span></td></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{attackname}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{dice}}</i></span></td></tr>
+        <tr><td><span style="text-align:left"><b>Maneuver:</b>&nbsp;{{maneuver}}&nbsp;({{manmod}})</span></td></tr>
+        <tr><td><span style="text-align:left"><b>vs Defense:</b>&nbsp;{{defense}}&nbsp;&nbsp;|&nbsp;&nbsp;Ticks:</b>&nbsp;{{ticks}}</span></td></tr> 
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-castattack_roll">
+    <table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{attackname}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{dice}}&nbsp;&nbsp;|&nbsp;&nbsp;Ticks:</b>&nbsp;{{ticks}}</i></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Mods:</b>&nbsp;{{rollmod}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Wnd:</b>&nbsp;{{wndpen}}</span></td></tr>  
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-castattack_roll_private">
+    <table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{attackname}}</b></span></td></tr>
+        <tr><td><span style="text-align:left"><i>Rolling 2d10+{{dice}}&nbsp;&nbsp;|&nbsp;&nbsp;Ticks:</b>&nbsp;{{ticks}}</span></td></tr> 
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
     </table>
 </rolltemplate>
-
 <rolltemplate class="sheet-rolltemplate-init_roll">
     <table>
         <tr><th colspan="2"><b>{{name}}:</b> {{initroll}}</th></tr>
 	</table>
 </rolltemplate>
-
+<rolltemplate class="sheet-rolltemplate-init_roll_private">
+    <table>
+        <tr><th colspan="2"><b>{{name}}:</b> {{roll}}</th></tr>
+	</table>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-burnout_roll">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
@@ -2085,90 +2321,134 @@ title="spend  to Ignore wound penalties,
 		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{boroll}}</span></td></tr> 
     </table>
 </rolltemplate>
-
+<rolltemplate class="sheet-rolltemplate-burnout_roll_private">
+    <table>
+        <tr><th colspan="2">{{name}}</th></tr>
+        <tr><td><span style="text-align:left; color:darkred"><b>{{text}}</b></span></td></tr>
+		<tr><td><span style="text-align:left"><b>Roll:</b>&nbsp;{{roll}}</span></td></tr> 
+    </table>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-plotdie_roll">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
-		<tr><td><span style="text-align:left"><b>Die:</b>&nbsp;{{die}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Roll:</b>&nbsp;{{plotdieroll}}</span></td></tr>  
+		<tr><td><span style="text-align:left"><b>Die:</b>&nbsp;{{plotdie}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Roll:</b>&nbsp;{{plotdieroll}}</span></td></tr>  
     </table>
 </rolltemplate>
-
-
-<!-- ##### Cast Member Die Rolls ##### -->
-
-
-<rolltemplate class="sheet-rolltemplate-cast_init_roll">
+<rolltemplate class="sheet-rolltemplate-plotdie_roll_private">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
+		<tr><td><span style="text-align:left"><b>Die:</b>&nbsp;{{plotdie}}&nbsp;&nbsp;|&nbsp;&nbsp;<b>Roll:</b>&nbsp;{{roll}}</span></td></tr>  
     </table>
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-cast_powerskill_roll">
-    <table>
-        <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Skill: </span></td><td><span style="text-align:left">{{skillpowername}}</span></td></tr>
-        <tr><td><span class="tcat">Type: </span></td><td><span style="text-align:left">{{type}}</span></td></tr>
-        <tr><td><span class="tcat">Dice: </span></td><td><span style="text-align:left">{{rolldice}}</span></td></tr>
-		<tr><td><span class="tcat">Wnd Pen: </span></td><td><span style="text-align:left">{{wndpen}}</span></td></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-cast_plotdie_roll">
-    <table>
-        <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Plot Die: </span></td><td><span style="text-align:left">{{Die}}</span></td></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-cast_action_roll">
-    <table>
-        <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Attribute: </span></td><td><span style="text-align:left">{{attribute}}</span></td></tr>
-        <tr><td><span class="tcat">Attribute Dice: </span></td><td><span style="text-align:left">{{rolldice}}</span></td></tr>
-		<tr><td><span class="tcat">Wnd Pen: </span></td><td><span style="text-align:left">{{wndpen}}</span></td></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-cast_attack_roll">
-    <table>
-        <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Attack: </span></td><td><span style="text-align:left">{{AttName}}</span></td></tr>
-        <tr><td><span class="tcat">Dice: </span></td><td><span style="text-align:left">{{Dice}}</span></td></tr>
-		<tr><td><span class="tcat">Range: </span></td><td><span style="text-align:left">{{Range}}</span></td></tr>
-		<tr><td><span class="tcat">Speed: </span></td><td><span style="text-align:left">{{Ticks}} Ticks</span></td></tr>
-		<tr><td><span class="tcat">Wnd Pen: </span></td><td><span style="text-align:left">{{wndpen}}</span></td></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-cast_damage_roll">
-    <table>
-        <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Attack: </span></td><td><span style="text-align:left">{{AttName}}</span></td></tr>
-        <tr><td><span class="tcat">Base Dice: </span></td><td><span style="text-align:left">{{basedmgdice}}</span></td></tr>
-        <tr><td><span class="tcat">Attribute: </span></td><td><span style="text-align:left">{{DmgAttr}}</span></td></tr>	
-        <tr><td><span class="tcat">Damage Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
-        <tr><td><span class="tcat">Impact Mod: </span></td><td><span style="text-align:left">{{Impact}}</span></td></tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-cast_burnout_roll">
-    <table>
-        <tr><th colspan="2">{{name}}</th></tr>
-        <tr><td><span class="tcat">Test: </span></td><td><span style="text-align:left">{{Text}}</span></td></tr>
-        <tr><td><span class="tcat">Roll: </span></td><td><span style="text-align:left">{{roll}}</span></td></tr>
-    </table>
-</rolltemplate>
 </div>
 
 <!-- ************************************** Script Workers ************************************** -->
 <script type="text/worker">
+
 	
-	// EXECUTE: Update plotdie for cosmetic display in die roll - strip out ban signs used in die rolls
+	// EXECUTE: When the sheet is opened, update score fields for anyone using an older sheet.
+	on('sheet:opened',function(){
+		// Update Modified Mi to ensure it is current
+		getAttrs(["mightscore","miscoremod"], function(values) { 
+			var base = (values.mightscore*1);
+			var modifier = (values.miscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedmi: score});
+		});
+		// Update Modified Pr to ensure it is current
+		getAttrs(["prowessscore","prscoremod"], function(values) { 
+			var base = (values.prowessscore*1);
+			var modifier = (values.prscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedpr: score});
+		});
+		// Update Modified Qu to ensure it is current
+		getAttrs(["quicknessscore","quscoremod"], function(values) { 
+			var base = (values.quicknessscore*1);
+			var modifier = (values.quscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedqu: score});
+		});
+		// Update Modified Vi to ensure it is current
+		getAttrs(["vigorscore","viscoremod"], function(values) { 
+			var base = (values.vigorscore*1);
+			var modifier = (values.viscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedvi: score});
+		});
+		// Update Modified ch to ensure it is current
+		getAttrs(["charismascore","chscoremod"], function(values) { 
+			var base = (values.charismascore*1);
+			var modifier = (values.chscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedch: score});
+		});
+		// Update Modified in to ensure it is current
+		getAttrs(["insightscore","inscoremod"], function(values) { 
+			var base = (values.insightscore*1);
+			var modifier = (values.inscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedin: score});
+		});
+		// Update Modified lo to ensure it is current
+		getAttrs(["logicscore","loscoremod"], function(values) { 
+			var base = (values.logicscore*1);
+			var modifier = (values.loscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedlo: score});
+		});
+		// Update Modified re to ensure it is current
+		getAttrs(["resolvescore","rescoremod"], function(values) { 
+			var base = (values.resolvescore*1);
+			var modifier = (values.rescoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			setAttrs({modifiedre: score});
+		});
+	});
+	
+	// EXECUTE: Master Table Lookup
+	on("change:mtscore", function() {
+		getAttrs(["mtscore"], function(values) {
+	 		var score = Math.max(0,(values.mtscore*1));
+			score = Math.min(51,score);
+		setAttrs({test1: score }); 
+	 		// set values based on score lookup value
+			var ludie = lookup_mastertable_basedisplaydie(score);
+			var lupv = lookup_mastertable_pv(score);
+			var lulift = lookup_mastertable_lift(score);
+			var luexample = lookup_mastertable_example(score);
+			var luthrow = lookup_mastertable_throw(score);
+			var lupush = lookup_mastertable_push(score);
+			var lumph = lookup_mastertable_mph(score);
+		setAttrs({test2: ludie }); 
+			setAttrs({mtbasedie: ludie}); 		// set base die
+			setAttrs({mtpassivemod: lupv}); 	// set passive value
+			setAttrs({mtmaxlift: lulift}); 		// set Might Max Lift
+			setAttrs({mtexample: luexample}); 	// set Example
+			setAttrs({mtthrow: luthrow}); 		// set Might Throw
+			setAttrs({mtpushdrag: lupush}); 	// set Might Push Drag
+			setAttrs({mttopmph: lumph}); 		// set Top MPH
+		});
+	});
+	
+	// EXECUTE: Update plotdie for cosmetic display in die roll - strip out ! signs used in die rolls
 	on("change:plotdie", function() {
 		getAttrs(["plotdie"], function(values) {
 	 		var tempdie = (values.plotdie);
@@ -2358,7 +2638,7 @@ title="spend  to Ignore wound penalties,
 					modifier = -3;
 					break;
 				case "Headshot":
-					modifier = 0;
+					modifier = -6;
 					break;
 				case "Single Shot":
 					modifier = 0;
@@ -3009,9 +3289,12 @@ title="spend  to Ignore wound penalties,
 	//**************************************************************************************************************************
 
 	// EXECUTE: Auto-update MIGHT and dependent fields when its attribute score changes
-	on("change:mightscore", function() { 
-		getAttrs(["mightscore","mightdiebump"], function(values) { 
-			var score = Math.max(0,(values.mightscore*1)); 			// set internal variable = new score
+	on("change:mightscore change:miscoremod", function() { 
+		getAttrs(["mightscore","miscoremod","mightdiebump"], function(values) { 
+			var base = (values.mightscore*1);
+			var modifier = (values.miscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				//  lookup passive value based on score
 			var nlift = lookup_mastertable_lift(score); 			// lookup lift based on score
@@ -3022,6 +3305,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.mightdiebump*1);					// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedmi: score});
 			setAttrs({mightmodifier: newpv});
 			setAttrs({maxlift: nlift});
 			setAttrs({throwrange: nthrow});
@@ -3043,9 +3327,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update MIGHT die when die bump is changed
 	on("change:mightdiebump", function() { 
-		getAttrs(["mightscore","mightdiebump"], function(values) { 
+		getAttrs(["modifiedmi","mightdiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.mightscore*1));
+			var score = Math.max(0,(values.modifiedmi*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.mightdiebump*1);
@@ -3062,9 +3346,12 @@ title="spend  to Ignore wound penalties,
 	});		
 	
 	// EXECUTE: Auto-update PROWESS and dependent fields when its attribute score changes
-	on("change:prowessscore", function() { 
-		getAttrs(["prowessscore","prowessdiebump"], function(values) { 
-			var score = Math.max(0,(values.prowessscore*1)); 		// set internal variable = new score
+	on("change:prowessscore change:prscoremod", function() { 
+		getAttrs(["prowessscore","prowessdiebump","prscoremod"], function(values) { 
+			var base = (values.prowessscore*1);
+			var modifier = (values.prscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
 			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
@@ -3072,6 +3359,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.prowessdiebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedpr: score});
 			setAttrs({prowessmodifier: newpv});
 			
 			// determine new die based on score
@@ -3090,9 +3378,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update PROWESS die when die bump is changed
 	on("change:prowessdiebump", function() { 
-		getAttrs(["prowessscore","prowessdiebump"], function(values) { 
+		getAttrs(["modifiedpr","prowessdiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.prowessscore*1));
+			var score = Math.max(0,(values.modifiedpr*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.prowessdiebump*1);
@@ -3109,16 +3397,20 @@ title="spend  to Ignore wound penalties,
 	});		
 	
 	// EXECUTE: Auto-update QUICKNESS and dependent fields when its attribute score changes
-	on("change:quicknessscore", function() { 
-		getAttrs(["quicknessscore","quicknessdiebump"], function(values) { 
-			var score = Math.max(0,(values.quicknessscore*1)); 			// set internal variable = new score
-			score = Math.min(51,score);									// score lookup does not go above 51
-			var newpv = lookup_mastertable_pv(score); 					// lookup passive value based on score
-			var ndie = lookup_mastertable_die(score);			 		// lookup die based on score
-			var nposition = lookup_mastertable_diebumppos(ndie); 		// lookup die position
-			var diebump = (values.quicknessdiebump*1);					// get die bump
+	on("change:quicknessscore change:quscoremod", function() { 
+		getAttrs(["quicknessscore","quicknessdiebump","quscoremod"], function(values) { 
+			var base = (values.quicknessscore*1);
+			var modifier = (values.quscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
+			score = Math.min(51,score);								// score lookup does not go above 51
+			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
+			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
+			var nposition = lookup_mastertable_diebumppos(ndie); 	// lookup die position
+			var diebump = (values.quicknessdiebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedqu: score});
 			setAttrs({quicknessmodifier: newpv});
 			
 			// determine new die based on score
@@ -3151,9 +3443,9 @@ title="spend  to Ignore wound penalties,
 	
 	// EXECUTE: Auto-update QUICKNESS die when die bump is changed
 	on("change:quicknessdiebump", function() { 
-		getAttrs(["quicknessscore","quicknessdiebump"], function(values) { 
+		getAttrs(["modifiedqu","quicknessdiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.quicknessscore*1));
+			var score = Math.max(0,(values.modifiedqu*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.quicknessdiebump*1);
@@ -3171,9 +3463,12 @@ title="spend  to Ignore wound penalties,
 	
 	
 	// EXECUTE: Auto-update VIGOR and dependent fields when its attribute score changes
-	on("change:vigorscore", function() { 
-		getAttrs(["vigorscore","vigordiebump"], function(values) { 
-			var score = Math.max(0,(values.vigorscore*1)); 			// set internal variable = new score
+	on("change:vigorscore change:viscoremod", function() { 
+		getAttrs(["vigorscore","vigordiebump","viscoremod"], function(values) { 
+			var base = (values.vigorscore*1);
+			var modifier = (values.viscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
 			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
@@ -3181,6 +3476,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.vigordiebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedvi: score});
 			setAttrs({vigormodifier: newpv});
 			
 			// determine new die based on score
@@ -3199,9 +3495,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update VIGOR die when die bump is changed
 	on("change:vigordiebump", function() { 
-		getAttrs(["vigorscore","vigordiebump"], function(values) { 
+		getAttrs(["modifiedvi","vigordiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.vigorscore*1));
+			var score = Math.max(0,(values.modifiedvi*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.vigordiebump*1);
@@ -3218,9 +3514,12 @@ title="spend  to Ignore wound penalties,
 	});		
 	
 	// EXECUTE: Auto-update CHARISMA and dependent fields when its attribute score changes
-	on("change:charismascore", function() { 
-		getAttrs(["charismascore","charismadiebump"], function(values) { 
-			var score = Math.max(0,(values.charismascore*1)); 		// set internal variable = new score
+	on("change:charismascore change:chscoremod", function() { 
+		getAttrs(["charismascore","charismadiebump","chscoremod"], function(values) { 
+			var base = (values.charismascore*1);
+			var modifier = (values.chscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
 			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
@@ -3228,6 +3527,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.charismadiebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedch: score});
 			setAttrs({charismamodifier: newpv});
 			
 			// determine new die based on score
@@ -3246,9 +3546,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update CHARISMA die when die bump is changed
 	on("change:charismadiebump", function() { 
-		getAttrs(["charismascore","charismadiebump"], function(values) { 
+		getAttrs(["modifiedch","charismadiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.charismascore*1));
+			var score = Math.max(0,(values.modifiedch*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.charismadiebump*1);
@@ -3265,9 +3565,12 @@ title="spend  to Ignore wound penalties,
 	});		
 	
 	// EXECUTE: Auto-update INSIGHT and dependent fields when its attribute score changes
-	on("change:insightscore", function() { 
-		getAttrs(["insightscore","insightdiebump"], function(values) { 
-			var score = Math.max(0,(values.insightscore*1)); 		// set internal variable = new score
+	on("change:insightscore change:inscoremod", function() { 
+		getAttrs(["insightscore","insightdiebump","inscoremod"], function(values) { 
+			var base = (values.insightscore*1);
+			var modifier = (values.inscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
 			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
@@ -3275,6 +3578,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.insightdiebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedin: score});
 			setAttrs({insightmodifier: newpv});
 			
 			// determine new die based on score
@@ -3293,9 +3597,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update INSIGHT die when die bump is changed
 	on("change:insightdiebump", function() { 
-		getAttrs(["insightscore","insightdiebump"], function(values) { 
+		getAttrs(["modifiedin","insightdiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.insightscore*1));
+			var score = Math.max(0,(values.modifiedin*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.insightdiebump*1);
@@ -3312,9 +3616,12 @@ title="spend  to Ignore wound penalties,
 	});		
 	
 	// EXECUTE: Auto-update LOGIC and dependent fields when its attribute score changes
-	on("change:logicscore", function() { 
-		getAttrs(["logicscore","logicdiebump"], function(values) { 
-			var score = Math.max(0,(values.logicscore*1)); 			// set internal variable = new score
+	on("change:logicscore change:loscoremod", function() { 
+		getAttrs(["logicscore","logicdiebump","loscoremod"], function(values) { 
+			var base = (values.logicscore*1);
+			var modifier = (values.loscoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
 			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
@@ -3322,6 +3629,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.logicdiebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedlo: score});
 			setAttrs({logicmodifier: newpv});
 			
 			// determine new die based on score
@@ -3340,9 +3648,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update LOGIC die when die bump is changed
 	on("change:logicdiebump", function() { 
-		getAttrs(["logicscore","logicdiebump"], function(values) { 
+		getAttrs(["modifiedlo","logicdiebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.logicscore*1));
+			var score = Math.max(0,(values.modifiedlo*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.logicdiebump*1);
@@ -3359,9 +3667,12 @@ title="spend  to Ignore wound penalties,
 	});		
 	
 	// EXECUTE: Auto-update RESOLVE and dependent fields when its attribute score changes
-	on("change:resolvescore", function() { 
-		getAttrs(["resolvescore","resolvediebump"], function(values) { 
-			var score = Math.max(0,(values.resolvescore*1)); 		// set internal variable = new score
+	on("change:resolvescore change:rescoremod", function() { 
+		getAttrs(["resolvescore","resolvediebump","rescoremod"], function(values) { 
+			var base = (values.resolvescore*1);
+			var modifier = (values.rescoremod*1);
+			var score = base + modifier;
+			score = Math.max(0,score); 								// score lookup does not go below 0
 			score = Math.min(51,score);								// score lookup does not go above 51
 			var newpv = lookup_mastertable_pv(score); 				// lookup passive value based on score
 			var ndie = lookup_mastertable_die(score);			 	// lookup die based on score
@@ -3369,6 +3680,7 @@ title="spend  to Ignore wound penalties,
 			var diebump = (values.resolvediebump*1);				// get die bump
 			
 			// set fields based on changed score
+			setAttrs({modifiedre: score});
 			setAttrs({resolvemodifier: newpv});
 			
 			// determine new die based on score
@@ -3387,9 +3699,9 @@ title="spend  to Ignore wound penalties,
 
 	// EXECUTE: Auto-update RESOLVE die when die bump is changed
 	on("change:resolvediebump", function() { 
-		getAttrs(["resolvescore","resolvediebump"], function(values) { 
+		getAttrs(["modifiedre","resolvediebump"], function(values) { 
 			// get base score and lookup die to get position
-			var score = Math.max(0,(values.resolvescore*1));
+			var score = Math.max(0,(values.modifiedre*1));
 			var basedie = lookup_mastertable_die(score);
 			var baseposition = lookup_mastertable_diebumppos(basedie); // lookup die position
 			var diebump = (values.resolvediebump*1);
@@ -3525,6 +3837,64 @@ title="spend  to Ignore wound penalties,
 		};
     };
 	
+	// FUNCTION: lookup table for max lift
+    var lookup_mastertable_example = function(score) {
+			switch(score) {
+                case 1: return "Medium Dog or small child";
+                case 2: return "Armchair";	
+                case 3: return "Dresser or Brick of Gold";
+                case 4: return "Average Human";	
+                case 5: return "Manhole Cover";	
+                case 6: return "Male Lion";	
+                case 7: return "Drum of Oil";	
+                case 8: return "MotorCycle";	
+                case 9: return "ATV";	
+                case 10: return "Large Vending Machine";	
+                case 11: return "Touring Motorcycle";
+                case 12: return "Telephone Pole";
+                case 13: return "Average Car";	
+                case 14: return "Large Truck";	
+                case 15: return "Armored Limo";	
+                case 16: return "Subway Car";	
+                case 17: return "Semi-Truck";	
+                case 18: return "Train Boxcar";	
+                case 19: return "School Bus";	
+                case 20: return "Stryker APC";	
+                case 21: return "Large Bridge";	
+                case 22: return "M1 Tank";	
+                case 23: return "Coastguard Cutter";	
+                case 24: return "Locomotive";	
+                case 25: return "747";	
+                case 26: return "Drilling Rig";	
+                case 27: return "Space Shuttle";	
+                case 28: return "Eiffel Tower";	
+                case 29: return "Attack Submarine";	
+                case 30: return "Polar Class Icebreaker";	
+                case 31: return "Freighter Ship";	
+                case 32: return "Aircraft Carrier";	
+                case 33: return "Supercarrier";	
+                case 34: return "Empire State Building";	
+                case 35: return "DubAi Tower";	
+                case 36: return "10 Supercarriers";		
+                case 37: return "20 Supercarriers";		
+                case 38: return "8 Empire State Buildings";		
+                case 39: return "Pyramid of Giza";		
+                case 40: return "2 Pyramids of Giza";		
+                case 41: return "Yangtze Three Gorges Dam";		
+                case 42: return "64 Million tons";		
+                case 43: return "128 Million tons";		
+                case 44: return "256 Million tons";		
+                case 45: return "512 Million tons";		
+                case 46: return "1 Billion tons";			
+                case 47: return "2 Billion tons";		
+                case 48: return "4 Billion tons";		
+                case 49: return "8 Billion tons";		
+                case 50: return "16 Billion tons";		
+                case 51: return "A Small Mountain";
+                case 0:
+                case "default": return "none";
+		};
+    };	
 	
 	// FUNCTION: lookup table for max push/drag
     var lookup_mastertable_push = function(score) {
@@ -3573,13 +3943,13 @@ title="spend  to Ignore wound penalties,
                 case 42: return "128M tons";		
                 case 43: return "256M tons";		
                 case 44: return "512M tons";		
-                case 45: return "1T tons";			
-                case 46: return "2T tons";		
-                case 47: return "4T tons";		
-                case 48: return "8T tons";		
-                case 49: return "16T tons";		
-                case 50: return "32T tons";		
-                case 51: return "64T tons";
+                case 45: return "1B tons";			
+                case 46: return "2B tons";		
+                case 47: return "4B tons";		
+                case 48: return "8B tons";		
+                case 49: return "16B tons";		
+                case 50: return "32B tons";		
+                case 51: return "64B tons";
 				case 0:
 				case "default": "none";
 		};
@@ -3761,6 +4131,64 @@ title="spend  to Ignore wound penalties,
 				case "default": return "1d0";
 		};
     };
+	// FUNCTION: Base Die Master Table lookup (do not use for rolls as the -- will break the roll)
+    var lookup_mastertable_basedisplaydie = function(score) {
+			switch(score) {
+				case 0: return "--";
+                case 1: return "1d4";
+                case 2: return "1d6";
+                case 3: return "1d6";	
+                case 4: return "1d8";	
+                case 5: return "1d8";	
+                case 6: return "1d8";	
+                case 7: return "1d10";	
+                case 8: return "1d10";	
+                case 9: return "1d10";	
+                case 10: return "1d10";	
+                case 11: return "1d12";
+                case 12: return "1d12";
+                case 13: return "1d12";	
+                case 14: return "1d12";	
+                case 15: return "1d12+1d4";	
+                case 16: return "1d12+1d4";	
+                case 17: return "1d12+1d4";	
+                case 18: return "1d12+1d4";	
+                case 19: return "1d12+1d6";	
+                case 20: return "1d12+1d6";	
+                case 21: return "1d12+1d6";	
+                case 22: return "1d12+1d6";	
+                case 23: return "1d12+1d8";	
+                case 24: return "1d12+1d8";
+                case 25: return "1d12+1d8";	
+                case 26: return "1d12+1d8";	
+                case 27: return "1d12+1d10";	
+                case 28: return "1d12+1d10";	
+                case 29: return "1d12+1d10";	
+                case 30: return "1d12+1d10";	
+                case 31: return "2d12";	
+                case 32: return "2d12";	
+                case 33: return "2d12";	
+                case 34: return "2d12";	
+                case 35: return "2d12+1d4";		
+                case 36: return "2d12+1d4";		
+                case 37: return "2d12+1d4";		
+                case 38: return "2d12+1d4";		
+                case 39: return "2d12+1d6";		
+                case 40: return "2d12+1d6";		
+                case 41: return "2d12+1d6";		
+                case 42: return "2d12+1d6";		
+                case 43: return "2d12+1d8";		
+                case 44: return "2d12+1d8";		
+                case 45: return "2d12+1d8";			
+                case 46: return "2d12+1d8";		
+                case 47: return "2d12+1d10";		
+                case 48: return "2d12+1d10";		
+                case 49: return "2d12+1d10";		
+                case 50: return "2d12+1d10";		
+                case 51: return "3d12";
+				case "default": return "---";
+		};
+    };
 	
 	// FUNCTION: lookup table for attribute die to display (not used for die rolling)
     var lookup_mastertable_displaydie = function(die) {