diff --git a/Wrath and Glory API/wrath_and_glory_api.html b/Wrath and Glory API/wrath_and_glory_api.html
index d452188f41..887d7ed25d 100644
--- a/Wrath and Glory API/wrath_and_glory_api.html	
+++ b/Wrath and Glory API/wrath_and_glory_api.html	
@@ -19,6 +19,7 @@
 <div> 
 
 	&nbsp;&nbsp;<input type="checkbox" class="sheet-block-switch" name="attr_selectview" title="Check if the character is an adversary not worthy of full stats, Troop, or mob."> <Span class="sheet-block-text"><b>Threat?</b></span><br>
+	&nbsp;&nbsp;<input type="checkbox" name="attr_roll-toggle" class="sheet-roll-useDice" value="0" title="check to use the standard Roll20 Dice Rolling mechanism vs the Wrath & Glory Dice Rolling API." /><Span class="sheet-block-text"><b> Use inline dice (vs API)?</b></span><br>
 
 	<!-- ************************************** Main Characters and NPC's ************************************** -->
 
@@ -113,11 +114,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_STRBonusRoll" value="0" title="Number of Bonus Dice added to the Strength roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_STRRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a attribute Strength roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Strength test." 
 										value="!wag {{[[[[@{STRAdj} + @{STRBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Strength --Modifier|@{STRRollMod}"
 										name="roll_strength" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Strength roll; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Strength}} {{dice=[[@{STRAdj} + @{STRBonusRoll}]]}} {{roll=[[[[@{STRAdj} + @{STRBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4strength" style="font-size: 175%;">
+									</button>									
 								</td>
 							</tr>
 							<tr>
@@ -128,11 +134,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBonusRoll" value="0" title="Number of Bonus Dice added to the Agility roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a attribute Agility roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Agility test." 
 										value="!wag {{[[[[@{AGLAdj} + @{AGLBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Agility --Modifier|@{AGLRollMod}"
 										name="roll_agility" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Agility test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Agility}} {{dice=[[@{AGLAdj} + @{AGLBonusRoll}]]}} {{roll=[[[[@{AGLAdj} + @{AGLBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4agility" style="font-size: 175%;">
+									</button>			
 								</td>
 							</tr>
 							<tr>
@@ -143,11 +154,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TGHBonusRoll" value="0" title="Number of Bonus Dice added to the Toughness roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TGHRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a attribute Toughness roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Toughness test." 
 										value="!wag {{[[[[@{TGHAdj} + @{TGHBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Toughness --Modifier|@{TGHRollMod}"
 										name="roll_toughness" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Toughness test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Toughness}} {{dice=[[@{TGHAdj} + @{TGHBonusRoll}]]}} {{roll=[[[[@{TGHAdj} + @{TGHBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4toughness" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -158,11 +174,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBonusRoll" value="0" title="Number of Bonus Dice added to the Intellect roll."/></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTRollMod" value="0" title="Modifier to the result of the die roll."/></td>  
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a attribute Intellect roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Intellect test." 
 										value="!wag {{[[[[@{INTAdj} + @{INTBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Intellect --Modifier|@{INTRollMod}"
 										name="roll_intellect" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make an Intellect test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Intellect}} {{dice=[[@{INTAdj} + @{INTBonusRoll}]]}} {{roll=[[[[@{INTAdj} + @{INTBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4intellect" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -173,11 +194,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WILLBonusRoll" value="0" title="Number of Bonus Dice added to the Willpower roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WILLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Willpower attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Willpower test." 
 										value="!wag {{[[[[@{WILLAdj} + @{WILLBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Willpower --Modifier|@{WILLRollMod}"
 										name="roll_willpower" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Willpower test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Willpower}} {{dice=[[@{WILLAdj} + @{WILLBonusRoll}]]}} {{roll=[[[[@{WILLAdj} + @{WILLBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4willpower" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -188,11 +214,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_FELBonusRoll" value="0" title="Number of Bonus Dice added to the Fellowship roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_FELRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Fellowship attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Fellowship test." 
 										value="!wag {{[[[[@{FELAdj} + @{FELBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Fellowship --Modifier|@{FELRollMod}"
 										name="roll_fellowship" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Fellowship test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Fellowship}} {{dice=[[@{FELAdj} + @{FELBonusRoll}]]}} {{roll=[[[[@{FELAdj} + @{FELBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4fellowship" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -203,11 +234,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBonusRoll" value="0" title="Number of Bonus Dice added to the Initiative roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Initiative attribute roll; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Initiative test; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
 										value="!wag {{[[[[@{INITAdj} + @{INITBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Initiative --Modifier|@{INITRollMod}"
 										name="roll_initiative" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make an Initiative test; bonus dice are added, modifiers are not applied.  Use 'roll initiative' on the combat tab if this is a combat initiative roll." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Initiative}} {{dice=[[@{INITAdj} + @{INITBonusRoll}]]}} {{roll=[[[[@{INITAdj} + @{INITBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4initiative" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 						</table>
@@ -234,11 +270,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ConvBonusRoll" value="0" title="Number of Bonus Dice added to the Conviction roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ConvRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Conviction roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Conviction test." 
 										value="!wag {{[[[[@{ConvAdj} + @{ConvBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Conviction --Modifier|@{ConvRollMod}"
 										name="roll_conviction" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+											title="Click to make a Conviction test." 
+											value="&{template:roll_dicepool} {{name=@{character_name} makes a Conviction test}} {{dice=[[@{ConvAdj} + @{ConvBonusRoll}]]}} {{roll=[[[[@{ConvAdj} + @{ConvBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+											name="roll_dice4conviction" style="font-size: 175%;">
+									</button>	
 								</td>
 							</tr>
 							<tr>
@@ -249,11 +290,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CorrBonusRoll" value="0" title="Number of Bonus Dice added to the Corruption roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CorrRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Corruption roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Corruption test." 
 										value="!wag {{[[[[@{CorrAdj} + @{CorrBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Corruption --Modifier|@{CorrRollMod}"
 										name="roll_corruption" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+											title="Click to make a Corruption test." 
+											value="&{template:roll_dicepool} {{name=@{character_name} makes a Corruption test}} {{dice=[[@{CorrAdj} + @{CorrBonusRoll}]]}} {{roll=[[[[@{CorrAdj} + @{CorrBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+											name="roll_dice4corruption" style="font-size: 175%;">
+									</button>	
 								</td>
 							</tr>
 							<tr>
@@ -264,11 +310,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PAwBonusRoll" value="0" title="Number of Bonus Dice added to the Passive Awareness roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PAwRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Passive Awareness roll." 
-										value="!wag {{[[[[@{CorrAdj} + @{CorrBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Awareness --Modifier|@{PAwRollMod}"
-										name="roll_awareness" style="font-size: 175%;">
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Passive Awareness test." 
+										value="!wag {{[[[[@{PAwAdj} + @{PAwBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Psv Awareness --Modifier|@{PAwRollMod}"
+										name="roll_passiveawareness" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+											title="Click to make a Passive Awareness test." 
+											value="&{template:roll_dicepool} {{name=@{character_name} makes a Passive Awareness test}} {{dice=[[@{PAwAdj} + @{PAwBonusRoll}]]}} {{roll=[[[[@{PAwAdj} + @{PAwBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+											name="roll_dice4passiveawareness" style="font-size: 175%;">
+									</button>	
 								</td>
 							</tr>
 							<tr>
@@ -279,11 +330,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResvBonusRoll" value="0" title="Number of Bonus Dice added to the Resolve roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResvRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Resolve trait roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Resolve trait test." 
 										value="!wag {{[[[[@{ResvAdj} + @{ResvBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Resolve --Modifier|@{ResvRollMod}"
 										name="roll_resolve" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+											title="Click to make a Resolve test." 
+											value="&{template:roll_dicepool} {{name=@{character_name} makes a Resolve test}} {{dice=[[@{ResvAdj} + @{ResvBonusRoll}]]}} {{roll=[[[[@{ResvAdj} + @{ResvBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+											name="roll_dice4resolve" style="font-size: 175%;">
+									</button>	
 								</td>
 							</tr>
 							<tr>
@@ -294,11 +350,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InflBonusRoll" value="0" title="Number of Bonus Dice added to the Influence roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InflRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make an Influence roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Influence test." 
 										value="!wag {{[[[[@{InflAdj} + @{InflBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Influence --Modifier|@{InflRollMod}"
 										name="roll_influence" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+											title="Click to make an Influence test." 
+											value="&{template:roll_dicepool} {{name=@{character_name} makes an Influence test}} {{dice=[[@{InflAdj} + @{InflBonusRoll}]]}} {{roll=[[[[@{InflAdj} + @{InflBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+											name="roll_dice4influence" style="font-size: 175%;">
+									</button>	
 								</td>
 							</tr>
 							<tr>
@@ -309,11 +370,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WlthBonusRoll" value="0" title="Number of Bonus Dice added to the Wealth roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WlthRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Wealth roll." 
-										value="!wag {{[[[[@{WlthAdj} + @{WlthBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Wealth --Modifier|@{WlthRollMod}"
-										name="roll_wealth" style="font-size: 175%;">
+									<button class="sheet-diebutton-api" type="roll" 
+											title="Click to make a Wealth test." 
+											value="!wag {{[[[[@{WlthAdj} + @{WlthBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Wealth --Modifier|@{WlthRollMod}"
+											name="roll_wealth" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+											title="Click to make a Wealth test." 
+											value="&{template:roll_dicepool} {{name=@{character_name} makes a Wealth test}} {{dice=[[@{WlthAdj} + @{WlthBonusRoll}]]}} {{roll=[[[[@{WlthAdj} + @{WlthBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+											name="roll_dice4wealth" style="font-size: 175%;">
+									</button>	
 								</td>
 							</tr>
 						</table>
@@ -355,11 +421,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AthBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AthRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Athletics roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Athletics test." 
 								value="!wag {{[[[[@{AthTotal} + @{AthBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Athletics --Modifier|@{AthRollMod}"
 								name="roll_athletics" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Athletics Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Athletics Skill test}} {{dice=[[@{AthTotal} + @{AthBonusRoll}]]}} {{roll=[[[[@{AthTotal} + @{AthBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4athletics" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -382,11 +453,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AwareBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AwareRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Awareness roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Awareness test." 
 								value="!wag {{[[[[@{AwareTotal} + @{AwareBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Awareness --Modifier|@{AwareRollMod}"
 								name="roll_awareness" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Awareness Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Awareness Skill test}} {{dice=[[@{AwareTotal} + @{AwareBonusRoll}]]}} {{roll=[[[[@{AwareTotal} + @{AwareBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4awareness" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -409,11 +485,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_BallBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_BallRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make a Ballistics roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make a Ballistics test." 
 								value="!wag {{[[[[@{BallTotal} + @{BallBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Ballistics --Modifier|@{BallRollMod}"
 								name="roll_ballistics" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Ballistics Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Ballistics Skill test}} {{dice=[[@{BallTotal} + @{BallBonusRoll}]]}} {{roll=[[[[@{BallTotal} + @{BallBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4ballistics" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -436,11 +517,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CunnBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_CunnRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Cunning roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Cunning test." 
 								value="!wag {{[[[[@{CunnTotal} + @{CunnBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Cunning --Modifier|@{CunnRollMod}"
 								name="roll_Cunning" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Cunning Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Cunning Skill test}} {{dice=[[@{CunnTotal} + @{CunnBonusRoll}]]}} {{roll=[[[[@{CunnTotal} + @{CunnBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Cunning" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -463,11 +549,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_DecepBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_DecepRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Deception roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Deception test." 
 								value="!wag {{[[[[@{DecepTotal} + @{DecepBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Deception --Modifier|@{DecepRollMod}"
 								name="roll_Deception" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Deception Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Deception Skill test}} {{dice=[[@{DecepTotal} + @{DecepBonusRoll}]]}} {{roll=[[[[@{DecepTotal} + @{DecepBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Deception" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -490,11 +581,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_insightBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_insightRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Insight roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Insight test." 
 								value="!wag {{[[[[@{insightTotal} + @{insightBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Insight --Modifier|@{insightRollMod}"
 								name="roll_Insight" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Insight Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Insight Skill test}} {{dice=[[@{insightTotal} + @{insightBonusRoll}]]}} {{roll=[[[[@{insightTotal} + @{insightBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Insight" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -517,11 +613,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_IntimBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_IntimRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Intimidation roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Intimidation test." 
 								value="!wag {{[[[[@{IntimTotal} + @{IntimBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Intimidation --Modifier|@{IntimRollMod}"
 								name="roll_Intimidation" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Intimidation Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Intimidation Skill test}} {{dice=[[@{IntimTotal} + @{IntimBonusRoll}]]}} {{roll=[[[[@{IntimTotal} + @{IntimBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Intimidation" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -544,11 +645,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InvestBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_InvestRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Investigation roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Investigation test." 
 								value="!wag {{[[[[@{InvestTotal} + @{InvestBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Investigation --Modifier|@{InvestRollMod}"
 								name="roll_Investigation" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Investigation Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Investigation Skill test}} {{dice=[[@{InvestTotal} + @{InvestBonusRoll}]]}} {{roll=[[[[@{InvestTotal} + @{InvestBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Investigation" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -571,11 +677,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_LeadBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_LeadRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Leadership roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Leadership test." 
 								value="!wag {{[[[[@{LeadTotal} + @{LeadBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Leadership --Modifier|@{LeadRollMod}"
 								name="roll_Leadership" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Leadership Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Leadership Skill test}} {{dice=[[@{LeadTotal} + @{LeadBonusRoll}]]}} {{roll=[[[[@{LeadTotal} + @{LeadBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Leadership" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -598,11 +709,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_MediBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_MediRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Medicae roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Medicae test." 
 								value="!wag {{[[[[@{MediTotal} + @{MediBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Medicae --Modifier|@{MediRollMod}"
 								name="roll_Medicae" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Medicae Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Medicae Skill test}} {{dice=[[@{MediTotal} + @{MediBonusRoll}]]}} {{roll=[[[[@{MediTotal} + @{MediBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Medicae" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -625,11 +741,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PersBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PersRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Persuasion roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Persuasion test." 
 								value="!wag {{[[[[@{PersTotal} + @{PersBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Persuasion --Modifier|@{PersRollMod}"
 								name="roll_Persuasion" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Persuasion Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Persuasion Skill test}} {{dice=[[@{PersTotal} + @{PersBonusRoll}]]}} {{roll=[[[[@{PersTotal} + @{PersBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Persuasion" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -652,11 +773,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PilotBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PilotRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Pilot roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Pilot test." 
 								value="!wag {{[[[[@{PilotTotal} + @{PilotBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Pilot --Modifier|@{PilotRollMod}"
 								name="roll_Pilot" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Pilot Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Pilot Skill test}} {{dice=[[@{PilotTotal} + @{PilotBonusRoll}]]}} {{roll=[[[[@{PilotTotal} + @{PilotBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Pilot" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -679,11 +805,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PsychicBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_PsychicRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Psychic Mastery roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Psychic Mastery test." 
 								value="!wag {{[[[[@{PsychicTotal} + @{PsychicBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Psychic Mastery --Modifier|@{PsychicRollMod}"
 								name="roll_PsychicMastery" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Psychic Mastery  Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Psychic Mastery Skill test}} {{dice=[[@{PsychicTotal} + @{PsychicBonusRoll}]]}} {{roll=[[[[@{PsychicTotal} + @{PsychicBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4PsychicMastery" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -706,11 +837,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_SchoBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_SchoRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Scholar roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Scholar test." 
 								value="!wag {{[[[[@{SchoTotal} + @{SchoBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Scholar --Modifier|@{SchoRollMod}"
 								name="roll_Scholar" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Scholar Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Scholar Skill test}} {{dice=[[@{SchoTotal} + @{SchoBonusRoll}]]}} {{roll=[[[[@{SchoTotal} + @{SchoBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Scholar" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -733,11 +869,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_StealthBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_StealthRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Stealth roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Stealth test." 
 								value="!wag {{[[[[@{StealthTotal} + @{StealthBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Stealth --Modifier|@{StealthRollMod}"
 								name="roll_Stealth" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Stealth Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Stealth Skill test}} {{dice=[[@{StealthTotal} + @{StealthBonusRoll}]]}} {{roll=[[[[@{StealthTotal} + @{StealthBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Stealth" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -760,11 +901,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_SurvBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_SurvRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Survival roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Survival test." 
 								value="!wag {{[[[[@{SurvTotal} + @{SurvBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Survival --Modifier|@{SurvRollMod}"
 								name="roll_Survival" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Survival Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Survival Skill test}} {{dice=[[@{SurvTotal} + @{SurvBonusRoll}]]}} {{roll=[[[[@{SurvTotal} + @{SurvBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Survival" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -787,11 +933,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TechBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TechRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Tech roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Tech test." 
 								value="!wag {{[[[[@{TechTotal} + @{TechBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Tech --Modifier|@{TechRollMod}"
 								name="roll_Tech" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Tech Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Tech Skill test}} {{dice=[[@{TechTotal} + @{TechBonusRoll}]]}} {{roll=[[[[@{TechTotal} + @{TechBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4Tech" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -814,11 +965,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WpnSkillBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WpnSkillRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Weapon Skill roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make an Weapon Skill test." 
 								value="!wag {{[[[[@{WpnSkillTotal} + @{WpnSkillBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Weapon Skill --Modifier|@{WpnSkillRollMod}"
 								name="roll_WeaponSkill" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Weapons Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Weapons Skill test}} {{dice=[[@{WpnSkillTotal} + @{WpnSkillBonusRoll}]]}} {{roll=[[[[@{WpnSkillTotal} + @{WpnSkillBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4WeaponSkill" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 			</table>		
@@ -844,11 +1000,16 @@
 					<td class="sheet-width-W10 sheet-center"><input class="sheet-spin-button" type="number" name="attr_repSkillBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-width-W10 sheet-center"><input class="sheet-spin-button" type="number" name="attr_repSkillRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-width-W10 sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make a '+@{repSkillName}+' roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make a '+@{repSkillName}+' test." 
 								value="!wag {{[[[[@{repSkillTotal} + @{repSkillBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|@{repSkillName} --Modifier|@{repSkillRollMod}"
 								name="roll_repeatingSkill" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to makes a '+@{repSkillName}+' test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a '+@{repSkillName}+' test.}} {{dice=[[@{repSkillTotal} + @{repSkillBonusRoll}]]}} {{roll=[[[[@{repSkillTotal} + @{repSkillBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_dice4repeatingSkill" style="font-size: 175%;">
+						</button>	
 					</td>
 				</tr>
 			</table>
@@ -914,25 +1075,35 @@
 						<tr>
 							<td class="sheet-width-W40"><span class="sheet-background">Combat Initiative </span></td>
 							<td class="sheet-width-W20 sheet-left">
-								<button class="sheet-diebutton-public sheet-right" type="roll" 
+								<button class="sheet-diebutton-api sheet-right" type="roll" 
 										title="Click to roll initiative for combat (no wrath die)" 
 										value="!wag {{[[[[@{INITAdj} + @{combatBD}]]d6]]}} --Name|@{character_name} --Action|Combat Initiative --Modifier|@{combatRollMod}"
 										name="roll_combatinitiative" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-simple" type="roll"
+										title="Click to roll initiative for combat" 
+										value="&{template:roll_dicepool_nowrath} {{name=@{character_name} makes a combat initiative roll.}} {{dice=[[@{INITAdj} + @{combatBD}]]}} {{roll=[[[[@{INITAdj} + @{combatBD}]]d6>4]]}}"
+										name="roll_dice4combatinitiative" style="font-size: 175%;">
+								</button>	
 							</td>	
 							<td class="sheet-width-W25"><span class="sheet-background  sheet-left">Soak Dmg</span></td>
 							<td class="sheet-width-W15">
-								<button class="sheet-diebutton-public  sheet-right" type="roll" 
+								<button class="sheet-diebutton-api  sheet-right" type="roll" 
 										title="Click to make a Soak roll.  To modify the number of dice update Roll BD and to add a modifier to the roll update Die Mod above." 
 										value="!wag {{[[[[@{Soak} + @{combatBD}]]d6]]}} --Name|@{character_name} --Action|Soak Roll --Modifier|@{combatRollMod}"
 										name="roll_soak" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-simple " type="roll"
+										title="Click to make a Soak roll.  To modify the number of dice update Roll BD." 
+										value="&{template:roll_dicepool_nowrath} {{name=@{character_name} makes a soak roll}} {{dice=[[@{Soak} + @{combatBD}]]}} {{roll=[[[[@{Soak} + @{combatBD}]]d6>4]]}}"
+										name="roll_dice4soak" style="font-size: 175%;">
+								</button>	
 							</td>	
 						</tr>
 						<tr>
 							<td class="sheet-width-W40"><span class="sheet-background">Recover Shock </span></td>
 							<td class="sheet-width-W20 sheet-left">
-								<button class="sheet-diebutton-public sheet-right" type="roll" 
+								<button class="sheet-diebutton-all sheet-right" type="roll" 
 										title="Click to roll 1d3+3 to recover shock.  To add a modifier to the roll update Die Mod above; the number of dice cannot be changed." 
 										value="&{template:recovershock_roll} {{name=@{character_name} Recovers Shock}} {{roll=[[1d3 + 3 + @{combatRollMod}]]}}"
 										name="roll_recovershock" style="font-size: 175%;">
@@ -940,7 +1111,7 @@
 							</td>	
 							<td class="sheet-width-W25"><span class="sheet-background sheet-right">Defiance</span></td>
 							<td class="sheet-width-W15">
-								<button class="sheet-diebutton-public  sheet-right" type="roll" 
+								<button class="sheet-diebutton-all  sheet-right" type="roll" 
 										title="Click to roll a d6 for a Defiance test.  To add a modifier to the roll update Die Mod above; the number of dice cannot be changed." 
 										value="&{template:defiance_roll} {{name=@{character_name} Rolls Defiance}} {{roll=[[1d6 + @{combatRollMod}]]}}"
 										name="roll_rolldefiance" style="font-size: 175%;">
@@ -952,10 +1123,10 @@
 							<td class="sheet-width-W20 sheet-left"><input class="sheet-smallspin-button" type="number" value="1" name="attr_gloryUsed" title="Number of Glory spent to roll additional bonus dice."/></td>
 							<td class="sheet-width-W25"><span>Roll Glory </span></td>
 							<td class="sheet-width-W15">
-								<button class="sheet-diebutton-public  sheet-right" type="roll" 
+								<button class="sheet-diebutton-all  sheet-right" type="roll" 
 										title="Click to roll one or more Dice for Glory." 
-										value="&{template:glory_roll} {{name=@{character_name} Rolls Glory}} {{number=@{gloryUsed}}} {{roll=[[{{@{gloryUsed}d6 + @{combatRollMod}}>4}]]}}"
-										name="roll_rollglory" style="font-size: 175%;">
+										value="&{template:glory_roll} {{name=@{character_name} Rolls Glory}} {{number=@{gloryUsed}}} {{roll=[[[[@{gloryUsed}]]d6>4]]}}"
+										name="roll_dice4glory" style="font-size: 175%;">
 								</button>
 							</td>										
 						</tr>
@@ -1015,20 +1186,30 @@
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnAttBD"  value="0" title="Bonus Dice for Attack Roll."/></td>	
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnAttMod"  value="0" title="Modifier to each die rolled on the attack."/></td>	
 							<td class="sheet-width-W4 sheet-center">
-								<button class="sheet-diebutton-attack" type="roll" 
-									title="Click to make an Attack roll." 
-									value="!wag {{[[[[@{wpnAttkSkill} + @{wpnAttBD}]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attack|@{Weapon} --Bonus Dice|@{wpnAttBD} --Modifier|@{wpnAttMod}"
-									name="roll_repeatingSkill" style="font-size: 175%;">
+								<button class="sheet-diebutton-api sheet-diebutton-attack" type="roll" 
+										title="Click to make an Attack roll." 
+										value="!wag {{[[[[@{wpnAttkSkill} + @{wpnAttBD}]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attack with|@{Weapon} --Bonus Dice|@{wpnAttBD} --Modifier|@{wpnAttMod}"
+										name="roll_repeatingWeaponattack" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-simple sheet-diebutton-attack" type="roll"
+										title="Click to make an Attack roll." 
+										value="&{template:roll_dicepool} {{name=@{character_name} makes an Attack test.}} {{dice=[[@{wpnAttkSkill} + @{wpnAttBD}]]}} {{roll=[[[[@{wpnAttkSkill} + @{wpnAttBD} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_dice4repeatingWeaponattack" style="font-size: 175%;">
+								</button>	
 							</td>
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnDmgBD"  value="0" title="Bonus Dice for Damage Roll."/></td>	
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnDmgMod"  value="0" title="Modifier to each die rolled for Damage."/></td>		
 							<td class="sheet-width-W4 sheet-center">
-								<button class="sheet-diebutton-damage" type="roll" 
-									title="Click to make a Damage roll." 
-									value="!wag {{[[[[@{wpnED} + @{wpnDmgBD}]]d6]]}} --Name|@{character_name} --Damage|@{Weapon} --DR/AP|@{wpnDR}/@{wpnAP} --Modifier|@{wpnDmgMod}"
-									name="roll_wpnDamage" style="font-size: 175%;">
+								<button class="sheet-diebutton-api sheet-diebutton-damage" type="roll" 
+										title="Click to make a Damage roll with '+@{Weapon}+'." 
+										value="!wag {{[[[[@{wpnED} + @{wpnDmgBD}]]d6]]}} --Name|@{character_name} --Damage with|@{Weapon} --DR/AP|@{wpnDR}/@{wpnAP} --Modifier|@{wpnDmgMod}"
+										name="roll_wpnDamage" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-simple sheet-diebutton-damage" type="roll"
+										title="Click to make a Damage roll with '+@{Weapon}+'." 
+										value="&{template:roll_dicepool_nowrath} {{name=@{character_name} does damage with '+@{Weapon}+'.}} {{dice=[[@{wpnED} + @{wpnDmgBD}]]}} {{roll=[[[[@{wpnED} + @{wpnDmgBD}]]d6>4]]}}"
+										name="roll_dice4wpnDamage" style="font-size: 175%;">
+								</button>	
 							</td>											
 						</tr>
 					</table>
@@ -1309,11 +1490,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_STRBonusRoll" value="0" title="Number of Bonus Dice added to the Strength roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_STRRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Strength attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Strength test." 
 										value="!wag {{[[[[@{STRAdj} + @{STRBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Strength --Modifier|@{STRRollMod}"
-										name="roll_strength" style="font-size: 175%;">
+										name="roll_NPCstrength" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Strength roll; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Strength}} {{dice=[[@{STRAdj} + @{STRBonusRoll}]]}} {{roll=[[[[@{STRAdj} + @{STRBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4strength" style="font-size: 175%;">
+									</button>									
 								</td>
 							</tr>
 							<tr>
@@ -1324,11 +1510,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBonusRoll" value="0" title="Number of Bonus Dice added to the Agility roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Agility attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Agility test." 
 										value="!wag {{[[[[@{AGLAdj} + @{AGLBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Agility --Modifier|@{AGLRollMod}"
-										name="roll_agility" style="font-size: 175%;">
+										name="roll_NPCagility" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Agility test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Agility}} {{dice=[[@{AGLAdj} + @{AGLBonusRoll}]]}} {{roll=[[[[@{AGLAdj} + @{AGLBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4agility" style="font-size: 175%;">
+									</button>			
 								</td>
 							</tr>
 							<tr>
@@ -1339,11 +1530,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TGHBonusRoll" value="0" title="Number of Bonus Dice added to the Toughness roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TGHRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Toughness attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Toughness test." 
 										value="!wag {{[[[[@{TGHAdj} + @{TGHBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Toughness --Modifier|@{TGHRollMod}"
-										name="roll_toughness" style="font-size: 175%;">
+										name="roll_NPCtoughness" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Toughness test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Toughness}} {{dice=[[@{TGHAdj} + @{TGHBonusRoll}]]}} {{roll=[[[[@{TGHAdj} + @{TGHBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4toughness" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -1354,11 +1550,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBonusRoll" value="0" title="Number of Bonus Dice added to the Intellect roll."/></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTRollMod" value="0" title="Modifier to the result of the die roll."/></td>  
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Intellect attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Intellect test." 
 										value="!wag {{[[[[@{INTAdj} + @{INTBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Intellect --Modifier|@{INTRollMod}"
-										name="roll_intellect" style="font-size: 175%;">
+										name="roll_NPCintellect" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make an Intellect test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Intellect}} {{dice=[[@{INTAdj} + @{INTBonusRoll}]]}} {{roll=[[[[@{INTAdj} + @{INTBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4intellect" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -1369,11 +1570,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WILLBonusRoll" value="0" title="Number of Bonus Dice added to the Willpower roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WILLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Willpower attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Willpower test." 
 										value="!wag {{[[[[@{WILLAdj} + @{WILLBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Willpower --Modifier|@{WILLRollMod}"
-										name="roll_willpower" style="font-size: 175%;">
+										name="roll_NPCwillpower" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Willpower test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Willpower}} {{dice=[[@{WILLAdj} + @{WILLBonusRoll}]]}} {{roll=[[[[@{WILLAdj} + @{WILLBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4willpower" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -1384,11 +1590,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_FELBonusRoll" value="0" title="Number of Bonus Dice added to the Fellowship roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_FELRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Fellowsihp attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Fellowship test." 
 										value="!wag {{[[[[@{FELAdj} + @{FELBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Fellowship --Modifier|@{FELRollMod}"
-										name="roll_fellowship" style="font-size: 175%;">
+										name="roll_NPCfellowship" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make a Fellowship test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Fellowship}} {{dice=[[@{FELAdj} + @{FELBonusRoll}]]}} {{roll=[[[[@{FELAdj} + @{FELBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4fellowship" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -1399,11 +1610,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBonusRoll" value="0" title="Number of Bonus Dice added to the Initiative roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Initiative attribute roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Initiative test; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
 										value="!wag {{[[[[@{INITAdj} + @{INITBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attribute|Initiative --Modifier|@{INITRollMod}"
-										name="roll_initiative" style="font-size: 175%;">
+										name="roll_NPCinitiative" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make an Initiative test; bonus dice are added, modifiers are not applied.  Use 'roll initiative' on the combat tab if this is a combat initiative roll." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Initiative}} {{dice=[[@{INITAdj} + @{INITBonusRoll}]]}} {{roll=[[[[@{INITAdj} + @{INITBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4initiative" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 							<tr>
@@ -1414,11 +1630,16 @@
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResvBonusRoll" value="0" title="Number of Bonus Dice added to the Resolve roll."/></td> 
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_ResvRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<button class="sheet-diebutton-public" type="roll" 
-										title="Click to make a Resolve trait roll." 
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make a Resolve trait test." 
 										value="!wag {{[[[[@{ResvAdj} + @{ResvBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Trait|Resolve --Modifier|@{ResvRollMod}"
-										name="roll_resolve" style="font-size: 175%;">
+										name="roll_NPCresolve" style="font-size: 175%;">
 									</button>
+									<button class="sheet-diebutton-simple" type="roll"
+										title="Click to make a Resolve trait test; bonus dice are added, modifiers are not applied." 
+										value="&{template:roll_dicepool} {{name=@{character_name} Tests Resolve}} {{dice=[[@{ResvAdj} + @{ResvBonusRoll}]]}} {{roll=[[[[@{ResvAdj} + @{ResvBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4resolve" style="font-size: 175%;">
+									</button>		
 								</td>
 							</tr>
 						</table>
@@ -1465,27 +1686,37 @@
 						<tr>		
 							<td class="sheet-width-W40 sheet-left">
 								<span class="sheet-background">Roll Combat Initiative </span>
-								<button class="sheet-diebutton-public sheet-left" type="roll" 
+								<button class="sheet-diebutton-api sheet-left" type="roll" 
 										title="Click to roll initiative for combat (no wrath die)" 
 										value="!wag {{[[[[@{INITAdj} + @{combatBD}]]d6]]}} --Name|@{character_name} --Action|Combat Initiative --Modifier|@{combatRollMod}"
-										name="roll_combatinitiative" style="font-size: 175%;">
+										name="roll_NPCcombatinitiative" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-simple" type="roll"
+										title="Click to roll initiative for combat" 
+										value="&{template:roll_dicepool_nowrath} {{name=@{character_name} Rolls Combat Initiative}} {{dice=[[@{INITAdj} + @{combatBD}]]}} {{roll=[[[[@{INITAdj} + @{combatBD}]]d6>4]]}}"
+										name="roll_NPCdice4combatinitiative" style="font-size: 175%;">
+								</button>	
 							</td>			
 							<td class="sheet-width-W30 sheet-left">
 								<span class="sheet-background">Recover Shock </span>
-								<button class="sheet-diebutton-public sheet-left" type="roll" 
+								<button class="sheet-diebutton-all sheet-left" type="roll" 
 										title="Click to roll 1d3+3 to recover shock.  To add a modifier to the roll update Die Mod above; the number of dice cannot be changed." 
 										value="&{template:recovershock_roll} {{name=@{character_name} Recovers Shock}} {{roll=[[1d3 + 3 + @{combatRollMod}]]}}"
-										name="roll_recovershock" style="font-size: 175%;">
+										name="roll_NPCdice4recovershock" style="font-size: 175%;">
 								</button>
 							</td>		
 							<td class="sheet-width-W30  sheet-left">
 								<span class="sheet-background  sheet-left">Roll for Soak</span>
-								<button class="sheet-diebutton-public  sheet-left" type="roll" 
+								<button class="sheet-diebutton-api  sheet-left" type="roll" 
 										title="Click to make a Soak roll for an adversary.  To modify the number of dice update Roll BD and to add a modifier to the roll update Die Mod above." 
 										value="!wag {{[[[[@{Soak} + @{combatBD}]]d6]]}} --Name|@{character_name} --Action|Soak Roll --Modifier|@{combatRollMod}"
-										name="roll_soak" style="font-size: 175%;">
+										name="roll_NPCsoak" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-simple" type="roll"
+										title="Click to make a Soak roll for an adversary.  To modify the number of dice update Roll BD." 
+										value="&{template:roll_dicepool_nowrath} {{name=@{character_name} Makes a Soak Roll}} {{dice=[[@{Soak} + @{combatBD}]]}} {{roll=[[[[@{Soak} + @{combatBD}]]d6>4]]}}"
+										name="roll_NPCdice4soak" style="font-size: 175%;">
+								</button>	
 							</td>							
 						</tr>
 					</table>
@@ -1525,11 +1756,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_defaultBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_defaultRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make a default skill roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make a default skill test." 
 								value="!wag {{[[[[@{defaultTotal} + @{defaultBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Default --Modifier|@{defaultRollMod}"
-								name="roll_default" style="font-size: 175%;">
+								name="roll_NPCdefaultskill" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a default skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a default skill test}} {{dice=[[@{defaultTotal} + @{defaultBonusRoll}]]}} {{roll=[[[[@{defaultTotal} + @{defaultBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_NPCdice4defaultskill" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -1552,11 +1788,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_BallBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_BallRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make a Ballistics roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make a Ballistics skill test." 
 								value="!wag {{[[[[@{BallTotal} + @{BallBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Ballistics --Modifier|@{BallRollMod}"
-								name="roll_ballistics" style="font-size: 175%;">
+								name="roll_NPCballisticsSkill" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Ballistics skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Ballistics skill test}} {{dice=[[@{BallTotal} + @{BallBonusRoll}]]}} {{roll=[[[[@{BallTotal} + @{BallBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_NPCdice4ballisticsSkill" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 				<tr>
@@ -1579,11 +1820,16 @@
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WpnSkillBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_WpnSkillRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make an Weapon Skill roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make a Weapons Skill test." 
 								value="!wag {{[[[[@{WpnSkillTotal} + @{WpnSkillBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|Weapon Skill --Modifier|@{WpnSkillRollMod}"
-								name="roll_WeaponSkill" style="font-size: 175%;">
+								name="roll_NPCWeaponSkill" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a Weapons Skill test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a Weapons Skill test}} {{dice=[[@{WpnSkillTotal} + @{WpnSkillBonusRoll}]]}} {{roll=[[[[@{WpnSkillTotal} + @{WpnSkillBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_NPCdice4WeaponSkill" style="font-size: 175%;">
+						</button>	
 					</td>	
 				</tr>
 			</table>		
@@ -1609,11 +1855,16 @@
 					<td class="sheet-width-W10 sheet-center"><input class="sheet-spin-button" type="number" name="attr_repSkillBonusRoll" value="0" title="Number of Bonus Dice added to the skill roll."/></td> 
 					<td class="sheet-width-W10 sheet-center"><input class="sheet-spin-button" type="number" name="attr_repSkillRollMod" value="0" title="Modifier to the result of the skill roll."/></td> 
 					<td class="sheet-width-W10 sheet-center">
-						<button class="sheet-diebutton-public" type="roll" 
-								title="Click to make a '+@{repSkillName}+' roll." 
+						<button class="sheet-diebutton-api" type="roll" 
+								title="Click to make a '+@{repSkillName}+' test." 
 								value="!wag {{[[[[@{repSkillTotal} + @{repSkillBonusRoll}]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Skill|@{repSkillName} --Modifier|@{repSkillRollMod}"
-								name="roll_repeatingSkill" style="font-size: 175%;">
+								name="roll_NPCrepeatingSkill" style="font-size: 175%;">
 						</button>
+						<button class="sheet-diebutton-simple" type="roll"
+								title="Click to make a '+@{repSkillName}+' test." 
+								value="&{template:roll_dicepool} {{name=@{character_name} makes a a '+@{repSkillName}+' test}} {{dice=[[@{repSkillTotal} + @{repSkillBonusRoll}]]}} {{roll=[[[[@{repSkillTotal} + @{repSkillBonusRoll} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+								name="roll_NPCdice4repeatingSkill" style="font-size: 175%;">
+						</button>	
 					</td>
 				</tr>
 			</table>
@@ -1672,20 +1923,30 @@
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnAttBD"  value="0" title="Bonus Dice for Attack Roll."/></td>	
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnAttMod"  value="0" title="Modifier to each die rolled on the attack."/></td>	
 							<td class="sheet-width-W4 sheet-center">
-								<button class="sheet-diebutton-attack" type="roll" 
-									title="Click to make an Attack roll." 
+								<button class="sheet-diebutton-attack sheet-diebutton-api" type="roll" 
+									title="Click to make an Attack test with '+@{Weapon}+'." 
 									value="!wag {{[[[[@{wpnAttkSkill} + @{wpnAttBD}]]d6]]}} {{[[1d6]]}} --Name|@{character_name} --Attack|@{Weapon} --Bonus Dice|@{wpnAttBD} --Modifier|@{wpnAttMod}"
-									name="roll_repeatingSkill" style="font-size: 175%;">
+									name="roll_NPCWeaponAttackTest" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-attack sheet-diebutton-simple" type="roll"
+										title="Click to make an Attack test with '+@{Weapon}+'." 
+										value="&{template:roll_dicepool} {{name=@{character_name} makes an Attack test with '+@{Weapon}+'.}} {{dice=[[@{wpnAttkSkill} + @{wpnAttBD}]]}} {{roll=[[[[@{wpnAttkSkill} + @{wpnAttBD} - {1}]]d6>4]]}} {{wrath=[[1d6]]}}"
+										name="roll_NPCdice4NPCWeaponAttackTest" style="font-size: 175%;">
+								</button>	
 							</td>
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnDmgBD"  value="0" title="Bonus Dice for Damage Roll."/></td>	
 							<td class="sheet-width-W5 sheet-center"><input class="sheet-smallspin-button" type="number" name="attr_wpnDmgMod"  value="0" title="Modifier to each die rolled for Damage."/></td>		
 							<td class="sheet-width-W4 sheet-center">
-								<button class="sheet-diebutton-damage" type="roll" 
-									title="Click to make a Damage roll." 
+								<button class="sheet-diebutton-damage sheet-diebutton-api" type="roll" 
+									title="Click to roll damage for '+@{Weapon}+'." 
 									value="!wag {{[[[[@{wpnED} + @{wpnDmgBD}]]d6]]}} {{[[@{wpnDmgMod}]]}} --Name|@{character_name} --Damage|@{Weapon} --DR/AP|@{wpnDR}/@{wpnAP} --Modifier|@{wpnDmgMod}"
-									name="roll_wpnDamage" style="font-size: 175%;">
+									name="roll_NPCWpnDamage" style="font-size: 175%;">
 								</button>
+								<button class="sheet-diebutton-damage sheet-diebutton-simple" type="roll"
+										title="Click to roll damage for '+@{Weapon}+'." 
+										value="&{template:roll_dicepool_nowrath} {{name=@{character_name} rolls damage for '+@{Weapon}+'.}} {{dice=[[@{wpnED} + @{wpnDmgBD}]]}} {{roll=[[[[@{wpnED} + @{wpnDmgBD}]]d6>4]]}}"
+										name="roll_NPCdice4NPCWpnDamage" style="font-size: 175%;">
+								</button>	
 							</td>											
 						</tr>
 					</table>
@@ -1741,17 +2002,31 @@
 
 <!-- ************************************** ROLL TEMPLATES ************************************** -->
 <div>
+<rolltemplate class="sheet-rolltemplate-roll_dicepool">
+    <table>
+        <tr><th colspan="2">{{name}}</th></tr>
+		<tr><td><span style="text-align:left"><b>Pool of Dice:</b>&nbsp;{{dice}}<b>d6</b></span></td></tr>  
+		<tr><td><span style="text-align:left"><b># Icons(4-6) Rolled:</b>&nbsp;{{roll}}</span></td></tr>   
+		<tr><td><span style="text-align:left"><b>Wrath Die Result:</b>&nbsp;{{wrath}}</span></td></tr>  
+    </table>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-roll_dicepool_nowrath">
+    <table>
+        <tr><th colspan="2">{{name}}</th></tr>
+		<tr><td><span style="text-align:left"><b>Pool of Dice:</b>&nbsp;{{dice}}<b>d6</b></span></td></tr>  
+		<tr><td><span style="text-align:left"><b># Icons(4-6) Rolled:</b>&nbsp;{{roll}}</span></td></tr>
+    </table>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-recovershock_roll">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
 		<tr><td><span style="text-align:left"><b>Recover Shock:</b>&nbsp;{{roll}}</span></td></tr>  
     </table>
 </rolltemplate>
-
 <rolltemplate class="sheet-rolltemplate-glory_roll">
     <table>
         <tr><th colspan="2">{{name}}</th></tr>
-		<tr><td><span style="text-align:left"><b>Glory Roll({{number}}):</b>&nbsp;{{roll}}&nbsp;icons (4+) rolled</span></td></tr>  
+		<tr><td><span style="text-align:left"><b>Glory Roll({{number}}<b>d6</b>):</b>&nbsp;{{roll}}&nbsp;icon(s) (4-6) rolled</span></td></tr>  
     </table>
 </rolltemplate>