diff --git a/SavageWorlds-Tabbed/SW_CharSheet-tabbed.css b/SavageWorlds-Tabbed/SW_CharSheet-tabbed.css
index 81ac94ad92..ddb4856abf 100644
--- a/SavageWorlds-Tabbed/SW_CharSheet-tabbed.css
+++ b/SavageWorlds-Tabbed/SW_CharSheet-tabbed.css
@@ -570,6 +570,44 @@ semi-trans-grayish.png = 75% opacity
 	content: "Clams:";
 }
 
+/*----------- Roll Template Configuration --------------*/
+
+input.sheet-rt {
+    width: 113px;
+    height: 160px;
+    cursor: pointer;	
+	position: relative;
+	opacity: 0;
+	z-index: 9999;
+}
+
+span.sheet-rt {
+    height: 160px;
+    width: 113px;
+    padding: 2px;
+    display: inline-block;
+    margin-left: -118px;
+    position: relative;
+    vertical-align: top;
+}
+
+span.sheet-rtinner {
+	display: block; 
+	margin-left: 1px;
+	margin-top: 1px;
+	height: 156px; 
+	width: 109px; 
+	border: solid black 1px; 
+	text-align: center; 
+	background-color: white;
+}
+
+input.sheet-rt0:checked + span.sheet-rt0,
+input.sheet-rt1:checked + span.sheet-rt1,
+input.sheet-rt2:checked + span.sheet-rt2 {
+    background-color: #B2FFFF;
+}
+
 /*----------- End Configuration Specific Items Setup -----------*/
 
 /*----------- Character Sheet Type setup --------------*/
@@ -1270,6 +1308,41 @@ select.sheet-dtype {
 
 /* Hiding */
 
+.sheet-normalbutton,
+.sheet-templatebutton {
+	display: none;
+}
+
+.sheet-buttonbox[value="0"]:checked ~ .sheet-normalbutton {
+	display: inline-block;
+}
+
+.sheet-buttonbox[value="0"]:not(:checked) ~ .sheet-templatebutton {
+	display: inline-block;
+}
+
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_skills] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_mskills] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_meleeweapons] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_rangeweapons] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_dmgspells] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_mmeleeweapons] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_mrangeweapons] > .repitem .sheet-normalbutton,
+.sheet-buttonbox[value="0"]:checked ~ [data-groupname=repeating_mdmgspells] > .repitem .sheet-normalbutton {
+	display: inline-block;
+} 
+
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_skills] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_mskills] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_meleeweapons] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_rangeweapons] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_dmgspells] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_mmeleeweapons] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_mrangeweapons] > .repitem .sheet-templatebutton,
+.sheet-buttonbox[value="0"]:not(:checked) ~ [data-groupname=repeating_mdmgspells] > .repitem .sheet-templatebutton {
+	display: inline-block;
+}
+
 .sheet-arrow:checked ~ *.sheet-formula{
     display:none;
 }
@@ -1324,6 +1397,7 @@ select.sheet-dtype {
 .sheet-Firewall,
 .sheet-Strain,
 .sheet-StreetCred,
+.sheet-advancements,
 .sheet-useSpecies:checked ~ *.sheet-Race,
 .sheet-useRaiseHB:checked ~ [data-groupname=repeating_meleeweapons] > .repitem .sheet-useStandard,
 .sheet-useRaiseHB:checked ~ [data-groupname=repeating_rangeweapons] > .repitem .sheet-useStandard,
@@ -1440,7 +1514,8 @@ select.sheet-dtype {
 .sheet-WDNewDieType:checked + *.sheet-dtypedropdown,
 .sheet-WDNewDieType:checked ~ [data-groupname=repeating_skills] > .repitem .sheet-dtypedropdown,
 .sheet-use528:checked ~ *.sheet-aug528,
-.sheet-use9212:checked ~ *.sheet-aug9212 {
+.sheet-use9212:checked ~ *.sheet-aug9212,
+.sheet-showAdvancements:checked + .sheet-advancements {
 	display:inline-block;
 }
 
diff --git a/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html b/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html
index 6dc41565cf..dbb0a20405 100644
--- a/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html
+++ b/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html
@@ -17,7 +17,7 @@
 				<!-- BEGIN CONFIGURATION STUFF -->
 				<!--                           -->
 				<div class="sheet-config" style='border-style: dotted; border-color: #dbc792; padding: 5px; background-color: white; background-image: none;'>
-					sheet version: 21 Feb 2015
+					sheet version: 07 Apr 2015
 					<div class='sheet-row'><h2 class='sheet-sectionHeader'>CONFIGURATION</h2></div>
 					<input type="checkbox" class="sheet-HideUITweaks" name="attr_wcUIConfig" checked /><span class="sheet-is-wcUI"></span>
 					<div class='UITweaks' style="padding: 10px;">
@@ -60,12 +60,12 @@
 						<div class="sheet-row">
 							<h4 class="sheet-subsectionHeader">Other Miscellaneous Tweaks</h4>
 							<div class="sheet-col" style="padding-right: 10px; margin-right: 0px; border-right: solid 1px;">
-								<span class="sheet-5pxshim"></span><input type="checkbox" class="sheet-NewDieType" name="attr_DieTypeConfig" style="width: 15px;" />Use Dice Drop Down Menus (Attributes & Skills)<br />
-								<input type="checkbox" class="sheet-NewDieType" name="attr_WildDieTypeConfig" style="width: 15px;" />Use Dice Drop Down Menus (Wild Die)<br />
+								<span class="sheet-5pxshim"></span><input type="checkbox" class="sheet-NewDieType" name="attr_DieTypeConfig" style="width: 15px;" /> Use Dice Drop Down Menus (Attributes & Skills)<br />
+								<input type="checkbox" class="sheet-NewDieType" name="attr_WildDieTypeConfig" style="width: 15px;" /> Use Dice Drop Down Menus (Wild Die)<br />
 								<input type="checkbox" class="hideArcanum" name="attr_ArcanumTab" style="width: 15px;"> Hide the Arcanum Tab
-								
 							</div>
 							<div class="sheet-col" style="margin-left: -5px; border-left: solid 1px; padding-left: 10px;">
+								<input class="sheet-showAdvancements" type="checkbox" name="attr_showAdvancements" /> Show Advancements (on Journal Tab)<br />
 								Quest Font Type: 
 								<!-- If you're going to add more fonts, you will need to update the CSS file.  
 										o Add the appropriate details via an @font-face 
@@ -97,6 +97,41 @@
 									</div>
 								</div><!--End font drop down-->
 							</div>
+							<hr />
+							<div class="sheet-row">
+								<div class="sheet-col" style="width: 20%">Trait Roll Template:</div>
+								<div class="sheet-col">
+									<input type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" title="No Roll Template" />
+									<span class="sheet-rt sheet-rt0">
+										<span class="sheet-rtinner">No Roll Template</span>
+									</span>
+									<input type="checkbox" class="sheet-rt sheet-rt1" name="attr_skillrt" value="&{template:solidtrait}" title="Solid Trait Layout" />
+									<span class="sheet-rt sheet-rt1">
+										<span class="sheet-rtinner"><img src="http://www.geeksville.us/roll20/SolidTrait.png" value="Ace of Spades Card Template" /></span>
+									</span>
+									<input type="checkbox" class="sheet-rt sheet-rt2" name="attr_skillrt" value="&{template:spadestrait2}" title="Ace of Spades Traite Layout" />
+									<span class="sheet-rt sheet-rt2">
+										<span class="sheet-rtinner"><img src="http://www.geeksville.us/roll20/SpadesTrait.png" value="Ace of Spades Card Template" /></span>
+									</span>
+								</div>
+							</div>
+							<div class="sheet-row">
+								<div class="sheet-col" style="width: 20%;">Damage Roll Template:</div>
+								<div class="sheet-col">
+									<input type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" title="No Roll Template" />
+									<span class="sheet-rt sheet-rt0">
+										<span class="sheet-rtinner">No Roll Template</span>
+									</span>
+									<input type="checkbox" class="sheet-rt sheet-rt1" name="attr_skillwrt" value="&{template:soliddamage}" title="Solid Trait Layout" />
+									<span class="sheet-rt sheet-rt1">
+										<span class="sheet-rtinner"><img src="http://www.geeksville.us/roll20/SolidDamage.png" value="Ace of Spades Card Template" /></span>
+									</span>
+									<input type="checkbox" class="sheet-rt sheet-rt2" name="attr_skillwrt" value="&{template:clubsdamage}" title="Ace of Spades Traite Layout" />
+									<span class="sheet-rt sheet-rt2">
+										<span class="sheet-rtinner"><img src="http://www.geeksville.us/roll20/ClubsDamage.png" value="Ace of Spades Card Template" /></span>
+									</span>
+								</div>
+							</div>
 						</div><!--End 2colrow-->
 					</div> <!--End UI Tweaks-->
 					<input type="checkbox" class="sheet-HideGameSettings" name="attr_SettingsConfig" checked /><span class="sheet-is-gameSettings"></span>
@@ -479,8 +514,11 @@
 											 </select>
 										</div><span style="font-weight: bold;">
 										 + </span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_agMod" title="@{agMod}" value="0" /></div><div class="sheet-col sheet-AttMod" style="margin-bottom: 10px;"><span class="sheet-spaceBetween">&nbsp;+&nbsp;</span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_agrollMod" title="@{agrollMod}" value="0" />
-										<button type='roll' name='roll_AgilityRoll' title="@{AgilityRoll}" value='/em @{character_name} attempts to be agile and rolls [[{1d@{agility}![Agility],1d@{wilddie}![Wild Die]}kh1 +@{agMod}[Agility Rank Modifier] + @{agrollMod}[Agility Roll Modifier] + @{ttmod}[Trait Test Modifier] + @{encumbrance}[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmAgilityRoll' title="@{gmAgilityRoll}" value='/w gm @{character_name} attempts to be agile and rolls [[{1d@{agility}![Agility],1d@{wilddie}![Wild Die]}kh1 +@{agMod}[Agility Rank Modifier] + @{agrollMod}[Agility Roll Modifier] + @{ttmod}[Trait Test Modifier] + @{encumbrance}[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-										<input type='hidden' name=attr_rollAgility value='/em @{character_name} attempts to be agile and rolls [[{1d@{agility}![Agility],1d@{wilddie}![Wild Die]}kh1 +@{agMod}[Agility Rank Modifier] + @{agrollMod}[Agility Roll Modifier] + @{ttmod}[Trait Test Modifier] + @{encumbrance}[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tAgilityRoll' title="@{tAgilityRoll}" value='@{skillrt} @{rolltAgility}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmAgilityRoll' title="@{tgmAgilityRoll}" value='/w gm @{skillrt} @{rolltAgility}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_AgilityRoll' title="@{AgilityRoll}" value='/em @{character_name} attempts to be agile and rolls @{rollAgility}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmAgilityRoll' title="@{gmAgilityRoll}" value='/w gm @{character_name} attempts to be agile and rolls @{rollAgility}'></button>
+										<input type='hidden' name='attr_rollAgility' value='[[{1d@{agility}![Agility],1d@{wilddie}![Wild Die]}kh1 +@{agMod}[Agility Rank Modifier] + @{agrollMod}[Agility Roll Modifier] + @{ttmod}[Trait Test Modifier] + @{encumbrance}[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltAgility' value='{{name=@{character_name}}} {{skill_name=Agility}} {{skill_rank=@{Agility}}} {{skill_rank_mod=@{agMod}}} {{att_mod=@{agrollMod}}} {{ttmod=@{ttmod}}} {{enc=[[@{encumbrance}]]}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{agility}! + @{agMod} + @{agrollMod}[Skill Modifier] + @{ModSumEnc}[Other Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{agMod} + @{agrollMod}[Skill Modifier] + @{ModSumEnc}[Other Modifiers]]]}}' />
 									</div>
 									<div class="sheet-col" style="width: auto; margin: 0px; margin-bottom: 10px;"><label class="sheet-AttributeLabel">Smarts:</label></div>
 									<div class="sheet-col sheet-AttBorder" style="margin-bottom: 10px;">
@@ -511,8 +549,12 @@
 										</div><span style="font-weight: bold;">
 										 + </span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_smMod" title="@{smMod}" value="0" /></div><div class="sheet-col sheet-AttMod" style="margin-bottom: 10px;"><span class="sheet-spaceBetween">&nbsp;+&nbsp;</span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_smrollMod" title="@{smrollMod}" value="0" />
 										<input type="hidden" name="attr_fullsmarts" value="d@{smarts}" />
-										<button type='roll' name='roll_SmartsRoll' title="@{SmartsRoll}" value='/em @{character_name} attempts to be smart and rolls [[{1d@{smarts}![Smarts], 1d@{wilddie}![Wild Die]}kh1 +@{smMod}[Smarts Rank Modifier] + @{smrollMod}[Smarts Roll Modifier] + @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmSmartsRoll' title="@{gmSmartsRoll}" value='/w gm @{character_name} attempts to be smart and rolls [[{1d@{smarts}![Smarts], 1d@{wilddie}![Wild Die]}kh1 +@{smMod}[Smarts Rank Modifier] + @{smrollMod}[Smarts Roll Modifier] + @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-										<input type='hidden' name='attr_rollSmarts' value='/em @{character_name} attempts to be smart and rolls [[{1d@{smarts}![Smarts], 1d@{wilddie}![Wild Die]}kh1 +@{smMod}[Smarts Rank Modifier] + @{smrollMod}[Smarts Roll Modifier] + @{ttmod}[Trait Test Modifiers - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' /></div>
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tSmartsRoll' title="@{tSmartsRoll}" value='@{skillrt} @{rolltSmarts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSmartsRoll' title="@{tgmSmartsRoll}" value='/w gm @{skillrt} @{rolltSmarts}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_SmartsRoll' title="@{SmartsRoll}" value='/em @{character_name} attempts to be smart and rolls @{rollSmarts}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmSmartsRoll' title="@{gmSmartsRoll}" value='/w gm @{character_name} attempts to be smart and rolls @{rollSmarts}'></button>
+										<input type='hidden' name='attr_rollSmarts' value='[[{1d@{smarts}![Smarts], 1d@{wilddie}![Wild Die]}kh1 +@{smMod}[Smarts Rank Modifier] + @{smrollMod}[Smarts Roll Modifier] + @{ttmod}[Trait Test Modifiers - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltSmarts' value='{{name=@{character_name}}} {{skill_name=Smarts}} {{skill_rank=@{smarts}}} {{skill_rank_mod=@{smMod}}} {{att_mod=@{smrollMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{smarts}! + @{smMod} + @{smrollMod}[Skill Modifier] + @{ModSum}[Other Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{smMod} + @{smrollMod}[Skill Modifier] + @{ModSum}[Other Modifiers]]]}}' />
+									</div>
 									<div class="sheet-col" style="width: auto; margin: 0px; margin-bottom: 10px;"><label class="sheet-AttributeLabel">Spirit:</label></div>
 									<div class="sheet-col sheet-AttBorder" style="margin-bottom: 10px;">
 										<input type="checkbox" class="sheet-NewDieType" name="attr_DieTypeConfig" style="width: 15px; display: none;" />
@@ -541,8 +583,12 @@
 											 </select>
 										 </div><span style="font-weight: bold;">
 										 + </span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_spMod" title="@{spMod}" value="0" /></div><div class="sheet-col sheet-AttMod" style="margin-bottom: 10px;"><span class="sheet-spaceBetween">&nbsp;+&nbsp;</span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_sprollMod" title="@{sprollMod}" value="0" />
-										<button type='roll' name='roll_SpiritRoll' title="@{SpiritRoll}" value='/em @{character_name} attempts to be spirited and rolls [[{1d@{spirit}![Spirit], 1d@{wilddie}![Wild Die]}kh1 +@{spMod}[Spirit Rank Modifier] + @{sprollMod}[Spirit Roll Modifier] + @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmSpiritRoll' title="@{gmSpiritRoll}" value='/w gm @{character_name} attempts to be spirited and rolls [[{1d@{spirit}![Spirit], 1d@{wilddie}![Wild Die]}kh1 +@{spMod}[Spirit Rank Modifier] + @{sprollMod}[Spirit Roll Modifier] + @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-										<input type='hidden' name='attr_rollSpirit' value='/em @{character_name} attempts to be spirited and rolls [[{1d@{spirit}![Spirit], 1d@{wilddie}![Wild Die]}kh1 +@{spMod}[Spirit Rank Modifier] + @{sprollMod}[Spirit Roll Modifier] + @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' /></div>
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tSpiritRoll' title="@{tSpiritRoll}" value='@{skillrt} @{rolltSpirit}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSpiritRoll' title="@{tgmSpiritRoll}" value='/w gm @{skillrt} @{rolltSpirit}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_SpiritRoll' title="@{SpiritRoll}" value='/em @{character_name} attempts to be spirited and rolls @{rollSpirit}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmSpiritRoll' title="@{gmSpiritRoll}" value='/w gm @{character_name} attempts to be spirited and rolls @{rollSpirit}'></button>
+										<input type='hidden' name='attr_rollSpirit' value='[[{1d@{spirit}![Spirit], 1d@{wilddie}![Wild Die]}kh1 +@{spMod}[Spirit Rank Modifier] + @{sprollMod}[Spirit Roll Modifier] + @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltSpirit' value='{{name=@{character_name}}} {{skill_name=Spirit}} {{skill_rank=@{spirit}}} {{skill_rank_mod=@{spMod}}} {{att_mod=@{sprollMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{spirit}! + @{spMod} + @{sprollMod}[Skill Modifier] + @{ModSum}[Other Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{spMod} + @{sprollMod}[Skill Modifier] + @{ModSum}[Other Modifiers]]]}}' />
+									</div>
 									<div class="sheet-col" style="width: auto; margin: 0px; margin-bottom: 10px;"><label class="sheet-AttributeLabel">Strength:</label></div>
 									<div class="sheet-col sheet-AttBorder" style="margin-bottom: 10px;">
 										<input type="checkbox" class="sheet-NewDieType" name="attr_DieTypeConfig" style="width: 15px; display: none;" />
@@ -571,8 +617,12 @@
 											 </select>
 										 </div><span style="font-weight: bold;">
 										 + </span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_stMod" title="@{stMod}" value="0" /></div><div class="sheet-col sheet-AttMod" style="margin-bottom: 10px;"><span class="sheet-spaceBetween">&nbsp;+&nbsp;</span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_strollMod" title="@{strollMod}" value="0" />
-										<button type='roll' name='roll_StrengthRoll' title="@{StrengthRoll}" value='/em @{character_name} attempts to be strong and rolls [[{1d@{strength}![Strength], 1d@{wilddie}![Wild Die]}kh1 +@{stMod}[Strength Rank Modifier] + @{strollMod}[Strength Roll Modifier] + @{ttmod}[Trait Test Modifier] +@{dmgmod}[Damage Modifiers] + (@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmStrengthRoll' title="@{gmStrengthRoll}" value='/w gm @{character_name} attempts to be strong and rolls [[{1d@{strength}![Strength], 1d@{wilddie}![Wild Die]}kh1 +@{stMod}[Strength Rank Modifier] + @{strollMod}[Strength Roll Modifier] + @{ttmod}[Trait Test Modifier] +@{dmgmod}[Damage Modifiers] + (@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-										<input type='hidden' name='attr_rollStrength' value='/em @{character_name} attempts to be strong and rolls [[{1d@{strength}![Strength], 1d@{wilddie}![Wild Die]}kh1 +@{stMod}[Strength Rank Modifier] + @{strollMod}[Strength Roll Modifier] + @{ttmod}[Trait Test Modifier] +@{dmgmod}[Damage Modifiers] + @{encumbrance}[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' /></div>
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tStrengthRoll' title="@{tStrengthRoll}" value='@{skillrt} @{rolltStrength}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmStrengthRoll' title="@{tgmStrengthRoll}" value='/w gm @{skillrt} @{rolltStrength}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_StrengthRoll' title="@{StrengthRoll}" value='/em @{character_name} attempts to be strong and rolls @{rollStrength}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmStrengthRoll' title="@{gmStrengthRoll}" value='/w gm @{character_name} attempts to be strong and rolls @{rollStrength}'></button>
+										<input type='hidden' name='attr_rollStrength' value='[[{1d@{strength}![Strength], 1d@{wilddie}![Wild Die]}kh1 +@{stMod}[Strength Rank Modifier] + @{strollMod}[Strength Roll Modifier] + @{ttmod}[Trait Test Modifier] +@{dmgmod}[Damage Modifiers] + @{encumbrance}[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltStrength' value='{{name=@{character_name}}} {{skill_name=Strength}} {{skill_rank=@{strength}}} {{skill_rank_mod=@{stMod}}} {{att_mod=@{strollMod}}} {{ttmod=@{ttmod}}} {{enc=[[@{encumbrance}]]}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{strength}! + @{stMod} + @{strollMod}[Skill Modifier] + @{ModSumEnc}[Other Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{stMod} + @{strollMod}[Skill Modifier] + @{ModSumEnc}[Other Modifiers]]]}}' />
+									</div>
 									<div class="sheet-col" style="width: auto; margin: 0px; margin-bottom: 10px;"><label class="sheet-AttributeLabel">Vigor:</label></div>
 									<div class="sheet-col sheet-AttBorder" style="margin-bottom: 10px;">
 										<input type="checkbox" class="sheet-NewDieType" name="attr_DieTypeConfig" style="width: 15px; display: none;" />
@@ -602,8 +652,12 @@
 											 </select>
 										 </div><span style="font-weight: bold;">
 										 + </span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_viMod" title="@{viMod}" value="0" /></div><div class="sheet-col sheet-AttMod" style="margin-bottom: 10px;"><span class="sheet-spaceBetween">&nbsp;+&nbsp;</span><input class="sheet-modifier" style="width: 35px;" type="number" name="attr_virollMod" title="@{virollMod}" value="0" />
-										<button type='roll' name='roll_VigorRoll' title="@{VigorRoll}" value='/em @{character_name} attempts to be healthy and rolls [[{1d@{vigor}![Vigor], 1d@{wilddie}![Wild Die]}kh1 +@{viMod}[Vigor Rank Modifier] +@{virollMod}[Vigor Roll Modifier]+ @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmVigorRoll' title="@{gmVigorRoll}" value='/w gm @{character_name} attempts to be healthy and rolls [[{1d@{vigor}![Vigor], 1d@{wilddie}![Wild Die]}kh1 +@{viMod}[Vigor Rank Modifier] +@{virollMod}[Vigor Roll Modifier]+ @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]'></button>
-										<input type='hidden' name='attr_rollVigor' value='/em @{character_name} attempts to be healthy and rolls [[{1d@{vigor}![Vigor], 1d@{wilddie}![Wild Die]}kh1 +@{viMod}[Vigor Rank Modifier] +@{virollMod}[Vigor Roll Modifier]+ @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' /></div>
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tVigorRoll' title="@{tVigorRoll}" value='@{skillrt} @{rolltVigor}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmVigorRoll' title="@{tgmVigorRoll}" value='/w gm @{skillrt} @{rolltVigor}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_VigorRoll' title="@{VigorRoll}" value='/em @{character_name} attempts to be healthy and rolls @{rollVigor}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmVigorRoll' title="@{gmVigorRoll}" value='/w gm @{character_name} attempts to be healthy and rolls @{rollVigor}'></button>
+										<input type='hidden' name='attr_rollVigor' value='[[{1d@{vigor}![Vigor], 1d@{wilddie}![Wild Die]}kh1 +@{viMod}[Vigor Rank Modifier] +@{virollMod}[Vigor Roll Modifier]+ @{ttmod}[Trait Test Modifier] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltVigor' value='{{name=@{character_name}}} {{skill_name=Vigor}} {{skill_rank=@{vigor}}} {{skill_rank_mod=@{viMod}}} {{att_mod=@{virollMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{vigor}! + @{viMod} + @{virollMod}[Skill Modifier] + @{ModSum}[Other Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{viMod} + @{virollMod}[Skill Modifier] + @{ModSum}[Other Modifiers]]]}}' />
+									</div>
 								</p>
 							</div><!-- End Attribute Column -->
 							<div class='sheet-col' style='width:260px; vertical-align: top;'>
@@ -777,8 +831,11 @@
 									<input type="checkbox" name="attr_UnskilledEncumbrance" title="@{UnskilledEncumbrance}" value="1" style="width:20px;" />
 								</div>
 								<div class='sheet-col' style='width:81px;'>
-									<button type='roll' name='roll_UnskilledRoll' title="@{UnskilledRoll}" value='/em @{character_name} attempts to not suck and rolls: [[{1d@{Unskilled}![Unskilled], 1d@{wilddie}![Wild Die]}kh1 -2[Unskilled Penalty] + {0,@{JackOfAllTrades}}kh1[Jack of All Trades Modifier] + @{ttmod}[Trait Test Modifier] +(@{UnskilledEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmUnskilledRoll' title="@{gmUnskilledRoll}" value='/w gm @{character_name} attempts to not suck and rolls: [[{1d@{Unskilled}![Unskilled], 1d@{wilddie}![Wild Die]}kh1 -2[Unskilled Penalty] + {0,@{JackOfAllTrades}}kh1[Jack of All Trades Modifier] + @{ttmod}[Trait Test Modifier] +(@{UnskilledEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollUnskilled' value='/em @{character_name} attempts to not suck and rolls: [[{1d@{Unskilled}![Unskilled], 1d@{wilddie}![Wild Die]}kh1 -2[Unskilled Penalty] + {0,@{JackOfAllTrades}}kh1[Jack of All Trades Modifier] + @{ttmod}[Trait Test Modifier] +(@{UnskilledEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tUnskilledRoll' title="@{tUnskilledRoll}" value='@{skillrt} @{rolltUnskilled}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmUnskilledRoll' title="@{tgmUnskilledRoll}" value='/w gm @{skillrt} @{rolltUnskilled}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_UnskilledRoll' title="@{UnskilledRoll}" value='/em @{character_name} attempts to not suck and rolls: @{rollUnskilled}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmUnskilledRoll' title="@{gmUnskilledRoll}" value='/w gm @{character_name} attempts to not suck and rolls: @{rollUnskilled}!'></button>
+									<input type='hidden' name='attr_rollUnskilled' value='[[{1d@{Unskilled}![Unskilled], 1d@{wilddie}![Wild Die]}kh1 -2[Unskilled Penalty] + {0,@{JackOfAllTrades}}kh1[Jack of All Trades Modifier] + @{ttmod}[Trait Test Modifier] +(@{UnskilledEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input type='hidden' name='attr_rolltUnskilled' value='{{name=@{character_name}}} {{skill_name=Unskilled}} {{skill_rank=@{Unskilled}}} {{skill_rank_mod=-2}} {{skill_mod=@{JackOfAllTrades}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{UnskilledEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Unskilled}![Unskilled] -2[Unskilled Penalty] + {0,@{JackOfAllTrades}}kh1[Jack of All Trades Modifier] + @{ModSum}[Modifiers] +(@{UnskilledEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! - 2 + {0,@{JackOfAllTrades}}kh1[Jack of All Trades Modifier] + @{ModSum}[Other Modifiers] +(@{UnskilledEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div>
 							<!--End Unskilled-->
@@ -862,8 +919,11 @@
 									<input type="checkbox" name="attr_FightingEncumbrance" title="@{FightingEncumbrance}" value="1" style="width:20px; text-align: center;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_FightingRoll' title="@{FightingRoll}" value='/em @{character_name} attempts to hit something and rolls [[{1d@{fighting}![Fighting], 1d@{wilddie}![Wild Die]}kh1 + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{FightingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmFightingRoll' title="@{gmFightingRoll}" value='/w gm @{character_name} attempts to hit something and rolls [[{1d@{fighting}![Fighting], 1d@{wilddie}![Wild Die]}kh1 + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{FightingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollFighting' value='/em @{character_name} attempts to hit something and rolls [[{1d@{fighting}![Fighting], 1d@{wilddie}![Wild Die]}kh1 + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] + (@{FightingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tFightingRoll' title="@{tFightingRoll}" value='@{skillrt} @{rolltFighting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmFightingRoll' title="@{tgmFightingRoll}" value='/w gm @{skillrt} @{rolltFighting}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_FightingRoll' title="@{FightingRoll}" value='/em @{character_name} attempts to hit something and rolls @{rollFighting}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmFightingRoll' title="@{gmFightingRoll}" value='/w gm @{character_name} attempts to hit something and rolls @{rollFighting}!'></button>
+									<input type='hidden' name='attr_rollFighting' value='[[{1d@{fighting}![Fighting], 1d@{wilddie}![Wild Die]}kh1 + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] + (@{FightingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltFighting' value='{{name=@{character_name}}} {{skill_name=Fighting}} {{skill_rank=@{fighting}}} {{skill_rank_mod=@{FightingMod}}} {{skill_mod=@{FightingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{FightingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{fighting}![Fighting] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div>
 							<!-- Static Skills -->
@@ -910,8 +970,11 @@
 									<input type="checkbox" name="attr_BoatingEncumbrance" title="@{BoatingEncumbrance}" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_BoatingRoll' title="@{BoatingRoll}" value='/em @{character_name} attempts to boat and rolls [[{1d@{boating}![Boating], 1d@{wilddie}![Wild Die]}kh1 + @{BoatingMod}[Boating Rank Modifier] + @{BoatingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{BoatingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmBoatingRoll' title="@{gmBoatingRoll}" value='/w gm @{character_name} attempts to boat and rolls [[{1d@{boating}![Boating], 1d@{wilddie}![Wild Die]}kh1 + @{BoatingMod}[Boating Rank Modifier] + @{BoatingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{BoatingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollBoating' value='/em @{character_name} attempts to boat and rolls [[{1d@{boating}![Boating], 1d@{wilddie}![Wild Die]}kh1 + @{BoatingMod}[Boating Rank Modifier] + @{BoatingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{BoatingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tBoatingRoll' title="@{tBoatingRoll}" value='@{skillrt} @{rolltBoating}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmBoatingRoll' title="@{tgmBoatingRoll}" value='/w gm @{skillrt} @{rolltBoating}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_BoatingRoll' title="@{BoatingRoll}" value='/em @{character_name} attempts to boat and rolls @{rollBoating}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmBoatingRoll' title="@{gmBoatingRoll}" value='/w gm @{character_name} attempts to boat and rolls @{rollBoating}!'></button>
+									<input type='hidden' name='attr_rollBoating' value='[[{1d@{boating}![Boating], 1d@{wilddie}![Wild Die]}kh1 + @{BoatingMod}[Boating Rank Modifier] + @{BoatingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{BoatingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltBoating' value='{{name=@{character_name}}} {{skill_name=Boating}} {{skill_rank=@{boating}}} {{skill_rank_mod=@{BoatingMod}}} {{skill_mod=@{BoatingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{BoatingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{boating}![Boating] + @{BoatingMod}[Boating Rank Modifier] + @{BoatingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{BoatingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{BoatingMod}[Boating Rank Modifier] + @{BoatingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{BoatingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> <!-- End Boating -->
 				
@@ -958,8 +1021,11 @@
 									<input type="checkbox" name="attr_ClimbingEncumbrance" title="@{ClimbingEncumbrance}" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_ClimbingRoll' title="@{ClimbingRoll}" value='/em @{character_name} attempts to climb and rolls [[{1d@{Climbing}![Climbing], 1d@{wilddie}![Wild Die]}kh1 + @{ClimbingMod}[Climbing Rank Modifier] + @{ClimbingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ClimbingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmClimbingRoll' title="@{gmClimbingRoll}" value='/w gm @{character_name} attempts to climb and rolls [[{1d@{Climbing}![Climbing], 1d@{wilddie}![Wild Die]}kh1 + @{ClimbingMod}[Climbing Rank Modifier] + @{ClimbingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ClimbingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollClimbing' value='/em @{character_name} attempts to climb and rolls [[{1d@{Climbing}![Climbing], 1d@{wilddie}![Wild Die]}kh1 + @{ClimbingMod}[Climbing Rank Modifier] + @{ClimbingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ClimbingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tClimbingRoll' title="@{tClimbingRoll}" value='@{skillrt} @{rolltClimbing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmClimbingRoll' title="@{tgmClimbingRoll}" value='/w gm @{skillrt} @{rolltClimbing}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_ClimbingRoll' title="@{ClimbingRoll}" value='/em @{character_name} attempts to climb and rolls @{rollClimbing}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmClimbingRoll' title="@{gmClimbingRoll}" value='/w gm @{character_name} attempts to climb and rolls @{rollClimbing}!'></button>
+									<input type='hidden' name='attr_rollClimbing' value='[[{1d@{Climbing}![Climbing], 1d@{wilddie}![Wild Die]}kh1 + @{ClimbingMod}[Climbing Rank Modifier] + @{ClimbingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ClimbingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltClimbing' value='{{name=@{character_name}}} {{skill_name=Climbing}} {{skill_rank=@{Climbing}}} {{skill_rank_mod=@{ClimbingMod}}} {{skill_mod=@{ClimbingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{ClimbingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Climbing}![Climbing] + @{ClimbingMod}[Climbing Rank Modifier] + @{ClimbingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{ClimbingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{ClimbingMod}[Climbing Rank Modifier] + @{ClimbingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{ClimbingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div>
 							<!-- End Climbing -->
@@ -1007,8 +1073,11 @@
 									<input type="checkbox" name="attr_DrivingEncumbrance" title="@{DrivingEncumbrance}" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_DrivingRoll' title="@{DrivingRoll}" value='/em @{character_name} attempts to drive and rolls [[{1d@{Driving}![Driving], 1d@{wilddie}![Wild Die]}kh1 + @{DrivingMod}[Driving Rank Modifier] + @{DrivingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{DrivingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmDrivingRoll' title="@{gmDrivingRoll}" value='/w gm @{character_name} attempts to drive and rolls [[{1d@{Driving}![Driving], 1d@{wilddie}![Wild Die]}kh1 + @{DrivingMod}[Driving Rank Modifier] + @{DrivingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{DrivingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollDriving' value='/em @{character_name} attempts to drive and rolls [[{1d@{Driving}![Driving], 1d@{wilddie}![Wild Die]}kh1 + @{DrivingMod}[Driving Rank Modifier] + @{DrivingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{DrivingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tDrivingRoll' title="@{tDrivingRoll}" value='@{skillrt} @{rolltDriving}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmDrivingRoll' title="@{tgmDrivingRoll}" value='/w gm @{skillrt} @{rolltDriving}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_DrivingRoll' title="@{DrivingRoll}" value='/em @{character_name} attempts to drive and rolls @{rollDriving}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmDrivingRoll' title="@{gmDrivingRoll}" value='/w gm @{character_name} attempts to drive and rolls @{rollDriving}!'></button>
+									<input type='hidden' name='attr_rollDriving' value='[[{1d@{Driving}![Driving], 1d@{wilddie}![Wild Die]}kh1 + @{DrivingMod}[Driving Rank Modifier] + @{DrivingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{DrivingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltDriving' value='{{name=@{character_name}}} {{skill_name=Driving}} {{skill_rank=@{Driving}}} {{skill_rank_mod=@{DrivingMod}}} {{skill_mod=@{DrivingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{DrivingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Driving}![Driving] + @{DrivingMod}[Driving Rank Modifier] + @{DrivingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{DrivingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{DrivingMod}[Driving Rank Modifier] + @{DrivingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{DrivingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Driving (Agility) -->
@@ -1056,8 +1125,11 @@
 									<input type="checkbox" name="attr_FaithEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_FaithRoll' title="@{FaithRoll}" value='/em @{character_name} attempts to be faithful and rolls [[{1d@{Faith}![Faith], 1d@{wilddie}![Wild Die]}kh1 + @{FaithMod}[Faith Rank Modifier] + @{FaithskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmFaithRoll' title="@{gmFaithRoll}" value='/w gm @{character_name} attempts to be faithful and rolls [[{1d@{Faith}![Faith], 1d@{wilddie}![Wild Die]}kh1 + @{FaithMod}[Faith Rank Modifier] + @{FaithskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollFaith' value='/em @{character_name} attempts to be faithful and rolls [[{1d@{Faith}![Faith], 1d@{wilddie}![Wild Die]}kh1 + @{FaithMod}[Faith Rank Modifier] + @{FaithskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tFaithRoll' title="@{tFaithRoll}" value='@{skillrt} @{rolltFaith}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmFaithRoll' title="@{tgmFaithRoll}" value='/w gm @{skillrt} @{rolltFaith}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_FaithRoll' title="@{FaithRoll}" value='/em @{character_name} attempts to be faithful and rolls @{rollFaith}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmFaithRoll' title="@{gmFaithRoll}" value='/w gm @{character_name} attempts to be faithful and rolls @{rollFaith}!'></button>
+									<input type='hidden' name='attr_rollFaith' value='[[{1d@{Faith}![Faith], 1d@{wilddie}![Wild Die]}kh1 + @{FaithMod}[Faith Rank Modifier] + @{FaithskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltFaith' value='{{name=@{character_name}}} {{skill_name=Faith}} {{skill_rank=@{Faith}}} {{skill_rank_mod=@{FaithMod}}} {{skill_mod=@{FaithskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Faith}![Faith] + @{FaithMod}[Faith Rank Modifier] + @{FaithskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{FaithMod}[Faith Rank Modifier] + @{FaithskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Faith -->
@@ -1105,8 +1177,11 @@
 									<input type="checkbox" name="attr_GamblingEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_GamblingRoll' title="@{GamblingRoll}" value='/em @{character_name} attempts to gamble and rolls [[{1d@{Gambling}![Gambling], 1d@{wilddie}![Wild Die]}kh1 + @{GamblingMod}[Gambling Rank Modifier] + @{GamblingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmGamblingRoll' title="@{gmGamblingRoll}" value='/w gm @{character_name} attempts to gamble and rolls [[{1d@{Gambling}![Gambling], 1d@{wilddie}![Wild Die]}kh1 + @{GamblingMod}[Gambling Rank Modifier] + @{GamblingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollGambling' value='/em @{character_name} attempts to gamble and rolls [[{1d@{Gambling}![Gambling], 1d@{wilddie}![Wild Die]}kh1 + @{GamblingMod}[Gambling Rank Modifier] + @{GamblingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tGamblingRoll' title="@{tGamblingRoll}" value='@{skillrt} @{rolltGambling}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmGamblingRoll' title="@{tgmGamblingRoll}" value='/w gm @{skillrt} @{rolltGambling}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_GamblingRoll' title="@{GamblingRoll}" value='/em @{character_name} attempts to gamble and rolls @{rollGambling}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmGamblingRoll' title="@{gmGamblingRoll}" value='/w gm @{character_name} attempts to gamble and rolls @{rollGambling}!'></button>
+									<input type='hidden' name='attr_rollGambling' value='[[{1d@{Gambling}![Gambling], 1d@{wilddie}![Wild Die]}kh1 + @{GamblingMod}[Gambling Rank Modifier] + @{GamblingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltGambling' value='{{name=@{character_name}}} {{skill_name=Gambling}} {{skill_rank=@{Gambling}}} {{skill_rank_mod=@{GamblingMod}}} {{skill_mod=@{GamblingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Gambling}![Gambling] + @{GamblingMod}[Gambling Rank Modifier] + @{GamblingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{GamblingMod}[Gambling Rank Modifier] + @{GamblingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Gambling -->
@@ -1154,8 +1229,11 @@
 									<input type="checkbox" name="attr_GutsEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_GutsRoll' title="@{GutsRoll}" value='/em @{character_name} attempts to be gutsy and rolls [[{1d@{Guts}![Guts], 1d@{wilddie}![Wild Die]}kh1 + @{GutsMod}[Guts Rank Modifier] + @{GutsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmGutsRoll' title="@{gmGutsRoll}" value='/w gm @{character_name} attempts to be faithful and rolls [[{1d@{Guts}![Guts], 1d@{wilddie}![Wild Die]}kh1 + @{GutsMod}[Guts Rank Modifier] + @{GutsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollGuts' value='/em @{character_name} attempts to be gutsy and rolls [[{1d@{Guts}![Guts], 1d@{wilddie}![Wild Die]}kh1 + @{GutsMod}[Guts Rank Modifier] + @{GutsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tGutsRoll' title="@{tGutsRoll}" value='@{skillrt} @{rolltGuts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmGutsRoll' title="@{tgmGutsRoll}" value='/w gm @{skillrt} @{rolltGuts}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_GutsRoll' title="@{GutsRoll}" value='/em @{character_name} attempts to be gutsy and rolls @{rollGuts}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmGutsRoll' title="@{gmGutsRoll}" value='/w gm @{character_name} attempts to be faithful and rolls @{rollGuts}!'></button>
+									<input type='hidden' name='attr_rollGuts' value='[[{1d@{Guts}![Guts], 1d@{wilddie}![Wild Die]}kh1 + @{GutsMod}[Guts Rank Modifier] + @{GutsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltGuts' value='{{name=@{character_name}}} {{skill_name=Guts}} {{skill_rank=@{Guts}}} {{skill_rank_mod=@{GutsMod}}} {{skill_mod=@{GutsskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Guts}![Guts] + @{GutsMod}[Guts Rank Modifier] + @{GutsskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{GutsMod}[Guts Rank Modifier] + @{GutsskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Guts -->
@@ -1203,8 +1281,11 @@
 									<input type="checkbox" name="attr_HealingEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_HealingRoll' title="@{HealingRoll}" value='/em @{character_name} attempts to heal and rolls [[{1d@{Healing}![Healing], 1d@{wilddie}![Wild Die]}kh1 + @{HealingMod}[Healing Rank Modifier] + @{HealingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmHealingRoll' title="@{gmHealingRoll}" value='/w gm @{character_name} attempts to heal and rolls [[{1d@{Healing}![Healing], 1d@{wilddie}![Wild Die]}kh1 + @{HealingMod}[Healing Rank Modifier] + @{HealingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollHealing' value='/em @{character_name} attempts to heal and rolls [[{1d@{Healing}![Healing], 1d@{wilddie}![Wild Die]}kh1 + @{HealingMod}[Healing Rank Modifier] + @{HealingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tHealingRoll' title="@{tHealingRoll}" value='@{skillrt} @{rolltHealing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmHealingRoll' title="@{tgmHealingRoll}" value='/w gm @{skillrt} @{rolltHealing}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_HealingRoll' title="@{HealingRoll}" value='/em @{character_name} attempts to heal and rolls @{rollHealing}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmHealingRoll' title="@{gmHealingRoll}" value='/w gm @{character_name} attempts to heal and rolls @{rollHealing}!'></button>
+									<input type='hidden' name='attr_rollHealing' value='[[{1d@{Healing}![Healing], 1d@{wilddie}![Wild Die]}kh1 + @{HealingMod}[Healing Rank Modifier] + @{HealingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltHealing' value='{{name=@{character_name}}} {{skill_name=Healing}} {{skill_rank=@{Healing}}} {{skill_rank_mod=@{HealingMod}}} {{skill_mod=@{HealingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Healing}![Healing] + @{HealingMod}[Healing Rank Modifier] + @{HealingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{HealingMod}[Healing Rank Modifier] + @{HealingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Healing -->
@@ -1252,8 +1333,11 @@
 									<input type="checkbox" name="attr_IntimidationEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_IntimidationRoll' title="@{IntimidationRoll}" value='/em @{character_name} attempts to intimidate and rolls [[{1d@{Intimidation}![Intimidation], 1d@{wilddie}![Wild Die]}kh1 + @{IntimidationMod}[Intimidation Rank Modifier] + @{IntimidationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmIntimidationRoll' title="@{gmIntimidationRoll}" value='/w gm @{character_name} attempts to intimidate and rolls [[{1d@{Intimidation}![Intimidation], 1d@{wilddie}![Wild Die]}kh1 + @{IntimidationMod}[Intimidation Rank Modifier] + @{IntimidationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollIntimidation' value='/em @{character_name} attempts to intimidate and rolls [[{1d@{Intimidation}![Intimidation], 1d@{wilddie}![Wild Die]}kh1 + @{IntimidationMod}[Intimidation Rank Modifier] + @{IntimidationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tIntimidationRoll' title="@{tIntimidationRoll}" value='@{skillrt} @{rolltIntimidation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmIntimidationRoll' title="@{tgmIntimidationRoll}" value='/w gm @{skillrt} @{rolltIntimidation}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_IntimidationRoll' title="@{IntimidationRoll}" value='/em @{character_name} attempts to intimidate and rolls @{rollIntimidation}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmIntimidationRoll' title="@{gmIntimidationRoll}" value='/w gm @{character_name} attempts to intimidate and rolls @{rollIntimidation}!'></button>
+									<input type='hidden' name='attr_rollIntimidation' value='[[{1d@{Intimidation}![Intimidation], 1d@{wilddie}![Wild Die]}kh1 + @{IntimidationMod}[Intimidation Rank Modifier] + @{IntimidationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltIntimidation' value='{{name=@{character_name}}} {{skill_name=Intimidation}} {{skill_rank=@{Intimidation}}} {{skill_rank_mod=@{IntimidationMod}}} {{skill_mod=@{IntimidationskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Intimidation}![Intimidation] + @{IntimidationMod}[Intimidation Rank Modifier] + @{IntimidationskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{IntimidationMod}[Intimidation Rank Modifier] + @{IntimidationskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Intimidation -->
@@ -1301,8 +1385,11 @@
 									<input type="checkbox" name="attr_InvestigationEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_InvestigationRoll' title="@{InvestigationRoll}" value='/em @{character_name} attempts to investigate and rolls [[{1d@{Investigation}![Investigation], 1d@{wilddie}![Wild Die]}kh1 + @{InvestigationMod}[Investigation Rank Modifier] + @{InvestigationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmInvestigationRoll' title="@{gmInvestigationRoll}" value='/w gm @{character_name} attempts to investigate and rolls [[{1d@{Investigation}![Investigation], 1d@{wilddie}![Wild Die]}kh1 + @{InvestigationMod}[Investigation Rank Modifier] + @{InvestigationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollInvestigation' value='/em @{character_name} attempts to investigate and rolls [[{1d@{Investigation}![Investigation], 1d@{wilddie}![Wild Die]}kh1 + @{InvestigationMod}[Investigation Rank Modifier] + @{InvestigationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tInvestigationRoll' title="@{tInvestigationRoll}" value='@{skillrt} @{rolltInvestigation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmInvestigationRoll' title="@{tgmInvestigationRoll}" value='/w gm @{skillrt} @{rolltInvestigation}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_InvestigationRoll' title="@{InvestigationRoll}" value='/em @{character_name} attempts to investigate and rolls @{rollInvestigation}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmInvestigationRoll' title="@{gmInvestigationRoll}" value='/w gm @{character_name} attempts to investigate and rolls @{rollInvestigation}!'></button>
+									<input type='hidden' name='attr_rollInvestigation' value='[[{1d@{Investigation}![Investigation], 1d@{wilddie}![Wild Die]}kh1 + @{InvestigationMod}[Investigation Rank Modifier] + @{InvestigationskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltInvestigation' value='{{name=@{character_name}}} {{skill_name=Investigation}} {{skill_rank=@{Investigation}}} {{skill_rank_mod=@{InvestigationMod}}} {{skill_mod=@{InvestigationskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Investigation}![Investigation] + @{InvestigationMod}[Investigation Rank Modifier] + @{InvestigationskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{InvestigationMod}[Investigation Rank Modifier] + @{InvestigationskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Investigation -->
@@ -1350,8 +1437,11 @@
 									<input type="checkbox" name="attr_LockpickingEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_LockpickingRoll' title="@{LockpickingRoll}" value='/em @{character_name} attempts to lockpick and rolls [[{1d@{Lockpicking}![Lockpicking], 1d@{wilddie}![Wild Die]}kh1 + @{LockpickingMod}[Lockpicking Rank Modifier] + @{LockpickingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{LockpickingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmLockpickingRoll' title="@{gmLockpickingRoll}" value='/w gm @{character_name} attempts to lockpick and rolls [[{1d@{Lockpicking}![Lockpicking], 1d@{wilddie}![Wild Die]}kh1 + @{LockpickingMod}[Lockpicking Rank Modifier] + @{LockpickingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{LockpickingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollLockpicking' value='/em @{character_name} attempts to lockpick and rolls [[{1d@{Lockpicking}![Lockpicking], 1d@{wilddie}![Wild Die]}kh1 + @{LockpickingMod}[Lockpicking Rank Modifier] + @{LockpickingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{LockpickingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tLockpickingRoll' title="@{tLockpickingRoll}" value='@{skillrt} @{rolltLockpicking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmLockpickingRoll' title="@{tgmLockpickingRoll}" value='/w gm @{skillrt} @{rolltLockpicking}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_LockpickingRoll' title="@{LockpickingRoll}" value='/em @{character_name} attempts to lockpick and rolls @{rollLockpicking}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmLockpickingRoll' title="@{gmLockpickingRoll}" value='/w gm @{character_name} attempts to lockpick and rolls @{rollLockpicking}!'></button>
+									<input type='hidden' name='attr_rollLockpicking' value='[[{1d@{Lockpicking}![Lockpicking], 1d@{wilddie}![Wild Die]}kh1 + @{LockpickingMod}[Lockpicking Rank Modifier] + @{LockpickingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{LockpickingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltLockpicking' value='{{name=@{character_name}}} {{skill_name=Lockpicking}} {{skill_rank=@{Lockpicking}}} {{skill_rank_mod=@{LockpickingMod}}} {{skill_mod=@{LockpickingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{LockpickingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Lockpicking}![Lockpicking] + @{LockpickingMod}[Lockpicking Rank Modifier] + @{LockpickingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{LockpickingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{LockpickingMod}[Lockpicking Rank Modifier] + @{LockpickingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{LockpickingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Lockpicking (Agility) -->
@@ -1399,8 +1489,11 @@
 									<input type="checkbox" name="attr_NoticeEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_NoticeRoll' title="@{NoticeRoll}" value='/em @{character_name} attempts to notice and rolls [[{1d@{Notice}![Notice], 1d@{wilddie}![Wild Die]}kh1 + @{NoticeMod}[Notice Rank Modifier] + @{NoticeskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmNoticeRoll' title="@{gmNoticeRoll}" value='/w gm @{character_name} attempts to notice and rolls [[{1d@{Notice}![Notice], 1d@{wilddie}![Wild Die]}kh1 + @{NoticeMod}[Notice Rank Modifier] + @{NoticeskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollNotice' value='/em @{character_name} attempts to notice and rolls [[{1d@{Notice}![Notice], 1d@{wilddie}![Wild Die]}kh1 + @{NoticeMod}[Notice Rank Modifier] + @{NoticeskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tNoticeRoll' title="@{tNoticeRoll}" value='@{skillrt} @{rolltNotice}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmNoticeRoll' title="@{tgmNoticeRoll}" value='/w gm @{skillrt} @{rolltNotice}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_NoticeRoll' title="@{NoticeRoll}" value='/em @{character_name} attempts to notice and rolls @{rollNotice}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmNoticeRoll' title="@{gmNoticeRoll}" value='/w gm @{character_name} attempts to notice and rolls @{rollNotice}!'></button>
+									<input type='hidden' name='attr_rollNotice' value='[[{1d@{Notice}![Notice], 1d@{wilddie}![Wild Die]}kh1 + @{NoticeMod}[Notice Rank Modifier] + @{NoticeskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltNotice' value='{{name=@{character_name}}} {{skill_name=Notice}} {{skill_rank=@{Notice}}} {{skill_rank_mod=@{NoticeMod}}} {{skill_mod=@{NoticeskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Notice}![Notice] + @{NoticeMod}[Notice Rank Modifier] + @{NoticeskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{NoticeMod}[Notice Rank Modifier] + @{NoticeskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Notice -->
@@ -1448,8 +1541,11 @@
 									<input type="checkbox" name="attr_PersuasionEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_PersuasionRoll' title="@{PersuasionRoll}" value='/em @{character_name} attempts to persuade and rolls [[{1d@{Persuasion}![Persuasion], 1d@{wilddie}![Wild Die]}kh1 + @{PersuasionMod}[Persuasion Rank Modifier] + @{PersuasionskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmPersuasionRoll' title="@{gmPersuasionRoll}" value='/w gm @{character_name} attempts to persuade and rolls [[{1d@{Persuasion}![Persuasion], 1d@{wilddie}![Wild Die]}kh1 + @{PersuasionMod}[Persuasion Rank Modifier] + @{PersuasionskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollPersuasion' value='/em @{character_name} attempts to persuade and rolls [[{1d@{Persuasion}![Persuasion], 1d@{wilddie}![Wild Die]}kh1 + @{PersuasionMod}[Persuasion Rank Modifier] + @{PersuasionskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tPersuasionRoll' title="@{tPersuasionRoll}" value='@{skillrt} @{rolltPersuasion}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmPersuasionRoll' title="@{tgmPersuasionRoll}" value='/w gm @{skillrt} @{rolltPersuasion}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_PersuasionRoll' title="@{PersuasionRoll}" value='/em @{character_name} attempts to persuade and rolls @{rollPersuasion}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmPersuasionRoll' title="@{gmPersuasionRoll}" value='/w gm @{character_name} attempts to persuade and rolls @{rollPersuasion}!'></button>
+									<input type='hidden' name='attr_rollPersuasion' value='[[{1d@{Persuasion}![Persuasion], 1d@{wilddie}![Wild Die]}kh1 + @{PersuasionMod}[Persuasion Rank Modifier] + @{PersuasionskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltPersuasion' value='{{name=@{character_name}}} {{skill_name=Persuasion}} {{skill_rank=@{Persuasion}}} {{skill_rank_mod=@{PersuasionMod}}} {{skill_mod=@{PersuasionskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Persuasion}![Persuasion] + @{PersuasionMod}[Persuasion Rank Modifier] + @{PersuasionskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{PersuasionMod}[Persuasion Rank Modifier] + @{PersuasionskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Persuasion -->
@@ -1497,8 +1593,11 @@
 									<input type="checkbox" name="attr_PilotingEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_PilotingRoll' title="@{PilotingRoll}" value='/em @{character_name} attempts to pilot and rolls [[{1d@{Piloting}![Piloting], 1d@{wilddie}![Wild Die]}kh1 + @{PilotingMod}[Piloting Rank Modifier] + @{PilotingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{PilotingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmPilotingRoll' title="@{gmPilotingRoll}" value='/w gm @{character_name} attempts to pilot and rolls [[{1d@{Piloting}![Piloting], 1d@{wilddie}![Wild Die]}kh1 + @{PilotingMod}[Piloting Rank Modifier] + @{PilotingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{PilotingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollPiloting' value='/em @{character_name} attempts to pilot and rolls [[{1d@{Piloting}![Piloting], 1d@{wilddie}![Wild Die]}kh1 + @{PilotingMod}[Piloting Rank Modifier] + @{PilotingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{PilotingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tPilotingRoll' title="@{tPilotingRoll}" value='@{skillrt} @{rolltPiloting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmPilotingRoll' title="@{tgmPilotingRoll}" value='/w gm @{skillrt} @{rolltPiloting}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_PilotingRoll' title="@{PilotingRoll}" value='/em @{character_name} attempts to pilot and rolls @{rollPiloting}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmPilotingRoll' title="@{gmPilotingRoll}" value='/w gm @{character_name} attempts to pilot and rolls @{rollPiloting}!'></button>
+									<input type='hidden' name='attr_rollPiloting' value='[[{1d@{Piloting}![Piloting], 1d@{wilddie}![Wild Die]}kh1 + @{PilotingMod}[Piloting Rank Modifier] + @{PilotingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{PilotingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltPiloting' value='{{name=@{character_name}}} {{skill_name=Piloting}} {{skill_rank=@{Piloting}}} {{skill_rank_mod=@{PilotingMod}}} {{skill_mod=@{PilotingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{PilotingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Piloting}![Piloting] + @{PilotingMod}[Piloting Rank Modifier] + @{PilotingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{PilotingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{PilotingMod}[Piloting Rank Modifier] + @{PilotingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{PilotingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Piloting (Agility) -->
@@ -1558,8 +1657,11 @@
 									<input type="checkbox" name="attr_PsionicsEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_PsionicsRoll' title="@{PsionicsRoll}" value='/em @{character_name} attempts to use Psionics and rolls [[{1d@{Psionics}![Psionics], 1d@{wilddie}![Wild Die]}kh1 + @{PsionicsMod}[Psionics Rank Modifier] + @{PsionicsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmPsionicsRoll' title="@{gmPsionicsRoll}" value='/w gm @{character_name} attempts to use Psionics and rolls [[{1d@{Psionics}![Psionics], 1d@{wilddie}![Wild Die]}kh1 + @{PsionicsMod}[Psionics Rank Modifier] + @{PsionicsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollPsionics' value='/em @{character_name} attempts to use Psionics and rolls [[{1d@{Psionics}![Psionics], 1d@{wilddie}![Wild Die]}kh1 + @{PsionicsMod}[Psionics Rank Modifier] + @{PsionicsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tPsionicsRoll' title="@{tPsionicsRoll}" value='@{skillrt} @{rolltPsionics}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmPsionicsRoll' title="@{tgmPsionicsRoll}" value='/w gm @{skillrt} @{rolltPsionics}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_PsionicsRoll' title="@{PsionicsRoll}" value='/em @{character_name} attempts to use Psionics and rolls @{rollPsionics}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmPsionicsRoll' title="@{gmPsionicsRoll}" value='/w gm @{character_name} attempts to use Psionics and rolls @{rollPsionics}!'></button>
+									<input type='hidden' name='attr_rollPsionics' value='[[{1d@{Psionics}![Psionics], 1d@{wilddie}![Wild Die]}kh1 + @{PsionicsMod}[Psionics Rank Modifier] + @{PsionicsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltPsionics' value='{{name=@{character_name}}} {{skill_name=Psionics}} {{skill_rank=@{Psionics}}} {{skill_rank_mod=@{PsionicsMod}}} {{skill_mod=@{PsionicsskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Psionics}![Psionics] + @{PsionicsMod}[Psionics Rank Modifier] + @{PsionicsskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{PsionicsMod}[Psionics Rank Modifier] + @{PsionicsskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Psionics -->
@@ -1607,8 +1709,11 @@
 									<input type="checkbox" name="attr_RepairEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_RepairRoll' title="@{RepairRoll}" value='/em @{character_name} attempts to repair and rolls [[{1d@{Repair}![Repair], 1d@{wilddie}![Wild Die]}kh1 + @{RepairMod}[Repair Rank Modifier] + @{RepairskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmRepairRoll' title="@{gmRepairRoll}" value='/w gm @{character_name} attempts to repair and rolls [[{1d@{Repair}![Repair], 1d@{wilddie}![Wild Die]}kh1 + @{RepairMod}[Repair Rank Modifier] + @{RepairskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollRepair' value='/em @{character_name} attempts to repair and rolls [[{1d@{Repair}![Repair], 1d@{wilddie}![Wild Die]}kh1 + @{RepairMod}[Repair Rank Modifier] + @{RepairskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tRepairRoll' title="@{tRepairRoll}" value='@{skillrt} @{rolltRepair}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRepairRoll' title="@{tgmRepairRoll}" value='/w gm @{skillrt} @{rolltRepair}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_RepairRoll' title="@{RepairRoll}" value='/em @{character_name} attempts to repair and rolls @{rollRepair}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmRepairRoll' title="@{gmRepairRoll}" value='/w gm @{character_name} attempts to repair and rolls @{rollRepair}!'></button>
+									<input type='hidden' name='attr_rollRepair' value='[[{1d@{Repair}![Repair], 1d@{wilddie}![Wild Die]}kh1 + @{RepairMod}[Repair Rank Modifier] + @{RepairskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltRepair' value='{{name=@{character_name}}} {{skill_name=Repair}} {{skill_rank=@{Repair}}} {{skill_rank_mod=@{RepairMod}}} {{skill_mod=@{RepairskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Repair}![Repair] + @{RepairMod}[Repair Rank Modifier] + @{RepairskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{RepairMod}[Repair Rank Modifier] + @{RepairskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Repair -->
@@ -1656,8 +1761,11 @@
 									<input type="checkbox" name="attr_RidingEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_RidingRoll' title="@{RidingRoll}" value='/em @{character_name} attempts to ride and rolls [[{1d@{Riding}![Riding], 1d@{wilddie}![Wild Die]}kh1 + @{RidingMod}[Riding Rank Modifier] + @{RidingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{RidingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmRidingRoll' title="@{gmRidingRoll}" value='/w gm @{character_name} attempts to ride and rolls [[{1d@{Riding}![Riding], 1d@{wilddie}![Wild Die]}kh1 + @{RidingMod}[Riding Rank Modifier] + @{RidingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{RidingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollRiding' value='/em @{character_name} attempts to ride and rolls [[{1d@{Riding}![Riding], 1d@{wilddie}![Wild Die]}kh1 + @{RidingMod}[Riding Rank Modifier] + @{RidingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{RidingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tRidingRoll' title="@{tRidingRoll}" value='@{skillrt} @{rolltRiding}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRidingRoll' title="@{tgmRidingRoll}" value='/w gm @{skillrt} @{rolltRiding}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_RidingRoll' title="@{RidingRoll}" value='/em @{character_name} attempts to ride and rolls @{rollRiding}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmRidingRoll' title="@{gmRidingRoll}" value='/w gm @{character_name} attempts to ride and rolls @{rollRiding}!'></button>
+									<input type='hidden' name='attr_rollRiding' value='[[{1d@{Riding}![Riding], 1d@{wilddie}![Wild Die]}kh1 + @{RidingMod}[Riding Rank Modifier] + @{RidingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{RidingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltRiding' value='{{name=@{character_name}}} {{skill_name=Riding}} {{skill_rank=@{Riding}}} {{skill_rank_mod=@{RidingMod}}} {{skill_mod=@{RidingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{RidingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Riding}![Riding] + @{RidingMod}[Riding Rank Modifier] + @{RidingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{RidingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{RidingMod}[Riding Rank Modifier] + @{RidingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{RidingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Riding (Agility) -->
@@ -1717,8 +1825,11 @@
 									<input type="checkbox" name="attr_RitualEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_RitualRoll' title="@{RitualRoll}" value='/em @{character_name} attempts a ritual and rolls [[{1d@{Ritual}![Ritual], 1d@{wilddie}![Wild Die]}kh1 + @{RitualMod}[Ritual Rank Modifier] + @{RitualsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmRitualRoll' title="@{gmRitualRoll}" value='/w gm @{character_name} attempts a ritual and rolls [[{1d@{Ritual}![Ritual], 1d@{wilddie}![Wild Die]}kh1 + @{RitualMod}[Ritual Rank Modifier] + @{RitualsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollRitual' value='/em @{character_name} attempts a ritual and rolls [[{1d@{Ritual}![Ritual], 1d@{wilddie}![Wild Die]}kh1 + @{RitualMod}[Ritual Rank Modifier] + @{RitualsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tRitualRoll' title="@{tRitualRoll}" value='@{skillrt} @{rolltRitual}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRitualRoll' title="@{tgmRitualRoll}" value='/w gm @{skillrt} @{rolltRitual}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_RitualRoll' title="@{RitualRoll}" value='/em @{character_name} attempts a ritual and rolls @{rollRitual}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmRitualRoll' title="@{gmRitualRoll}" value='/w gm @{character_name} attempts a ritual and rolls @{rollRitual}!'></button>
+									<input type='hidden' name='attr_rollRitual' value='[[{1d@{Ritual}![Ritual], 1d@{wilddie}![Wild Die]}kh1 + @{RitualMod}[Ritual Rank Modifier] + @{RitualsskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltRitual' value='{{name=@{character_name}}} {{skill_name=Ritual}} {{skill_rank=@{Ritual}}} {{skill_rank_mod=@{RitualMod}}} {{skill_mod=@{RitualsskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Ritual}![Ritual] + @{RitualMod}[Ritual Rank Modifier] + @{RitualsskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{RitualMod}[Ritual Rank Modifier] + @{RitualsskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Ritual -->
@@ -1766,8 +1877,11 @@
 									<input type="checkbox" name="attr_ShootingEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_ShootingRoll' title="@{ShootingRoll}" value='/em @{character_name} attempts to shoot and rolls [[{1d@{Shooting}![Shooting], 1d@{wilddie}![Wild Die]}kh1 + @{ShootingMod}[Shooting Rank Modifier] + @{ShootingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ShootingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmShootingRoll' title="@{gmShootingRoll}" value='/w gm @{character_name} attempts to shoot and rolls [[{1d@{Shooting}![Shooting], 1d@{wilddie}![Wild Die]}kh1 + @{ShootingMod}[Shooting Rank Modifier] + @{ShootingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ShootingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollShooting' value='/em @{character_name} attempts to shoot and rolls [[{1d@{Shooting}![Shooting], 1d@{wilddie}![Wild Die]}kh1 + @{ShootingMod}[Shooting Rank Modifier] + @{ShootingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ShootingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tShootingRoll' title="@{tShootingRoll}" value='@{skillrt} @{rolltShooting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmShootingRoll' title="@{tgmShootingRoll}" value='/w gm @{skillrt} @{rolltShooting}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_ShootingRoll' title="@{ShootingRoll}" value='/em @{character_name} attempts to shoot and rolls @{rollShooting}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmShootingRoll' title="@{gmShootingRoll}" value='/w gm @{character_name} attempts to shoot and rolls @{rollShooting}!'></button>
+									<input type='hidden' name='attr_rollShooting' value='[[{1d@{Shooting}![Shooting], 1d@{wilddie}![Wild Die]}kh1 + @{ShootingMod}[Shooting Rank Modifier] + @{ShootingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ShootingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltShooting' value='{{name=@{character_name}}} {{skill_name=Shooting}} {{skill_rank=@{Shooting}}} {{skill_rank_mod=@{ShootingMod}}} {{skill_mod=@{ShootingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{ShootingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Shooting}![Shooting] + @{ShootingMod}[Shooting Rank Modifier] + @{ShootingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{ShootingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{ShootingMod}[Shooting Rank Modifier] + @{ShootingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{ShootingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Shooting (Agility) -->
@@ -1827,8 +1941,11 @@
 									<input type="checkbox" name="attr_SpellcastingEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_SpellcastingRoll' title="@{SpellcastingRoll}" value='/em @{character_name} attempts to cast a spell and rolls [[{1d@{Spellcasting}![Spellcasting], 1d@{wilddie}![Wild Die]}kh1 + @{SpellcastingMod}[Spellcasting Rank Modifier] + @{SpellcastingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmSpellcastingRoll' title="@{gmSpellcastingRoll}" value='/w gm @{character_name} attempts to cast a spell and rolls [[{1d@{Spellcasting}![Spellcasting], 1d@{wilddie}![Wild Die]}kh1 + @{SpellcastingMod}[Spellcasting Rank Modifier] + @{SpellcastingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollSpellcasting' value='/em @{character_name} attempts to cast a spell and rolls [[{1d@{Spellcasting}![Spellcasting], 1d@{wilddie}![Wild Die]}kh1 + @{SpellcastingMod}[Spellcasting Rank Modifier] + @{SpellcastingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tSpellcastingRoll' title="@{tSpellcastingRoll}" value='@{skillrt} @{rolltSpellcasting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSpellcastingRoll' title="@{tgmSpellcastingRoll}" value='/w gm @{skillrt} @{rolltSpellcasting}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_SpellcastingRoll' title="@{SpellcastingRoll}" value='/em @{character_name} attempts to cast a spell and rolls @{rollSpellcasting}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmSpellcastingRoll' title="@{gmSpellcastingRoll}" value='/w gm @{character_name} attempts to cast a spell and rolls @{rollSpellcasting}!'></button>
+									<input type='hidden' name='attr_rollSpellcasting' value='[[{1d@{Spellcasting}![Spellcasting], 1d@{wilddie}![Wild Die]}kh1 + @{SpellcastingMod}[Spellcasting Rank Modifier] + @{SpellcastingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltSpellcasting' value='{{name=@{character_name}}} {{skill_name=Spellcasting}} {{skill_rank=@{Spellcasting}}} {{skill_rank_mod=@{SpellcastingMod}}} {{skill_mod=@{SpellcastingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Spellcasting}![Spellcasting] + @{SpellcastingMod}[Spellcasting Rank Modifier] + @{SpellcastingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{SpellcastingMod}[Spellcasting Rank Modifier] + @{SpellcastingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div> 
 							</div> 
 							<!-- End Spellcasting -->
@@ -1876,8 +1993,11 @@
 									<input type="checkbox" name="attr_StealthEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_StealthRoll' title="@{StealthRoll}" value='/em @{character_name} attempts to be stealthy and rolls [[{1d@{Stealth}![Stealth], 1d@{wilddie}![Wild Die]}kh1 + @{StealthMod}[Stealth Rank Modifier] + @{StealthskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{StealthEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmStealthRoll' title="@{gmStealthRoll}" value='/w gm @{character_name} attempts to be stealthy and rolls [[{1d@{Stealth}![Stealth], 1d@{wilddie}![Wild Die]}kh1 + @{StealthMod}[Stealth Rank Modifier] + @{StealthskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{StealthEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollStealth' value='/em @{character_name} attempts to be stealthy and rolls [[{1d@{Stealth}![Stealth], 1d@{wilddie}![Wild Die]}kh1 + @{StealthMod}[Stealth Rank Modifier] + @{StealthskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{StealthEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tStealthRoll' title="@{tStealthRoll}" value='@{skillrt} @{rolltStealth}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmStealthRoll' title="@{tgmStealthRoll}" value='/w gm @{skillrt} @{rolltStealth}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_StealthRoll' title="@{StealthRoll}" value='/em @{character_name} attempts to be stealthy and rolls @{rollStealth}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmStealthRoll' title="@{gmStealthRoll}" value='/w gm @{character_name} attempts to be stealthy and rolls @{rollStealth}!'></button>
+									<input type='hidden' name='attr_rollStealth' value='[[{1d@{Stealth}![Stealth], 1d@{wilddie}![Wild Die]}kh1 + @{StealthMod}[Stealth Rank Modifier] + @{StealthskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{StealthEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltStealth' value='{{name=@{character_name}}} {{skill_name=Stealth}} {{skill_rank=@{Stealth}}} {{skill_rank_mod=@{StealthMod}}} {{skill_mod=@{StealthskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{StealthEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Stealth}![Stealth] + @{StealthMod}[Stealth Rank Modifier] + @{StealthskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{StealthEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{StealthMod}[Stealth Rank Modifier] + @{StealthskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{StealthEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Stealth (Agility) -->
@@ -1925,8 +2045,11 @@
 									<input type="checkbox" name="attr_StreetwiseEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_StreetwiseRoll' title="@{StreetwiseRoll}" value='/em @{character_name} attempts to be streetwise and rolls [[{1d@{Streetwise}![Streetwise], 1d@{wilddie}![Wild Die]}kh1 + @{StreetwiseMod}[Streetwise Rank Modifier] + @{StreetwiseskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmStreetwiseRoll' title="@{gmStreetwiseRoll}" value='/w gm @{character_name} attempts to be streetwise and rolls [[{1d@{Streetwise}![Streetwise], 1d@{wilddie}![Wild Die]}kh1 + @{StreetwiseMod}[Streetwise Rank Modifier] + @{StreetwiseskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollStreetwise' value='/em @{character_name} attempts to be streetwise and rolls [[{1d@{Streetwise}![Streetwise], 1d@{wilddie}![Wild Die]}kh1 + @{StreetwiseMod}[Streetwise Rank Modifier] + @{StreetwiseskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tStreetwiseRoll' title="@{tStreetwiseRoll}" value='@{skillrt} @{rolltStreetwise}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmStreetwiseRoll' title="@{tgmStreetwiseRoll}" value='/w gm @{skillrt} @{rolltStreetwise}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_StreetwiseRoll' title="@{StreetwiseRoll}" value='/em @{character_name} attempts to be streetwise and rolls @{rollStreetwise}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmStreetwiseRoll' title="@{gmStreetwiseRoll}" value='/w gm @{character_name} attempts to be streetwise and rolls @{rollStreetwise}!'></button>
+									<input type='hidden' name='attr_rollStreetwise' value='[[{1d@{Streetwise}![Streetwise], 1d@{wilddie}![Wild Die]}kh1 + @{StreetwiseMod}[Streetwise Rank Modifier] + @{StreetwiseskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltStreetwise' value='{{name=@{character_name}}} {{skill_name=Streetwise}} {{skill_rank=@{Streetwise}}} {{skill_rank_mod=@{StreetwiseMod}}} {{skill_mod=@{StreetwiseskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Streetwise}![Streetwise] + @{StreetwiseMod}[Streetwise Rank Modifier] + @{StreetwiseskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{StreetwiseMod}[Streetwise Rank Modifier] + @{StreetwiseskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Streetwise -->
@@ -1974,8 +2097,11 @@
 									<input type="checkbox" name="attr_SurvivalEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_SurvivalRoll' title="@{SurvivalRoll}" value='/em @{character_name} attempts to survive and rolls [[{1d@{Survival}![Survival], 1d@{wilddie}![Wild Die]}kh1 + @{SurvivalMod}[Survival Rank Modifier] + @{SurvivalskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmSurvivalRoll' title="@{gmSurvivalRoll}" value='/w gm @{character_name} attempts to survive and rolls [[{1d@{Survival}![Survival], 1d@{wilddie}![Wild Die]}kh1 + @{SurvivalMod}[Survival Rank Modifier] + @{SurvivalskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollSurvival' value='/em @{character_name} attempts to survive and rolls [[{1d@{Survival}![Survival], 1d@{wilddie}![Wild Die]}kh1 + @{SurvivalMod}[Survival Rank Modifier] + @{SurvivalskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tSurvivalRoll' title="@{tSurvivalRoll}" value='@{skillrt} @{rolltSurvival}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSurvivalRoll' title="@{tgmSurvivalRoll}" value='/w gm @{skillrt} @{rolltSurvival}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_SurvivalRoll' title="@{SurvivalRoll}" value='/em @{character_name} attempts to survive and rolls @{rollSurvival}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmSurvivalRoll' title="@{gmSurvivalRoll}" value='/w gm @{character_name} attempts to survive and rolls @{rollSurvival}!'></button>
+									<input type='hidden' name='attr_rollSurvival' value='[[{1d@{Survival}![Survival], 1d@{wilddie}![Wild Die]}kh1 + @{SurvivalMod}[Survival Rank Modifier] + @{SurvivalskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltSurvival' value='{{name=@{character_name}}} {{skill_name=Survival}} {{skill_rank=@{Survival}}} {{skill_rank_mod=@{SurvivalMod}}} {{skill_mod=@{SurvivalskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Survival}![Survival] + @{SurvivalMod}[Survival Rank Modifier] + @{SurvivalskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{SurvivalMod}[Survival Rank Modifier] + @{SurvivalskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Survival -->
@@ -2023,8 +2149,11 @@
 									<input type="checkbox" name="attr_SwimmingEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_SwimmingRoll' title="@{SwimmingRoll}" value='/em @{character_name} attempts to swim and rolls [[{1d@{Swimming}![Swimming], 1d@{wilddie}![Wild Die]}kh1 + @{SwimmingMod}[Swimming Rank Modifier] + @{SwimmingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SwimmingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmSwimmingRoll' title="@{gmSwimmingRoll}" value='/w gm @{character_name} attempts to swim and rolls [[{1d@{Swimming}![Swimming], 1d@{wilddie}![Wild Die]}kh1 + @{SwimmingMod}[Swimming Rank Modifier] + @{SwimmingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SwimmingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollSwimming' value='/em @{character_name} attempts to swim and rolls [[{1d@{Swimming}![Swimming], 1d@{wilddie}![Wild Die]}kh1 + @{SwimmingMod}[Swimming Rank Modifier] + @{SwimmingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SwimmingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tSwimmingRoll' title="@{tSwimmingRoll}" value='@{skillrt} @{rolltSwimming}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSwimmingRoll' title="@{tgmSwimmingRoll}" value='/w gm @{skillrt} @{rolltSwimming}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_SwimmingRoll' title="@{SwimmingRoll}" value='/em @{character_name} attempts to swim and rolls @{rollSwimming}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmSwimmingRoll' title="@{gmSwimmingRoll}" value='/w gm @{character_name} attempts to swim and rolls @{rollSwimming}!'></button>
+									<input type='hidden' name='attr_rollSwimming' value='[[{1d@{Swimming}![Swimming], 1d@{wilddie}![Wild Die]}kh1 + @{SwimmingMod}[Swimming Rank Modifier] + @{SwimmingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SwimmingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltSwimming' value='{{name=@{character_name}}} {{skill_name=Swimming}} {{skill_rank=@{Swimming}}} {{skill_rank_mod=@{SwimmingMod}}} {{skill_mod=@{SwimmingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{SwimmingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Swimming}![Swimming] + @{SwimmingMod}[Swimming Rank Modifier] + @{SwimmingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{SwimmingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{SwimmingMod}[Swimming Rank Modifier] + @{SwimmingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{SwimmingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Swimming (Agility) -->
@@ -2072,8 +2201,11 @@
 									<input type="checkbox" name="attr_TauntEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_TauntRoll' title="@{TauntRoll}" value='/em @{character_name} attempts to taunt and rolls [[{1d@{Taunt}![Taunt], 1d@{wilddie}![Wild Die]}kh1 + @{TauntMod}[Taunt Rank Modifier] + @{TauntskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmTauntRoll' title="@{gmTauntRoll}" value='/w gm @{character_name} attempts to taunt and rolls [[{1d@{Taunt}![Taunt], 1d@{wilddie}![Wild Die]}kh1 + @{TauntMod}[Taunt Rank Modifier] + @{TauntskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollTaunt' value='/em @{character_name} attempts to taunt and rolls [[{1d@{Taunt}![Taunt], 1d@{wilddie}![Wild Die]}kh1 + @{TauntMod}[Taunt Rank Modifier] + @{TauntskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tTauntRoll' title="@{tTauntRoll}" value='@{skillrt} @{rolltTaunt}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmTauntRoll' title="@{tgmTauntRoll}" value='/w gm @{skillrt} @{rolltTaunt}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_TauntRoll' title="@{TauntRoll}" value='/em @{character_name} attempts to taunt and rolls @{rollTaunt}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmTauntRoll' title="@{gmTauntRoll}" value='/w gm @{character_name} attempts to taunt and rolls @{rollTaunt}!'></button>
+									<input type='hidden' name='attr_rollTaunt' value='[[{1d@{Taunt}![Taunt], 1d@{wilddie}![Wild Die]}kh1 + @{TauntMod}[Taunt Rank Modifier] + @{TauntskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltTaunt' value='{{name=@{character_name}}} {{skill_name=Taunt}} {{skill_rank=@{Taunt}}} {{skill_rank_mod=@{TauntMod}}} {{skill_mod=@{TauntskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Taunt}![Taunt] + @{TauntMod}[Taunt Rank Modifier] + @{TauntskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{TauntMod}[Taunt Rank Modifier] + @{TauntskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Taunt -->
@@ -2121,8 +2253,11 @@
 									<input type="checkbox" name="attr_ThrowingEncumbrance" value="1" style="width:20px;" checked disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_ThrowingRoll' title="@{ThrowingRoll}" value='/em @{character_name} attempts to throw and rolls [[{1d@{Throwing}![Throwing], 1d@{wilddie}![Wild Die]}kh1 + @{ThrowingMod}[Throwing Rank Modifier] + @{ThrowingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ThrowingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmThrowingRoll' title="@{gmThrowingRoll}" value='/w gm @{character_name} attempts to throw and rolls [[{1d@{Throwing}![Throwing], 1d@{wilddie}![Wild Die]}kh1 + @{ThrowingMod}[Throwing Rank Modifier] + @{ThrowingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ThrowingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollThrowing' value='/em @{character_name} attempts to throw and rolls [[{1d@{Throwing}![Throwing], 1d@{wilddie}![Wild Die]}kh1 + @{ThrowingMod}[Throwing Rank Modifier] + @{ThrowingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ThrowingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tThrowingRoll' title="@{tThrowingRoll}" value='@{skillrt} @{rolltThrowing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmThrowingRoll' title="@{tgmThrowingRoll}" value='/w gm @{skillrt} @{rolltThrowing}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_ThrowingRoll' title="@{ThrowingRoll}" value='/em @{character_name} attempts to throw and rolls @{rollThrowing}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmThrowingRoll' title="@{gmThrowingRoll}" value='/w gm @{character_name} attempts to throw and rolls @{rollThrowing}!'></button>
+									<input type='hidden' name='attr_rollThrowing' value='[[{1d@{Throwing}![Throwing], 1d@{wilddie}![Wild Die]}kh1 + @{ThrowingMod}[Throwing Rank Modifier] + @{ThrowingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{ThrowingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltThrowing' value='{{name=@{character_name}}} {{skill_name=Throwing}} {{skill_rank=@{Throwing}}} {{skill_rank_mod=@{ThrowingMod}}} {{skill_mod=@{ThrowingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{enc=[[@{ThrowingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{Throwing}![Throwing] + @{ThrowingMod}[Throwing Rank Modifier] + @{ThrowingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{ThrowingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{ThrowingMod}[Throwing Rank Modifier] + @{ThrowingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{ThrowingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 								</div>
 							</div> 
 							<!-- End Throwing (Agility) -->
@@ -2170,8 +2305,11 @@
 									<input type="checkbox" name="attr_TrackingEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_TrackingRoll' title="@{TrackingRoll}" value='/em @{character_name} attempts to track and rolls [[{1d@{Tracking}![Tracking], 1d@{wilddie}![Wild Die]}kh1 + @{TrackingMod}[Tracking Rank Modifier] + @{TrackingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmTrackingRoll'title="@{gmTrackingRoll}"  value='/w gm @{character_name} attempts to track and rolls [[{1d@{Tracking}![Tracking], 1d@{wilddie}![Wild Die]}kh1 + @{TrackingMod}[Tracking Rank Modifier] + @{TrackingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollTracking' value='/em @{character_name} attempts to track and rolls [[{1d@{Tracking}![Tracking], 1d@{wilddie}![Wild Die]}kh1 + @{TrackingMod}[Tracking Rank Modifier] + @{TrackingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tTrackingRoll' title="@{tTrackingRoll}" value='@{skillrt} @{rolltTracking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmTrackingRoll' title="@{tgmTrackingRoll}" value='/w gm @{skillrt} @{rolltTracking}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_TrackingRoll' title="@{TrackingRoll}" value='/em @{character_name} attempts to track and rolls @{rollTracking}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmTrackingRoll'title="@{gmTrackingRoll}"  value='/w gm @{character_name} attempts to track and rolls @{rollTracking}!'></button>
+									<input type='hidden' name='attr_rollTracking' value='[[{1d@{Tracking}![Tracking], 1d@{wilddie}![Wild Die]}kh1 + @{TrackingMod}[Tracking Rank Modifier] + @{TrackingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltTracking' value='{{name=@{character_name}}} {{skill_name=Tracking}} {{skill_rank=@{Tracking}}} {{skill_rank_mod=@{TrackingMod}}} {{skill_mod=@{TrackingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{Tracking}![Tracking] + @{TrackingMod}[Tracking Rank Modifier] + @{TrackingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{TrackingMod}[Tracking Rank Modifier] + @{TrackingskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End Tracking -->
@@ -2231,14 +2369,18 @@
 									<input type="checkbox" name="attr_WeirdScienceEncumbrance" value="1" style="width:20px;" disabled="true" />
 								</div>
 								<div class='sheet-col' style='width:120px;'>
-									<button type='roll' name='roll_WeirdScienceRoll' title="@{WeirdScienceRoll}" value='/em @{character_name} attempts some weird science and rolls [[{1d@{WeirdScience}![WeirdScience], 1d@{wilddie}![Wild Die]}kh1 + @{WeirdScienceMod}[WeirdScience Rank Modifier] + @{WeirdScienceskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmWeirdScienceRoll' title="@{gmWeirdScienceRoll}" value='/w gm @{character_name} attempts some weird science and rolls [[{1d@{WeirdScience}![WeirdScience], 1d@{wilddie}![Wild Die]}kh1 + @{WeirdScienceMod}[WeirdScience Rank Modifier] + @{WeirdScienceskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-									<input type='hidden' name='attr_rollWeirdScience' value='/em @{character_name} attempts some weird science and rolls [[{1d@{WeirdScience}![WeirdScience], 1d@{wilddie}![Wild Die]}kh1 + @{WeirdScienceMod}[WeirdScience Rank Modifier] + @{WeirdScienceskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tWeirdScienceRoll' title="@{tWeirdScienceRoll}" value='@{skillrt} @{rolltWeirdScience}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmWeirdScienceRoll' title="@{tgmWeirdScienceRoll}" value='/w gm @{skillrt} @{rolltWeirdScience}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_WeirdScienceRoll' title="@{WeirdScienceRoll}" value='/em @{character_name} attempts some weird science and rolls @{rollWeirdScience}!'></button><button class="sheet-normalbutton sheet-GM-button" type='roll' name='roll_gmWeirdScienceRoll' title="@{gmWeirdScienceRoll}" value='/w gm @{character_name} attempts some weird science and rolls @{rollWeirdScience}!'></button>
+									<input type='hidden' name='attr_rollWeirdScience' value='[[{1d@{WeirdScience}![WeirdScience], 1d@{wilddie}![Wild Die]}kh1 + @{WeirdScienceMod}[WeirdScience Rank Modifier] + @{WeirdScienceskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltWeirdScience' value='{{name=@{character_name}}} {{skill_name=WeirdScience}} {{skill_rank=@{WeirdScience}}} {{skill_rank_mod=@{WeirdScienceMod}}} {{skill_mod=@{WeirdScienceskillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{WeirdScience}![WeirdScience] + @{WeirdScienceMod}[WeirdScience Rank Modifier] + @{WeirdScienceskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{WeirdScienceMod}[WeirdScience Rank Modifier] + @{WeirdScienceskillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 								</div>
 							</div> 
 							<!-- End WeirdScience -->
 				
 							<!-- End Static Skills -->
 							<!--<input type="checkbox" class="sheet-NewDieType" name="attr_DieTypeConfig" style="width: 15px; display: none;" />-->
+							<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
 							<fieldset class="repeating_skills">
 								<div class='sheet-row sheet-WCSkillsRow'>
 									<div class='sheet-col' style='width:280px;'>
@@ -2289,8 +2431,10 @@
 										<input type="checkbox" name="attr_SkillEncumbrance" value="1" style="width:20px;" />
 									</div>
 									<div class='sheet-col' style='width:90px; margin-left: -1px;'>
-										<button type='roll' name='roll_SkillNameRoll' title="@{repeating_skills_#_SkillNameRoll}" value='/em @{character_name} attempts to do something with @{SkillName} and rolls: [[{1d@{SkillNameRank}![@{SkillName}], 1d@{wilddie}![Wild Die]}kh1 + @{SkillNameMod}[Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SkillEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmSkillNameRoll' title="@{repeating_skills_#_gmSkillNameRoll}" value='/w gm @{character_name} attempts to do something with @{SkillName} and rolls: [[{1d@{SkillNameRank}![@{SkillName}], 1d@{wilddie}![Wild Die]}kh1 + @{SkillNameMod}[Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SkillEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button>
-										<input type='hidden' name='attr_rollSkill' value='/em @{character_name} attempts to do something with @{SkillName} and rolls: [[{1d@{SkillNameRank}![@{SkillName}], 1d@{wilddie}![Wild Die]}kh1 + @{SkillNameMod}[Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SkillEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+										<button class="sheet-templatebutton" type='roll' name='roll_tSkillRoll' title="@{tSkillRoll}" value='@{skillrt} @{rolltSkill}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSkillRoll' title="@{tgmSkillRoll}" value='/w gm @{skillrt} @{rolltSkill}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_SkillNameRoll' title="@{repeating_skills_#_SkillNameRoll}" value='/em @{character_name} attempts to do something with @{SkillName} and rolls: @{rollSkill}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmSkillNameRoll' title="@{repeating_skills_#_gmSkillNameRoll}" value='/w gm @{character_name} attempts to do something with @{SkillName} and rolls: @{rollSkill}!'></button>
+										<input type='hidden' name='attr_rollSkill' value='[[{1d@{SkillNameRank}![@{SkillName}], 1d@{wilddie}![Wild Die]}kh1 + @{SkillNameMod}[Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SkillEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltSkill' value='{{name=@{character_name}}} {{skill_name=@{SkillName}}} {{skill_rank=@{SkillNameRank}}} {{skill_rank_mod=@{SkillNameMod}}} {{skill_mod=@{SkillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{SkillNameRank}![@{SkillName}] + @{SkillNameMod}[@{SkillName} Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{SkillNameMod}[@{SkillName} Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
 									</div>
 								</div>
 							</fieldset>
@@ -2407,6 +2551,7 @@
 								</div>
 							</div>
 							<br />
+							<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" style="display:none;" />
 							<input type="checkbox" class="sheet-useRaiseHB" name="attr_RaiseHBRule" style="width: 15px; display: none;" />
 							<fieldset class="repeating_meleeweapons">
 								<div class='sheet-row sheet-WCSkillsRow' style="width: 790px;">
@@ -2445,7 +2590,10 @@
 									</div>
 									<div class='sheet-col' style='width:354px;'> <!-- Notes (344px) -->
 										<textarea name="attr_meleeWNotes" title="@{repeating_meleeweapons_#_meleeWNotes}" class="sheet-standardtext" style="height:50px; width:268px;"></textarea>
-										<button type='roll' name='roll_WeaponTypeRoll' title="@{repeating_meleeweapons_#_WeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{WeaponType} and rolls: [[1d@{Strength}![Strength]+1d@{DmgType}+@{MDmgMod}[Weapon Damage]+@{dmgmod}[Damage Modifier]+1d@{DmgRaise}[Bonus Damage]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmWeaponTypeRoll' title="@{repeating_meleeweapons_#_gmWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{WeaponType} and rolls: [[1d@{Strength}![Strength]+1d@{DmgType}+@{MDmgMod}[Weapon Damage]+@{dmgmod}[Damage Modifier]+1d@{DmgRaise}[Bonus Damage]]]!'></button>
+										<button class="sheet-templatebutton" type='roll' name='roll_tMeleeWeapon' title="@{repeating_meleeweapons_#_tMeleeWeaponRoll}" value='@{skillwrt} @{rolltMeleeWeapon}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmMeleeWeaponRoll' title="@{repeating_meleeweapons_#_tgmMeleeWeaponRoll}" value='/w gm @{skillwrt} @{rolltMeleeWeapon}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_WeaponTypeRoll' title="@{repeating_meleeweapons_#_WeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{WeaponType} and rolls: @{rollMeleeWeapon}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmWeaponTypeRoll' title="@{repeating_meleeweapons_#_gmWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{WeaponType} and rolls: @{rollMeleeWeapon}!'></button>
+										<input type='hidden' name='attr_rollMeleeWeapon' value="[[1d@{Strength}![Strength]+1d@{DmgType}+@{MDmgMod}[Weapon Damage]+@{dmgmod}[Damage Modifier]+1d@{DmgRaise}[Bonus Damage]]]" />
+										<input type='hidden' name='attr_rolltMeleeWeapon' value="{{name=@{character_name}}} {{weapon=@{WeaponType}}} {{damage_type=Str+d@{DmgType}+@{MDmgMod}}} {{damage=@{rollMeleeWeapon}}} {{raise=@{DmgRaise}}} {{dmgmod=@{dmgmod}}}" />
 									</div>
 								</div>
 							</fieldset>
@@ -2521,6 +2669,7 @@
 								</div>
 							</div>
 							<br />
+							<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" style="display:none;" />
 							<input type="checkbox" class="sheet-useRaiseHB" name="attr_RaiseHBRule" style="width: 15px; display: none;" />
 							<fieldset class="repeating_rangeweapons">
 								<div class='sheet-row sheet-WCSkillsRow' style="width: 790px;">
@@ -2545,23 +2694,26 @@
 									</div>
 									<div class='sheet-useHB' style='width:45px; text-align: center;'> <!-- Bonus Damage (60px)-->
 										<select name="attr_RDmgRaise" title="@{repeating_rangeweapons_#_RDmgRaise}" class="dtype">
-											<option value="1d0">n/a</option>
-											<option value="1d4!">d4</option>
-											<option value="1d6!">d6</option>
-											<option value="1d8!">d8</option>
-											<option value="1d10!">d10</option>
-											<option value="1d12!">d12</option>
+											<option value="0">n/a</option>
+											<option value="4!">d4</option>
+											<option value="6!">d6</option>
+											<option value="8!">d8</option>
+											<option value="10!">d10</option>
+											<option value="12!">d12</option>
 										</select>
 									</div>
 									<div class='sheet-useStandard sheet-col' style='width:45px; text-align: center;'>
-										<input type="checkbox" name="attr_RDmgRaise" title="@{repeating_rangeweapons_#_RDmgRaise}" value="1d6!" />
+										<input type="checkbox" name="attr_RDmgRaise" title="@{repeating_rangeweapons_#_RDmgRaise}" value="6!" />
 									</div>
 									<div class='sheet-col' style='width:55px;'> <!-- Weight (45px)-->
 										<input type="number" name="attr_RWeaponWeight" title="@{repeating_rangeweapons_#_RWeaponWeight}" class="sheet-standardNum" />
 									</div>
 									<div class='sheet-col' style='width:255px;'> <!-- Notes (224px) -->
 										<textarea name="attr_rangeWNotes" class="sheet-standardtext" style="height:50px; width:175px;"></textarea>
-										<button type='roll' name='roll_rWeaponTypeRoll' title="@{repeating_rangeweapons_#_rWeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{RWeaponType} and rolls: [[@{NoDmgDice}@{RDmgType}+@{RDmgMod}[Weapon Damage]+@{dmgmod}[Damage Modifier]+@{RDmgRaise}[Bonus Damage]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmrWeaponTypeRoll' title="@{repeating_rangeweapons_#_gmrWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{RWeaponType} and rolls: [[@{NoDmgDice}@{RDmgType}+@{RDmgMod}[Weapon Damage]+@{dmgmod}[Damage Modifier]+@{RDmgRaise}[Bonus Damage]]]!'></button>
+										<button class="sheet-templatebutton" type='roll' name='roll_tRangeWeapon' title="@{repeating_rangeweapons_#_tRangeWeaponRoll}" value='@{skillwrt} @{rolltRangeWeapon}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRangeWeaponRoll' title="@{repeating_rangeweapons_#_tgmRangeWeaponRoll}" value='/w gm @{skillwrt} @{rolltRangeWeapon}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_rWeaponTypeRoll' title="@{repeating_rangeweapons_#_rWeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{RWeaponType} and rolls: @{rollRangeWeapon}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmrWeaponTypeRoll' title="@{repeating_rangeweapons_#_gmrWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{RWeaponType} and rolls: @{rollRangeWeapon}!'></button>
+										<input type='hidden' name='attr_rollRangeWeapon' value="[[@{NoDmgDice}@{RDmgType}+@{RDmgMod}[Weapon Damage]+@{dmgmod}[Damage Modifier]+1d@{RDmgRaise}[Bonus Damage]]]" />
+										<input type='hidden' name='attr_rolltRangeWeapon' value="{{name=@{character_name}}} {{weapon=@{RWeaponType}}} {{damage_type=@{NoDmgDice}@{RDmgType}+@{RDmgMod}}} {{damage=@{rollRangeWeapon}}} {{raise=@{RDmgRaise}}} {{dmgmod=@{dmgmod}}}" />
 									</div>
 								</div>
 							</fieldset>
@@ -2754,6 +2906,7 @@
 								</div>
 							</div>
 							<span class="sheet-spacer"></span>
+							<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" style="display:none;" />
 							<input type="checkbox" class="sheet-useRaiseHB" name="attr_RaiseHBRule" style="width: 15px; display: none;" />
 							<fieldset class="repeating_dmgspells">
 								<div class='sheet-row sheet-WCSkillsRow' style="width: 790px;">
@@ -2779,20 +2932,23 @@
 									</div>
 									<div class='sheet-useHB' style='width:40px; text-align: center;'> <!-- Bonus Damage (60px)-->
 										<select name="attr_SDmgRaise" title="@{repeating_dmgspells_#_SDmgRaise}" class="dtype">
-											<option value="1d0">n/a</option>
-											<option value="1d4!">d4</option>
-											<option value="1d6!">d6</option>
-											<option value="1d8!">d8</option>
-											<option value="1d10!">d10</option>
-											<option value="1d12!">d12</option>
+											<option value="0">n/a</option>
+											<option value="4!">d4</option>
+											<option value="6!">d6</option>
+											<option value="8!">d8</option>
+											<option value="10!">d10</option>
+											<option value="12!">d12</option>
 										</select>
 									</div>
 									<div class='sheet-useStandard sheet-col' style='width:40px; text-align: center;'>
-										<input type="checkbox" name="attr_SDmgRaise" title="@{repeating_dmgspells_#_SDmgRaise}" value="1d6!" />
+										<input type="checkbox" name="attr_SDmgRaise" title="@{repeating_dmgspells_#_SDmgRaise}" value="6!" />
 									</div>
 									<div class='sheet-col' style='width:370px;'> <!-- Notes (224px) -->
 										<textarea name="attr_DmgSpellNotes" title="@{repeating_dmgspells_#_DmgSpellNotes}" class="sheet-standardtext" style="height:50px; width:280px;"></textarea>
-										<button type='roll' name='roll_SpellRoll' title="@{repeating_dmgspells_#_SpellRoll}" value='/em @{character_name} attempts to do damage with the @{Spell} spell and rolls: [[@{NoSpllDmgDice}@{SDmgType}+@{SDmgMod}+@{dmgmod}[Damage Modifier]+@{SDmgRaise}[Bonus Damage]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmSpellRoll' title="@{repeating_dmgspells_#_gmSpellRoll}" value='/w gm @{character_name} attempts to do damage with the @{Spell} spell and rolls: [[@{NoSpllDmgDice}@{SDmgType}+@{SDmgMod}+@{dmgmod}[Damage Modifier]+@{SDmgRaise}[Bonus Damage]]]!'></button>
+										<button class="sheet-templatebutton" type='roll' name='roll_tSpell' title="@{repeating_dmgspells_#_tSpell}" value='@{skillwrt} @{rolltSpell}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSpellRoll' title="@{repeating_dmgspells_#_tgmSpellRoll}" value='/w gm @{skillwrt} @{rolltSpell}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_SpellRoll' title="@{repeating_dmgspells_#_SpellRoll}" value='/em @{character_name} attempts to do damage with the @{Spell} spell and rolls: @{rollSpell}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmSpellRoll' title="@{repeating_dmgspells_#_gmSpellRoll}" value='/w gm @{character_name} attempts to do damage with the @{Spell} spell and rolls: @{rollSpell}!'></button>
+										<input type='hidden' name='attr_rollSpell' value="[[@{NoSpllDmgDice}@{SDmgType}+@{SDmgMod}+@{dmgmod}[Damage Modifier]+1d@{SDmgRaise}[Bonus Damage]]]" />
+										<input type='hidden' name='attr_rolltSpell' value="{{name=@{character_name}}} {{weapon=@{Spell}}} {{damage_type=@{NoSpllDmgDice}@{SDmgType}+@{SDmgMod}}} {{damage=@{rollSpell}}} {{raise=@{SDmgRaise}}} {{dmgmod=@{dmgmod}}}" />
 									</div>
 								</div>
 							</fieldset>
@@ -2885,6 +3041,32 @@
 						<!-- Notes -->
 						<h3 class="sheet-subsectionHeader">Notes</h3>
 							<textarea name="attr_CharNotes" class="sheet-standardtext" title="@{CharNotes}" style='width:785px;'></textarea>
+						<!-- Advancements -->
+						<input class="sheet-showAdvancements" type="checkbox" name="attr_showAdvancements" style="display: none;" />
+						<div class="sheet-advancements">
+							<h3 class="sheet-subsectionHeader">Advancements Taken</h3>
+								<span class="sheet-spacer"></span>
+								<div class='sheet-row sheet-edge'>
+									<div class='sheet-col' style='width:80px;'>
+										<h3 class="sheet-repeatingHeader" style="font-size: 15px;">XP</h3>
+									</div>
+									<div class='sheet-col' style='width:710px;'>
+										<h3 class="sheet-repeatingHeader">Advancement</h3>
+									</div>
+								</div>
+						
+								<div class='sheet-row sheet-edge'>
+									<br />
+									<fieldset class="repeating_advancement">
+										<div class='sheet-col' style='width:80px;'>
+											<input class="sheet-standard" type="text" name="attr_tookat" title="@{repeating_edges_#_tookat}" style='width:75px;'/>
+										</div>
+										<div class='sheet-col' style="width:710px;">
+											<textarea name='attr_advancement' class="sheet-standardtext" title="@{repeating_edges_#_edgedescription}" style='width:705px; height:17px; border-bottom: solid 1px; background-image: url("http://www.geeksville.us/roll20/semi-trans75.png"); color: black; font-weight: bold;'></textarea>
+										</div>
+									</fieldset>
+								</div>
+						</div>
 					</div><!-- End Journal Tab -->
 				</div><!-- End Player Sheet -->
 
@@ -3197,8 +3379,11 @@
 										<option value="10">d10</option>
 										<option value="12">d12</option>
 									 </select>+<input class="sheet-modifier" style="width: 35px;" type="number" name="attr_magMod" title="@{magMod}" value="0" /><!--&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_magrollMod" title="@{magrollMod}" value="0" />-->
-									<button type='roll' name='roll_mAgilityRoll' title="@{mAgilityRoll}" value='/em @{character_name} attempts to be agile and rolls [[1d@{magility}![Agility]+@{magMod}[Agility Modifier]+ @{mttmod}[Modifiers] + @{encumbrance}[Encumbrance Penalty] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmmAgilityRoll' title="@{gmmAgilityRoll}" value='/w gm @{character_name} attempts to be agile and rolls [[1d@{magility}![Agility]+@{magMod}[Agility Modifier]+ @{mttmod}[Modifiers] + @{encumbrance}[Encumbrance Penalty] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><br />
-									<input type='hidden' name=attr_rollmAgility value='/em @{character_name} attempts to be agile and rolls [[1d@{magility}![Agility]+@{magMod}[Agility Modifier]+ @{mttmod}[Modifiers] + @{encumbrance}[Encumbrance Penalty] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tmAgilityRoll' title="@{tmAgilityRoll}" value='@{skillrt} @{rolltmAgility}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmAgilityRoll' title="@{tmgmAgilityRoll}" value='/w gm @{skillrt} @{rolltmAgility}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_mAgilityRoll' title="@{mAgilityRoll}" value='/em @{character_name} attempts to be agile and rolls @{rollmAgility}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmAgilityRoll' title="@{gmmAgilityRoll}" value='/w gm @{character_name} attempts to be agile and rolls @{rollmAgility}'></button><br />
+									<input type='hidden' name='attr_rollmAgility' value='[[1d@{magility}![Agility]+@{magMod}[Agility Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltmAgility' value='{{name=@{character_name}}} {{skill_name=Agility}} {{skill_rank=@{magility}}} {{att_mod=@{magMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{magility}! + @{magMod} + @{mModSum}[Other Modifiers]]]}}' />
 								<label style='width:60px;'>Smarts:</label>
 									<select name="attr_msmarts" title="@{msmarts}" class="dtype" value="4">
 										<option value="4">d4</option>
@@ -3208,8 +3393,11 @@
 										<option value="12">d12</option>
 									</select>+<input class="sheet-modifier" style="width: 35px;" type="number" name="attr_msmMod" title="@{msmMod}" value="0" /><!--&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_msmrollMod" title="@{msmrollMod}" value="0" />-->
 									 <input type="hidden" name="attr_mfullsmarts" value="d@{msmarts}" />
-									<button type='roll' name='roll_mSmartsRoll' title="@{mSmartsRoll}" value='/em @{character_name} attempts to be smart and rolls [[1d@{msmarts}![Smarts]+@{smMod}[Smarts Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSmartsRoll' title="@{gmmSmartsRoll}" value='/w gm @{character_name} attempts to be smart and rolls [[1d@{msmarts}![Smarts]+@{smMod}[Smarts Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><br />
-									<input type='hidden' name='attr_rollmSmarts' value='/em @{character_name} attempts to be smart and rolls [[1d@{msmarts}![Smarts]+@{msmMod}[Smarts Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tmSmartsRoll' title="@{tmSmartsRoll}" value='@{skillrt} @{rolltmSmarts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmSmartsRoll' title="@{tmgmSmartsRoll}" value='/w gm @{skillrt} @{rolltmSmarts}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_mSmartsRoll' title="@{mSmartsRoll}" value='/em @{character_name} attempts to be smart and rolls @{rollmSmarts}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSmartsRoll' title="@{gmmSmartsRoll}" value='/w gm @{character_name} attempts to be smart and rolls @{rollmSmarts}'></button><br />
+									<input type='hidden' name='attr_rollmSmarts' value='[[1d@{msmarts}![Smarts]+@{msmMod}[Smarts Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltmSmarts' value='{{name=@{character_name}}} {{skill_name=Smarts}} {{skill_rank=@{msmarts}}} {{att_mod=@{msmMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{msmarts}! + @{msmMod} + @{mModSum}[Other Modifiers]]]}}' />
 								<label style='width:60px;'>Spirit:</label>
 									<select name="attr_mspirit" title="@{mspirit}" class="dtype" value="4">
 										<option value="4">d4</option>
@@ -3218,8 +3406,11 @@
 										<option value="10">d10</option>
 										<option value="12">d12</option>
 									 </select>+<input class="sheet-modifier" style="width: 35px;" type="number" name="attr_mspMod" title="@{mspMod}" value="0" /><!--&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_msprollMod" title="@{msprollMod}" value="0" />-->
-									<button type='roll' name='roll_mSpiritRoll' title="@{mSpiritRoll}" value='/em @{character_name} attempts to be spirited and rolls [[1d@{mspirit}![Spirit]+@{mspMod}[Spirit Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSpiritRoll' title="@{gmmSpiritRoll}" value='/w gm @{character_name} attempts to be spirited and rolls [[1d@{mspirit}![Spirit]+@{mspMod}[Spirit Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><br />
-									<input type='hidden' name='attr_rollmSpirit' value='/em @{character_name} attempts to be spirited and rolls [[1d@{mspirit}![Spirit]+@{mspMod}[Spirit Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tmSpiritRoll' title="@{tmSpiritRoll}" value='@{skillrt} @{rolltmSpirit}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmSpiritRoll' title="@{tmgmSpiritRoll}" value='/w gm @{skillrt} @{rolltmSpirit}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_mSpiritRoll' title="@{mSpiritRoll}" value='/em @{character_name} attempts to be spirited and rolls @{rollmSpirit}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSpiritRoll' title="@{gmmSpiritRoll}" value='/w gm @{character_name} attempts to be spirited and rolls @{rollmSpirit}'></button><br />
+									<input type='hidden' name='attr_rollmSpirit' value='[[1d@{mspirit}![Spirit]+@{mspMod}[Spirit Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltmSpirit' value='{{name=@{character_name}}} {{skill_name=Spirit}} {{skill_rank=@{mspirit}}} {{att_mod=@{mspMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mspirit}! + @{mspMod} + @{mModSum}[Other Modifiers]]]}}' />
 								<label style='width:60px;'>Strength:</label>
 									<select name="attr_mstrength" title="@{mstrength}" class="dtype" value="4">
 										<option value="4">d4</option>
@@ -3228,8 +3419,11 @@
 										<option value="10">d10</option>
 										<option value="12">d12</option>
 									 </select>+<input class="sheet-modifier" style="width: 35px;" type="number" name="attr_mstMod" title="@{mstMod}" value="0" /><!--&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_mstrollMod" title="@{mstrollMod}" value="0" />-->
-									<button type='roll' name='roll_mStrengthRoll' title="@{mStrengthRoll}" value='/em @{character_name} attempts to be strong and rolls [[1d@{mstrength}![Strength]+@{mstMod}[Strength Modifier]+ @{mttmod}[Modifiers] +@{mdmgmod}[Damage Modifiers] + (@{encumbrance})[Encumbrance Penalty] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmmStrengthRoll' title="@{gmmStrengthRoll}" value='/w gm @{character_name} attempts to be strong and rolls [[1d@{mstrength}![Strength]+@{mstMod}[Strength Modifier]+ @{mttmod}[Modifiers] +@{mdmgmod}[Damage Modifiers] + (@{encumbrance})[Encumbrance Penalty] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><br />
-									<input type='hidden' name='attr_rollmStrength' value='/em @{character_name} attempts to be strong and rolls [[1d@{mstrength}![Strength]+@{mstMod}[Strength Modifier]+ @{mttmod}[Modifiers] +@{mdmgmod}[Damage Modifiers] + @{encumbrance}[Encumbrance Penalty] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tmStrengthRoll' title="@{tmStrengthRoll}" value='@{skillrt} @{rolltmStrength}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmStrengthRoll' title="@{tmgmStrengthRoll}" value='/w gm @{skillrt} @{rolltmStrength}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_mStrengthRoll' title="@{mStrengthRoll}" value='/em @{character_name} attempts to be strong and rolls @{rollmStrength}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmStrengthRoll' title="@{gmmStrengthRoll}" value='/w gm @{character_name} attempts to be strong and rolls @{rollmStrength}'></button><br />
+									<input type='hidden' name='attr_rollmStrength' value='[[1d@{mstrength}![Strength]+@{mstMod}[Strength Modifier]+ @{mttmod}[Modifiers] +@{mdmgmod}[Damage Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltmStrength' value='{{name=@{character_name}}} {{skill_name=Strength}} {{skill_rank=@{mstrength}}} {{att_mod=@{mstMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mstrength}! + @{mstMod} + @{mModSum}[Other Modifiers]]]}}' />
 								<label style='width:60px;'>Vigor:</label>
 									<select name="attr_mvigor" title="@{mvigor}" class="dtype" value="4">
 										<option value="4">d4</option>
@@ -3238,8 +3432,11 @@
 										<option value="10">d10</option>
 										<option value="12">d12</option>
 									 </select>+<input class="sheet-modifier" style="width: 35px;" type="number" name="attr_mviMod" title="@{mviMod}" value="0" /><!--&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="attr_mvirollMod" title="@{mvirollMod}" value="0" />-->
-									<button type='roll' name='roll_mVigorRoll' title="@{mVigorRoll}" value='/em @{character_name} attempts to be healthy and rolls [[1d@{mvigor}![Vigor]+@{mviMod}[Vigor Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><button type='roll' class="sheet-GM-button" name='roll_gmmVigorRoll' title="@{gmmVigorRoll}" value='/w gm @{character_name} attempts to be healthy and rolls [[1d@{mvigor}![Vigor]+@{mviMod}[Vigor Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]'></button><br />
-									<input type='hidden' name='attr_rollmVigor' value='/em @{character_name} attempts to be healthy and rolls [[1d@{mvigor}![Vigor]+@{mviMod}[Vigor Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+									<button class="sheet-templatebutton" type='roll' name='roll_tmVigorRoll' title="@{tmVigorRoll}" value='@{skillrt} @{rolltmVigor}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmVigorRoll' title="@{tmgmVigorRoll}" value='/w gm @{skillrt} @{rolltmVigor}'></button>
+									<button class="sheet-normalbutton" type='roll' name='roll_mVigorRoll' title="@{mVigorRoll}" value='/em @{character_name} attempts to be healthy and rolls @{rollmVigor}'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmVigorRoll' title="@{gmmVigorRoll}" value='/w gm @{character_name} attempts to be healthy and rolls @{rollmVigor}'></button><br />
+									<input type='hidden' name='attr_rollmVigor' value='[[1d@{mvigor}![Vigor]+@{mviMod}[Vigor Modifier]+ @{mttmod}[Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+									<input type='hidden' name='attr_rolltmVigor' value='{{name=@{character_name}}} {{skill_name=Vigor}} {{skill_rank=@{mvigor}}} {{att_mod=@{mviMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mvigor}! + @{mviMod} + @{mModSum}[Other Modifiers]]]}}' />
 							</div> <!-- End Attributes Column -->
 							<div class='sheet-col' style='width:560px;'>
 								<input type='checkbox' name='attr_mHindranceFormula'class='arrow' style='width:15px;' checked='checked'/> Hide Edges & Hindrances
@@ -3280,8 +3477,11 @@
 									</div>
 									<div class='sheet-col' style='width:70px;'>
 										<br />
-										<button type='roll' name='roll_mUnskilledRoll' title="@{mUnskilledRoll}" value='/em @{character_name} attempts to not suck and rolls: [[1d@{Unskilled}![Unskilled] -2[Unskilled Penalty] + @{mUnskilledMod}[Other Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmUnskilledRoll' title="@{gmmUnskilledRoll}" value='/w gm @{character_name} attempts to not suck and rolls: [[1d@{Unskilled}![Unskilled] -2[Unskilled Penalty] + @{mUnskilledMod}[Other Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-										<input type='hidden' name='attr_rollmUnskilled' value='/em @{character_name} attempts to not suck and rolls: [[1d@{Unskilled}![Unskilled] -2[Unskilled Penalty] + @{mUnskilledMod}[Other Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tmUnskilledRoll' title="@{tmUnskilledRoll}" value='@{skillrt} @{rolltmUnskilled}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmUnskilledRoll' title="@{tgmmUnskilledRoll}" value='/w gm @{skillrt} @{rolltmUnskilled}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_mUnskilledRoll' title="@{mUnskilledRoll}" value='/em @{character_name} attempts to not suck and rolls: @{rollmUnskilled}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmUnskilledRoll' title="@{gmmUnskilledRoll}" value='/w gm @{character_name} attempts to not suck and rolls: @{rollmUnskilled}!'></button>
+										<input type='hidden' name='attr_rollmUnskilled' value='[[1d@{Unskilled}![Unskilled] -2[Unskilled Penalty] + @{mUnskilledMod}[Other Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+										<input type='hidden' name='attr_rolltmUnskilled' value='{{name=@{character_name}}} {{skill_name=Unskilled}} {{skill_rank=@{mUnskilled}}} {{skill_rank_mod=-2}} {{skill_mod=@{mUnskilledMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mUnskilled}![Unskilled] -2[Unskilled Penalty] + @{mUnskilledMod} + @{mModSum}[Modifiers]]]}}' />
 									</div>
 								</div>
 								<!-- Break -->
@@ -3298,8 +3498,11 @@
 										</select>+<input class="sheet-modifier" style='width: 35px;' type="number" name="attr_mFightingMod" title="@{mFightingMod}" value="0" />
 									</div>
 									<div class='sheet-col' style='width:70px;'>
-										<button type='roll' name='roll_mFightingRoll' title="@{mFightingRoll}" value='/em @{character_name} attempts to hit something and rolls [[1d@{mfighting}![Fighting] + @{mFightingMod}[Fighting Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmFightingRoll' title="@{gmFightingRoll}" value='/w gm @{character_name} attempts to hit something and rolls [[1d@{mfighting}![Fighting] + @{mFightingMod}[Fighting Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-										<input type='hidden' name='attr_rollmFighting' value='/em @{character_name} attempts to hit something and rolls [[1d@{mfighting}![Fighting] + @{mFightingMod}[Fighting Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+										<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+										<button class="sheet-templatebutton" type='roll' name='roll_tmFightingRoll' title="@{tmFightingRoll}" value='@{skillrt} @{rolltmFighting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmFightingRoll' title="@{tgmmFightingRoll}" value='/w gm @{skillrt} @{rolltmFighting}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_mFightingRoll' title="@{mFightingRoll}" value='/em @{character_name} attempts to hit something and rolls @{rollmFighting}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmFightingRoll' title="@{gmFightingRoll}" value='/w gm @{character_name} attempts to hit something and rolls @{rollmFighting}!'></button>
+										<input type='hidden' name='attr_rollmFighting' value='[[1d@{mfighting}![Fighting] + @{mFightingMod}[Fighting Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+										<input type='hidden' name='attr_rolltmFighting' value='{{name=@{character_name}}} {{skill_name=Fighting}} {{skill_rank=@{mfighting}}} {{skill_mod=@{mFightingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mfighting}! + @{mFightingMod} + @{mModSum}[Other Modifiers]]]}}' />
 									</div>
 									<!-- Static Skills -->
 									<!-- Boating -->
@@ -3316,8 +3519,11 @@
 											</select>+<input type="number" name="attr_mBoatingMod" title="@{mBoatingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mBoatingRoll' title="@{mBoatingRoll}" value='/em @{character_name} attempts to boat and rolls [[(1d@{mboating}![Boating] + @{mBoatingMod}[Boating Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmBoatingRoll' title="@{gmmBoatingRoll}" value='/w gm @{character_name} attempts to boat and rolls [[(1d@{mboating}![Boating] + @{mBoatingMod}[Boating Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmBoating' value='/em @{character_name} attempts to boat and rolls [[(1d@{mboating}![Boating] + @{mBoatingMod}[Boating Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmBoatingRoll' title="@{tmBoatingRoll}" value='@{skillrt} @{rolltmBoating}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmBoatingRoll' title="@{tgmmBoatingRoll}" value='/w gm @{skillrt} @{rolltmBoating}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mBoatingRoll' title="@{mBoatingRoll}" value='/em @{character_name} attempts to boat and rolls @{rollmBoating}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmBoatingRoll' title="@{gmmBoatingRoll}" value='/w gm @{character_name} attempts to boat and rolls @{rollmBoating}!'></button>
+											<input type='hidden' name='attr_rollmBoating' value='[[(1d@{mboating}![Boating] + @{mBoatingMod}[Boating Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmBoating' value='{{name=@{character_name}}} {{skill_name=Boating}} {{skill_rank=@{mboating}}} {{skill_mod=@{mBoatingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mboating}! + @{magMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> <!-- End Boating -->
 				
@@ -3335,8 +3541,11 @@
 											</select>+<input type="number" name="attr_mClimbingMod" title="@{mClimbingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mClimbingRoll' title="@{mClimbingRoll}" value='/em @{character_name} attempts to climb and rolls [[(1d@{mClimbing}![Climbing] + @{mClimbingMod}[Climbing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{fatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmClimbingRoll' title="@{gmmClimbingRoll}" value='/w gm @{character_name} attempts to climb and rolls [[(1d@{mClimbing}![Climbing] + @{mClimbingMod}[Climbing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmClimbing' value='/em @{character_name} attempts to climb and rolls [[(1d@{mClimbing}![Climbing] + @{mClimbingMod}[Climbing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{fatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmClimbingRoll' title="@{tmClimbingRoll}" value='@{skillrt} @{rolltmClimbing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmClimbingRoll' title="@{tgmmClimbingRoll}" value='/w gm @{skillrt} @{rolltmClimbing}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mClimbingRoll' title="@{mClimbingRoll}" value='/em @{character_name} attempts to climb and rolls @{rollmClimbing}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmClimbingRoll' title="@{gmmClimbingRoll}" value='/w gm @{character_name} attempts to climb and rolls @{rollmClimbing}!'></button>
+											<input type='hidden' name='attr_rollmClimbing' value='[[(1d@{mClimbing}![Climbing] + @{mClimbingMod}[Climbing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmClimbing' value='{{name=@{character_name}}} {{skill_name=Climbing}} {{skill_rank=@{mClimbing}}} {{skill_mod=@{mClimbingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mClimbing}! + @{mClimbingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div>
 									<!-- End Climbing -->
@@ -3355,8 +3564,11 @@
 											</select>+<input type="number" name="attr_mDrivingMod" title="@{mDrivingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mDrivingRoll' title="@{mDrivingRoll}" value='/em @{character_name} attempts to drive and rolls [[(1d@{mDriving}![Driving] + @{mDrivingMod}[Driving Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmDrivingRoll' title="@{gmmDrivingRoll}" value='/w gm @{character_name} attempts to drive and rolls [[(1d@{mDriving}![Driving] + @{mDrivingMod}[Driving Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmDriving' value='/em @{character_name} attempts to drive and rolls [[(1d@{mDriving}![Driving] + @{mDrivingMod}[Driving Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmDrivingRoll' title="@{tmDrivingRoll}" value='@{skillrt} @{rolltmDriving}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmDrivingRoll' title="@{tgmmDrivingRoll}" value='/w gm @{skillrt} @{rolltmDriving}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mDrivingRoll' title="@{mDrivingRoll}" value='/em @{character_name} attempts to drive and rolls @{rollmDriving}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmDrivingRoll' title="@{gmmDrivingRoll}" value='/w gm @{character_name} attempts to drive and rolls @{rollmDriving}!'></button>
+											<input type='hidden' name='attr_rollmDriving' value='[[(1d@{mDriving}![Driving] + @{mDrivingMod}[Driving Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmDriving' value='{{name=@{character_name}}} {{skill_name=Driving}} {{skill_rank=@{mDriving}}} {{skill_mod=@{mDrivingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mDriving}! + @{mDrivingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Driving (Agility) -->
@@ -3375,8 +3587,11 @@
 											</select>+<input type="number" name="attr_mFaithMod" title="@{mFaithMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mFaithRoll' title="@{mFaithRoll}" value='/em @{character_name} attempts to be faithful and rolls [[(1d@{mFaith}![Faith] + @{mFaithMod}[Faith Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmFaithRoll' title="@{gmmFaithRoll}" value='/w gm @{character_name} attempts to be faithful and rolls [[(1d@{mFaith}![Faith] + @{mFaithMod}[Faith Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmFaith' value='/em @{character_name} attempts to be faithful and rolls [[(1d@{mFaith}![Faith] + @{mFaithMod}[Faith Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmFaithRoll' title="@{tmFaithRoll}" value='@{skillrt} @{rolltmFaith}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmFaithRoll' title="@{tgmmFaithRoll}" value='/w gm @{skillrt} @{rolltmFaith}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mFaithRoll' title="@{mFaithRoll}" value='/em @{character_name} attempts to be faithful and rolls @{rollmFaith}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmFaithRoll' title="@{gmmFaithRoll}" value='/w gm @{character_name} attempts to be faithful and rolls @{rollmFaith}!'></button>
+											<input type='hidden' name='attr_rollmFaith' value='[[(1d@{mFaith}![Faith] + @{mFaithMod}[Faith Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmFaith' value='{{name=@{character_name}}} {{skill_name=Faith}} {{skill_rank=@{mFaith}}} {{skill_mod=@{mFaithMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mFaith}! + @{mFaithMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Faith (Agility) -->
@@ -3395,8 +3610,11 @@
 											</select>+<input type="number" name="attr_mGamblingMod" title="@{mGamblingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mGamblingRoll' title="@{mGamblingRoll}" value='/em @{character_name} attempts to gamble and rolls [[(1d@{mGambling}![Gambling] + @{mGamblingMod}[Gambling Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmGamblingRoll' title="@{gmmGamblingRoll}" value='/w gm @{character_name} attempts to gamble and rolls [[(1d@{mGambling}![Gambling] + @{mGamblingMod}[Gambling Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmGambling' value='/em @{character_name} attempts to gamble and rolls [[(1d@{mGambling}![Gambling] + @{mGamblingMod}[Gambling Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmGamblingRoll' title="@{tmGamblingRoll}" value='@{skillrt} @{rolltmGambling}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmGamblingRoll' title="@{tgmmGamblingRoll}" value='/w gm @{skillrt} @{rolltmGambling}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mGamblingRoll' title="@{mGamblingRoll}" value='/em @{character_name} attempts to gamble and rolls @{rollmGambling}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmGamblingRoll' title="@{gmmGamblingRoll}" value='/w gm @{character_name} attempts to gamble and rolls @{rollmGambling}!'></button>
+											<input type='hidden' name='attr_rollmGambling' value='[[(1d@{mGambling}![Gambling] + @{mGamblingMod}[Gambling Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmGambling' value='{{name=@{character_name}}} {{skill_name=Gambling}} {{skill_rank=@{mGambling}}} {{skill_mod=@{mGamblingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mGambling}! + @{mGamblingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Gambling -->
@@ -3415,8 +3633,11 @@
 											</select>+<input type="number" name="attr_mGutsMod" title="@{mGutsMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mGutsRoll' title="@{mGutsRoll}" value='/em @{character_name} attempts to be gutsy and rolls [[(1d@{mGuts}![Guts] + @{mGutsMod}[Guts Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmGutsRoll' title="@{gmmGutsRoll}" value='/w gm @{character_name} attempts to be gutsy and rolls [[(1d@{mGuts}![Guts] + @{mGutsMod}[Guts Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmGuts' value='/em @{character_name} attempts to be gutsy and rolls [[(1d@{mGuts}![Guts] + @{mGutsMod}[Guts Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmGutsRoll' title="@{tmGutsRoll}" value='@{skillrt} @{rolltmGuts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmGutsRoll' title="@{tgmmGutsRoll}" value='/w gm @{skillrt} @{rolltmGuts}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mGutsRoll' title="@{mGutsRoll}" value='/em @{character_name} attempts to be gutsy and rolls @{rollmGuts}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmGutsRoll' title="@{gmmGutsRoll}" value='/w gm @{character_name} attempts to be gutsy and rolls @{rollmGuts}!'></button>
+											<input type='hidden' name='attr_rollmGuts' value='[[(1d@{mGuts}![Guts] + @{mGutsMod}[Guts Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmGuts' value='{{name=@{character_name}}} {{skill_name=Guts}} {{skill_rank=@{mGuts}}} {{skill_mod=@{mGutsMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mGuts}! + @{mGutsMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Guts (Agility) -->
@@ -3435,8 +3656,11 @@
 											</select>+<input type="number" name="attr_mHealingMod" title="@{mHealingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mHealingRoll' title="@{mHealingRoll}" value='/em @{character_name} attempts to heal and rolls [[(1d@{mHealing}![Healing] + @{mHealingMod}[Healing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmHealingRoll' title="@{gmmHealingRoll}" value='/w gm @{character_name} attempts to heal and rolls [[(1d@{mHealing}![Healing] + @{mHealingMod}[Healing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmHealing' value='/em @{character_name} attempts to heal and rolls [[(1d@{mHealing}![Healing] + @{mHealingMod}[Healing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmHealingRoll' title="@{tmHealingRoll}" value='@{skillrt} @{rolltmHealing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmHealingRoll' title="@{tgmmHealingRoll}" value='/w gm @{skillrt} @{rolltmHealing}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mHealingRoll' title="@{mHealingRoll}" value='/em @{character_name} attempts to heal and rolls @{rollmHealing}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmHealingRoll' title="@{gmmHealingRoll}" value='/w gm @{character_name} attempts to heal and rolls @{rollmHealing}]!'></button>
+											<input type='hidden' name='attr_rollmHealing' value='[[(1d@{mHealing}![Healing] + @{mHealingMod}[Healing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmHealing' value='{{name=@{character_name}}} {{skill_name=Healing}} {{skill_rank=@{mHealing}}} {{skill_mod=@{mHealingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mHealing}! + @{mHealingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Healing -->
@@ -3455,8 +3679,11 @@
 											</select>+<input type="number" name="attr_mIntimidationMod" title="@{mIntimidationMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mIntimidationRoll' title="@{mIntimidationRoll}" value='/em @{character_name} attempts to intimidate and rolls [[(1d@{mIntimidation}![Intimidation] + @{mIntimidationMod}[Intimidation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmIntimidationRoll' title="@{gmmIntimidationRoll}" value='/w gm @{character_name} attempts to intimidate and rolls [[(1d@{mIntimidation}![Intimidation] + @{mIntimidationMod}[Intimidation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmIntimidation' value='/em @{character_name} attempts to intimidate and rolls [[(1d@{mIntimidation}![Intimidation] + @{mIntimidationMod}[Intimidation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmIntimidationRoll' title="@{tmIntimidationRoll}" value='@{skillrt} @{rolltmIntimidation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmIntimidationRoll' title="@{tgmmIntimidationRoll}" value='/w gm @{skillrt} @{rolltmIntimidation}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mIntimidationRoll' title="@{mIntimidationRoll}" value='/em @{character_name} attempts to intimidate and rolls @{rollmIntimidation}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmIntimidationRoll' title="@{gmmIntimidationRoll}" value='/w gm @{character_name} attempts to intimidate and rolls @{rollmIntimidation}!'></button>
+											<input type='hidden' name='attr_rollmIntimidation' value='[[(1d@{mIntimidation}![Intimidation] + @{mIntimidationMod}[Intimidation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmIntimidation' value='{{name=@{character_name}}} {{skill_name=Intimidation}} {{skill_rank=@{mIntimidation}}} {{skill_mod=@{mIntimidationMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mIntimidation}! + @{mIntimidationMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Intimidation -->
@@ -3475,8 +3702,11 @@
 											</select>+<input type="number" name="attr_mInvestigationMod" title="@{mInvestigationMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mInvestigationRoll' title="@{mInvestigationRoll}" value='/em @{character_name} attempts to investigate and rolls [[(1d@{mInvestigation}![Investigation] + @{mInvestigationMod}[Investigation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmInvestigationRoll' title="@{gmmInvestigationRoll}" value='/w gm @{character_name} attempts to investigate and rolls [[(1d@{mInvestigation}![Investigation] + @{mInvestigationMod}[Investigation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmInvestigation' value='/em @{character_name} attempts to investigate and rolls [[(1d@{mInvestigation}![Investigation] + @{mInvestigationMod}[Investigation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmInvestigationRoll' title="@{tmInvestigationRoll}" value='@{skillrt} @{rolltmInvestigation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmInvestigationRoll' title="@{tgmmInvestigationRoll}" value='/w gm @{skillrt} @{rolltmInvestigation}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mInvestigationRoll' title="@{mInvestigationRoll}" value='/em @{character_name} attempts to investigate and rolls @{rollmInvestigation}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmInvestigationRoll' title="@{gmmInvestigationRoll}" value='/w gm @{character_name} attempts to investigate and rolls @{rollmInvestigation}!'></button>
+											<input type='hidden' name='attr_rollmInvestigation' value='[[(1d@{mInvestigation}![Investigation] + @{mInvestigationMod}[Investigation Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmInvestigation' value='{{name=@{character_name}}} {{skill_name=Investigation}} {{skill_rank=@{mInvestigation}}} {{skill_mod=@{mInvestigationMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mInvestigation}! + @{mInvestigationMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Investigation -->
@@ -3495,8 +3725,11 @@
 											</select>+<input type="number" name="attr_mLockpickingMod" title="@{mLockpickingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mLockpickingRoll' title="@{mLockpickingRoll}" value='/em @{character_name} attempts to lockpick and rolls [[(1d@{mLockpicking}![Lockpicking] + @{mLockpickingMod}[Lockpicking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmLockpickingRoll' title="@{gmmLockpickingRoll}" value='/w gm @{character_name} attempts to lockpick and rolls [[(1d@{mLockpicking}![Lockpicking] + @{mLockpickingMod}[Lockpicking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmLockpicking' value='/em @{character_name} attempts to lockpick and rolls [[(1d@{mLockpicking}![Lockpicking] + @{mLockpickingMod}[Lockpicking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmLockpickingRoll' title="@{tmLockpickingRoll}" value='@{skillrt} @{rolltmLockpicking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmLockpickingRoll' title="@{tgmmLockpickingRoll}" value='/w gm @{skillrt} @{rolltmLockpicking}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mLockpickingRoll' title="@{mLockpickingRoll}" value='/em @{character_name} attempts to lockpick and rolls @{rollmLockpicking}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmLockpickingRoll' title="@{gmmLockpickingRoll}" value='/w gm @{character_name} attempts to lockpick and rolls @{rollmLockpicking}!'></button>
+											<input type='hidden' name='attr_rollmLockpicking' value='[[(1d@{mLockpicking}![Lockpicking] + @{mLockpickingMod}[Lockpicking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmLockpicking' value='{{name=@{character_name}}} {{skill_name=Lockpicking}} {{skill_rank=@{mLockpicking}}} {{skill_mod=@{mLockpickingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mLockpicking}! + @{mLockpickingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Lockpicking (Agility) -->
@@ -3515,8 +3748,11 @@
 											</select>+<input type="number" name="attr_mNoticeMod" title="@{mNoticeMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mNoticeRoll' title="@{mNoticeRoll}" value='/em @{character_name} attempts to notice and rolls [[(1d@{mNotice}![Notice] + @{mNoticeMod}[Notice Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmNoticeRoll' title="@{gmmNoticeRoll}" value='/w gm @{character_name} attempts to notice and rolls [[(1d@{mNotice}![Notice] + @{mNoticeMod}[Notice Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmNotice' value='/em @{character_name} attempts to notice and rolls [[(1d@{mNotice}![Notice] + @{mNoticeMod}[Notice Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmNoticeRoll' title="@{tmNoticeRoll}" value='@{skillrt} @{rolltmNotice}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmNoticeRoll' title="@{tgmmNoticeRoll}" value='/w gm @{skillrt} @{rolltmNotice}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mNoticeRoll' title="@{mNoticeRoll}" value='/em @{character_name} attempts to notice and rolls @{rollmNotice}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmNoticeRoll' title="@{gmmNoticeRoll}" value='/w gm @{character_name} attempts to notice and rolls @{rollmNotice}!'></button>
+											<input type='hidden' name='attr_rollmNotice' value='[[(1d@{mNotice}![Notice] + @{mNoticeMod}[Notice Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmNotice' value='{{name=@{character_name}}} {{skill_name=Notice}} {{skill_rank=@{mNotice}}} {{skill_mod=@{mNoticeMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mNotice}! + @{mNoticeMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Notice -->
@@ -3536,8 +3772,11 @@
 								
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mPersuasionRoll' title="@{mPersuasionRoll}" value='/em @{character_name} attempts to persuade and rolls [[(1d@{mPersuasion}![Persuasion] + @{mPersuasionMod}[Persuasion Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmPersuasionRoll' title="@{gmmPersuasionRoll}" value='/w gm @{character_name} attempts to persuade and rolls [[(1d@{mPersuasion}![Persuasion] + @{mPersuasionMod}[Persuasion Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmPersuasion' value='/em @{character_name} attempts to persuade and rolls [[(1d@{mPersuasion}![Persuasion] + @{mPersuasionMod}[Persuasion Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmPersuasionRoll' title="@{tmPersuasionRoll}" value='@{skillrt} @{rolltmPersuasion}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmPersuasionRoll' title="@{tgmmPersuasionRoll}" value='/w gm @{skillrt} @{rolltmPersuasion}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mPersuasionRoll' title="@{mPersuasionRoll}" value='/em @{character_name} attempts to persuade and rolls @{rollmPersuasion}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmPersuasionRoll' title="@{gmmPersuasionRoll}" value='/w gm @{character_name} attempts to persuade and rolls @{rollmPersuasion}!'></button>
+											<input type='hidden' name='attr_rollmPersuasion' value='[[(1d@{mPersuasion}![Persuasion] + @{mPersuasionMod}[Persuasion Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmPersuasion' value='{{name=@{character_name}}} {{skill_name=Persuasion}} {{skill_rank=@{mPersuasion}}} {{skill_mod=@{mPersuasionMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mPersuasion}! + @{mPersuasionMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Persuasion -->
@@ -3556,8 +3795,11 @@
 											</select>+<input type="number" name="attr_mPilotingMod" title="@{mPilotingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mPilotingRoll' title="@{mPilotingRoll}" value='/em @{character_name} attempts to pilot and rolls [[(1d@{mPiloting}![Piloting] + @{mPilotingMod}[Piloting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmPilotingRoll' title="@{gmmPilotingRoll}" value='/w gm @{character_name} attempts to pilot and rolls [[(1d@{mPiloting}![Piloting] + @{mPilotingMod}[Piloting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmPiloting' value='/em @{character_name} attempts to pilot and rolls [[(1d@{mPiloting}![Piloting] + @{mPilotingMod}[Piloting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmPilotingRoll' title="@{tmPilotingRoll}" value='@{skillrt} @{rolltmPiloting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmPilotingRoll' title="@{tgmmPilotingRoll}" value='/w gm @{skillrt} @{rolltmPiloting}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mPilotingRoll' title="@{mPilotingRoll}" value='/em @{character_name} attempts to pilot and rolls @{rollmPiloting}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmPilotingRoll' title="@{gmmPilotingRoll}" value='/w gm @{character_name} attempts to pilot and rolls @{rollmPiloting}!'></button>
+											<input type='hidden' name='attr_rollmPiloting' value='[[(1d@{mPiloting}![Piloting] + @{mPilotingMod}[Piloting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmPiloting' value='{{name=@{character_name}}} {{skill_name=Piloting}} {{skill_rank=@{mPiloting}}} {{skill_mod=@{mPilotingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mPiloting}! + @{mPilotingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Piloting (Agility) -->
@@ -3576,8 +3818,11 @@
 											</select>+<input type="number" name="attr_mPsionicsMod" title="@{mPsionicsMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mPsionicsRoll' title="@{mPsionicsRoll}" value='/em @{character_name} attempts to use psionics and rolls [[(1d@{mPsionics}![Psionics] + @{mPsionicsMod}[Psionics Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmPsionicsRoll' title="@{gmmPsionicsRoll}" value='/w gm @{character_name} attempts to use psionics and rolls [[(1d@{mPsionics}![Psionics] + @{mPsionicsMod}[Psionics Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmPsionics' value='/em @{character_name} attempts to use psionics and rolls [[(1d@{mPsionics}![Psionics] + @{mPsionicsMod}[Psionics Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmPsionicsRoll' title="@{tmPsionicsRoll}" value='@{skillrt} @{rolltmPsionics}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmPsionicsRoll' title="@{tgmmPsionicsRoll}" value='/w gm @{skillrt} @{rolltmPsionics}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mPsionicsRoll' title="@{mPsionicsRoll}" value='/em @{character_name} attempts to use psionics and rolls @{rollmPsionics}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmPsionicsRoll' title="@{gmmPsionicsRoll}" value='/w gm @{character_name} attempts to use psionics and rolls @{rollmPsionics}!'></button>
+											<input type='hidden' name='attr_rollmPsionics' value='[[(1d@{mPsionics}![Psionics] + @{mPsionicsMod}[Psionics Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmPsionics' value='{{name=@{character_name}}} {{skill_name=Psionics}} {{skill_rank=@{mPsionics}}} {{skill_mod=@{mPsionicsMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mPsionics}! + @{mPsionicsMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Psionics (Agility) -->
@@ -3596,8 +3841,11 @@
 											</select>+<input type="number" name="attr_mRepairMod" title="@{mRepairMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mRepairRoll' title="@{mRepairRoll}" value='/em @{character_name} attempts to repair and rolls [[(1d@{mRepair}![Repair] + @{mRepairMod}[Repair Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmRepairRoll' title="@{gmmRepairRoll}" value='/w gm @{character_name} attempts to repair and rolls [[(1d@{mRepair}![Repair] + @{mRepairMod}[Repair Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmRepair' value='/em @{character_name} attempts to repair and rolls [[(1d@{mRepair}![Repair] + @{mRepairMod}[Repair Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmRepairRoll' title="@{tmRepairRoll}" value='@{skillrt} @{rolltmRepair}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRepairRoll' title="@{tgmmRepairRoll}" value='/w gm @{skillrt} @{rolltmRepair}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mRepairRoll' title="@{mRepairRoll}" value='/em @{character_name} attempts to repair and rolls @{rollmRepair}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmRepairRoll' title="@{gmmRepairRoll}" value='/w gm @{character_name} attempts to repair and rolls @{rollmRepair}!'></button>
+											<input type='hidden' name='attr_rollmRepair' value='[[(1d@{mRepair}![Repair] + @{mRepairMod}[Repair Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmRepair' value='{{name=@{character_name}}} {{skill_name=Repair}} {{skill_rank=@{mRepair}}} {{skill_mod=@{mRepairMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mRepair}! + @{mRepairMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Repair -->
@@ -3616,8 +3864,11 @@
 											</select>+<input type="number" name="attr_mRidingMod" title="@{mRidingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mRidingRoll' title="@{mRidingRoll}" value='/em @{character_name} attempts to ride and rolls [[(1d@{mRiding}![Riding] + @{mRidingMod}[Riding Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmRidingRoll' title="@{gmmRidingRoll}" value='/w gm @{character_name} attempts to ride and rolls [[(1d@{mRiding}![Riding] + @{mRidingMod}[Riding Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmRiding' value='/em @{character_name} attempts to ride and rolls [[(1d@{mRiding}![Riding] + @{mRidingMod}[Riding Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmRidingRoll' title="@{tmRidingRoll}" value='@{skillrt} @{rolltmRiding}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRidingRoll' title="@{tgmmRidingRoll}" value='/w gm @{skillrt} @{rolltmRiding}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mRidingRoll' title="@{mRidingRoll}" value='/em @{character_name} attempts to ride and rolls @{rollmRiding}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmRidingRoll' title="@{gmmRidingRoll}" value='/w gm @{character_name} attempts to ride and rolls @{rollmRiding}!'></button>
+											<input type='hidden' name='attr_rollmRiding' value='[[(1d@{mRiding}![Riding] + @{mRidingMod}[Riding Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmRiding' value='{{name=@{character_name}}} {{skill_name=Riding}} {{skill_rank=@{mRiding}}} {{skill_mod=@{mRidingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mRiding}! + @{mRidingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Riding (Agility) -->
@@ -3636,8 +3887,11 @@
 											</select>+<input type="number" name="attr_mRitualMod" title="@{mRitualMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mRitualRoll' title="@{mRitualRoll}" value='/em @{character_name} attempts to perform a ritual and rolls [[(1d@{mRitual}![Ritual] + @{mRitualMod}[Ritual Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmRitualRoll' title="@{gmmRitualRoll}" value='/w gm @{character_name} attempts to perform a ritual and rolls [[(1d@{mRitual}![Ritual] + @{mRitualMod}[Ritual Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmRitual' value='/em @{character_name} attempts to perform a ritual and rolls [[(1d@{mRitual}![Ritual] + @{mRitualMod}[Ritual Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmRitualRoll' title="@{tmRitualRoll}" value='@{skillrt} @{rolltmRitual}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRitualRoll' title="@{tgmmRitualRoll}" value='/w gm @{skillrt} @{rolltmRitual}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mRitualRoll' title="@{mRitualRoll}" value='/em @{character_name} attempts to perform a ritual and rolls @{rollmRitual}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmRitualRoll' title="@{gmmRitualRoll}" value='/w gm @{character_name} attempts to perform a ritual and rolls @{rollmRitual}!'></button>
+											<input type='hidden' name='attr_rollmRitual' value='[[(1d@{mRitual}![Ritual] + @{mRitualMod}[Ritual Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmRitual' value='{{name=@{character_name}}} {{skill_name=Ritual}} {{skill_rank=@{mRitual}}} {{skill_mod=@{mRitualMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mRitual}! + @{mRitualMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Ritual (Agility) -->
@@ -3656,8 +3910,11 @@
 											</select>+<input type="number" name="attr_mShootingMod" title="@{mShootingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mShootingRoll' title="@{mShootingRoll}" value='/em @{character_name} attempts to shoot and rolls [[(1d@{mShooting}![Shooting] + @{mShootingMod}[Shooting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmShootingRoll' title="@{gmmShootingRoll}" value='/w gm @{character_name} attempts to shoot and rolls [[(1d@{mShooting}![Shooting] + @{mShootingMod}[Shooting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmShooting' value='/em @{character_name} attempts to shoot and rolls [[(1d@{mShooting}![Shooting] + @{mShootingMod}[Shooting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmShootingRoll' title="@{tmShootingRoll}" value='@{skillrt} @{rolltmShooting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmShootingRoll' title="@{tgmmShootingRoll}" value='/w gm @{skillrt} @{rolltmShooting}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mShootingRoll' title="@{mShootingRoll}" value='/em @{character_name} attempts to shoot and rolls @{rollmShooting}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmShootingRoll' title="@{gmmShootingRoll}" value='/w gm @{character_name} attempts to shoot and rolls @{rollmShooting}!'></button>
+											<input type='hidden' name='attr_rollmShooting' value='[[(1d@{mShooting}![Shooting] + @{mShootingMod}[Shooting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmShooting' value='{{name=@{character_name}}} {{skill_name=Shooting}} {{skill_rank=@{mShooting}}} {{skill_mod=@{mShootingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mShooting}! + @{mShootingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Shooting (Agility) -->
@@ -3676,8 +3933,11 @@
 											</select>+<input type="number" name="attr_mSpellcastingMod" title="@{mSpellcastingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mSpellcastingRoll' title="@{mSpellcastingRoll}" value='/em @{character_name} attempts to cast a spell and rolls [[(1d@{mSpellcasting}![Spellcasting] + @{mSpellcastingMod}[Spellcasting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSpellcastingRoll' title="@{gmmSpellcastingRoll}" value='/w gm @{character_name} attempts to cast a spell and rolls [[(1d@{mSpellcasting}![Spellcasting] + @{mSpellcastingMod}[Spellcasting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmSpellcasting' value='/em @{character_name} attempts to cast a spell and rolls [[(1d@{mSpellcasting}![Spellcasting] + @{mSpellcastingMod}[Spellcasting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmSpellcastingRoll' title="@{tmSpellcastingRoll}" value='@{skillrt} @{rolltmSpellcasting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSpellcastingRoll' title="@{tgmmSpellcastingRoll}" value='/w gm @{skillrt} @{rolltmSpellcasting}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mSpellcastingRoll' title="@{mSpellcastingRoll}" value='/em @{character_name} attempts to cast a spell and rolls @{rollmSpellcasting}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSpellcastingRoll' title="@{gmmSpellcastingRoll}" value='/w gm @{character_name} attempts to cast a spell and rolls @{rollmSpellcasting}!'></button>
+											<input type='hidden' name='attr_rollmSpellcasting' value='[[(1d@{mSpellcasting}![Spellcasting] + @{mSpellcastingMod}[Spellcasting Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmSpellcasting' value='{{name=@{character_name}}} {{skill_name=Spellcasting}} {{skill_rank=@{mSpellcasting}}} {{skill_mod=@{mSpellcastingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mSpellcasting}! + @{mSpellcastingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Spellcasting (Agility) -->
@@ -3696,8 +3956,11 @@
 											</select>+<input type="number" name="attr_mStealthMod" title="@{mStealthMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mStealthRoll' title="@{mStealthRoll}" value='/em @{character_name} attempts to be stealthy and rolls [[(1d@{mStealth}![Stealth] + @{mStealthMod}[Stealth Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmStealth' title="@{gmmStealthRoll}" value='/w gm @{character_name} attempts to be stealthy and rolls [[(1d@{mStealth}![Stealth] + @{mStealthMod}[Stealth Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmStealth' value='/em @{character_name} attempts to be stealthy and rolls [[(1d@{mStealth}![Stealth] + @{mStealthMod}[Stealth Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmStealthRoll' title="@{tmStealthRoll}" value='@{skillrt} @{rolltmStealth}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmStealthRoll' title="@{tgmmStealthRoll}" value='/w gm @{skillrt} @{rolltmStealth}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mStealthRoll' title="@{mStealthRoll}" value='/em @{character_name} attempts to be stealthy and rolls @{rollmStealth}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmStealth' title="@{gmmStealthRoll}" value='/w gm @{character_name} attempts to be stealthy and rolls @{rollmStealth}!'></button>
+											<input type='hidden' name='attr_rollmStealth' value='[[(1d@{mStealth}![Stealth] + @{mStealthMod}[Stealth Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmStealth' value='{{name=@{character_name}}} {{skill_name=Stealth}} {{skill_rank=@{mStealth}}} {{skill_mod=@{mStealthMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mStealth}! + @{mStealthMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Stealth (Agility) -->
@@ -3716,8 +3979,11 @@
 											</select>+<input type="number" name="attr_mStreetwiseMod" title="@{mStreetwiseMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mStreetwiseRoll' title="@{mStreetwiseRoll}" value='/em @{character_name} attempts to be streetwise and rolls [[(1d@{mStreetwise}![Streetwise] + @{mStreetwiseMod}[Streetwise Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmStreetwiseRoll' title="@{gmmStreetwiseRoll}" value='/w gm @{character_name} attempts to be streetwise and rolls [[(1d@{mStreetwise}![Streetwise] + @{mStreetwiseMod}[Streetwise Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmStreetwise' value='/em @{character_name} attempts to be streetwise and rolls [[(1d@{mStreetwise}![Streetwise] + @{mStreetwiseMod}[Streetwise Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmStreetwiseRoll' title="@{tmStreetwiseRoll}" value='@{skillrt} @{rolltmStreetwise}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmStreetwiseRoll' title="@{tgmmStreetwiseRoll}" value='/w gm @{skillrt} @{rolltmStreetwise}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mStreetwiseRoll' title="@{mStreetwiseRoll}" value='/em @{character_name} attempts to be streetwise and rolls @{rollmStreetwise}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmStreetwiseRoll' title="@{gmmStreetwiseRoll}" value='/w gm @{character_name} attempts to be streetwise and rolls @{rollmStreetwise}!'></button>
+											<input type='hidden' name='attr_rollmStreetwise' value='[[(1d@{mStreetwise}![Streetwise] + @{mStreetwiseMod}[Streetwise Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmStreetwise' value='{{name=@{character_name}}} {{skill_name=Streetwise}} {{skill_rank=@{mStreetwise}}} {{skill_mod=@{mStreetwiseMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mStreetwise}! + @{mStreetwiseMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Streetwise -->
@@ -3736,8 +4002,11 @@
 											</select>+<input type="number" name="attr_mSurvivalMod" title="@{mSurvivalMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mSurvivalRoll' title="@{mSurvivalRoll}" value='/em @{character_name} attempts to survive and rolls [[(1d@{mSurvival}![Survival] + @{mSurvivalMod}[Survival Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSurvivalRoll' title="@{gmmSurvivalRoll}" value='/w gm @{character_name} attempts to survive and rolls [[(1d@{mSurvival}![Survival] + @{mSurvivalMod}[Survival Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmSurvival' value='/em @{character_name} attempts to survive and rolls [[(1d@{mSurvival}![Survival] + @{mSurvivalMod}[Survival Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmSurvivalRoll' title="@{tmSurvivalRoll}" value='@{skillrt} @{rolltmSurvival}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSurvivalRoll' title="@{tgmmSurvivalRoll}" value='/w gm @{skillrt} @{rolltmSurvival}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mSurvivalRoll' title="@{mSurvivalRoll}" value='/em @{character_name} attempts to survive and rolls @{rollmSurvival}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSurvivalRoll' title="@{gmmSurvivalRoll}" value='/w gm @{character_name} attempts to survive and rolls @{rollmSurvival}!'></button>
+											<input type='hidden' name='attr_rollmSurvival' value='[[(1d@{mSurvival}![Survival] + @{mSurvivalMod}[Survival Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmSurvival' value='{{name=@{character_name}}} {{skill_name=Survival}} {{skill_rank=@{mSurvival}}} {{skill_mod=@{mSurvivalMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mSurvival}! + @{mSurvivalMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Survival -->
@@ -3756,8 +4025,11 @@
 											</select>+<input type="number" name="attr_mSwimmingMod" title="@{mSwimmingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mSwimmingRoll' title="@{mSwimmingRoll}" value='/em @{character_name} attempts to swim and rolls [[(1d@{mSwimming}![Swimming] + @{mSwimmingMod}[Swimming Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSwimmingRoll' title="@{gmmSwimmingRoll}" value='/w gm @{character_name} attempts to swim and rolls [[(1d@{mSwimming}![Swimming] + @{mSwimmingMod}[Swimming Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmSwimming' value='/em @{character_name} attempts to swim and rolls [[(1d@{mSwimming}![Swimming] + @{mSwimmingMod}[Swimming Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmSwimmingRoll' title="@{tmSwimmingRoll}" value='@{skillrt} @{rolltmSwimming}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSwimmingRoll' title="@{tgmmSwimmingRoll}" value='/w gm @{skillrt} @{rolltmSwimming}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mSwimmingRoll' title="@{mSwimmingRoll}" value='/em @{character_name} attempts to swim and rolls @{rollmSwimming}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSwimmingRoll' title="@{gmmSwimmingRoll}" value='/w gm @{character_name} attempts to swim and rolls @{rollmSwimming}!'></button>
+											<input type='hidden' name='attr_rollmSwimming' value='[[(1d@{mSwimming}![Swimming] + @{mSwimmingMod}[Swimming Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmSwimming' value='{{name=@{character_name}}} {{skill_name=Swimming}} {{skill_rank=@{mSwimming}}} {{skill_mod=@{mSwimmingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mSwimming}! + @{mSwimmingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Swimming (Agility) -->
@@ -3776,8 +4048,11 @@
 											</select>+<input type="number" name="attr_mTauntMod" title="@{mTauntMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mTauntRoll' title="@{mTauntRoll}" value='/em @{character_name} attempts to taunt and rolls [[(1d@{mTaunt}![Taunt] + @{mTauntMod}[Taunt Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmTauntRoll' title="@{gmmTauntRoll}" value='/w gm @{character_name} attempts to taunt and rolls [[(1d@{mTaunt}![Taunt] + @{mTauntMod}[Taunt Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmTaunt' value='/em @{character_name} attempts to taunt and rolls [[(1d@{mTaunt}![Taunt] + @{mTauntMod}[Taunt Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmTauntRoll' title="@{tmTauntRoll}" value='@{skillrt} @{rolltmTaunt}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmTauntRoll' title="@{tgmmTauntRoll}" value='/w gm @{skillrt} @{rolltmTaunt}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mTauntRoll' title="@{mTauntRoll}" value='/em @{character_name} attempts to taunt and rolls @{rollmTaunt}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmTauntRoll' title="@{gmmTauntRoll}" value='/w gm @{character_name} attempts to taunt and rolls @{rollmTaunt}!'></button>
+											<input type='hidden' name='attr_rollmTaunt' value='[[(1d@{mTaunt}![Taunt] + @{mTauntMod}[Taunt Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmTaunt' value='{{name=@{character_name}}} {{skill_name=Taunt}} {{skill_rank=@{mTaunt}}} {{skill_mod=@{mTauntMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mTaunt}! + @{mTauntMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Taunt -->
@@ -3796,8 +4071,11 @@
 											</select>+<input type="number" name="attr_mThrowingMod" title="@{mThrowingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mThrowingRoll' title="@{mThrowingRoll}" value='/em @{character_name} attempts to throw and rolls [[(1d@{mThrowing}![Throwing] + @{mThrowingMod}[Throwing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmThrowingRoll' title="@{gmmThrowingRoll}" value='/w gm @{character_name} attempts to throw and rolls [[(1d@{mThrowing}![Throwing] + @{mThrowingMod}[Throwing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmThrowing' value='/em @{character_name} attempts to throw and rolls [[(1d@{mThrowing}![Throwing] + @{mThrowingMod}[Throwing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmThrowingRoll' title="@{tmThrowingRoll}" value='@{skillrt} @{rolltmThrowing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmThrowingRoll' title="@{tgmmThrowingRoll}" value='/w gm @{skillrt} @{rolltmThrowing}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mThrowingRoll' title="@{mThrowingRoll}" value='/em @{character_name} attempts to throw and rolls @{rollmThrowing}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmThrowingRoll' title="@{gmmThrowingRoll}" value='/w gm @{character_name} attempts to throw and rolls @{rollmThrowing}!'></button>
+											<input type='hidden' name='attr_rollmThrowing' value='[[(1d@{mThrowing}![Throwing] + @{mThrowingMod}[Throwing Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmThrowing' value='{{name=@{character_name}}} {{skill_name=Throwing}} {{skill_rank=@{mThrowing}}} {{skill_mod=@{mThrowingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mThrowing}! + @{mThrowingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Throwing (Agility) -->
@@ -3816,8 +4094,11 @@
 											</select>+<input type="number" name="attr_mTrackingMod" title="@{mTrackingMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mTrackingRoll' title="@{mTrackingRoll}" value='/em @{character_name} attempts to track and rolls [[(1d@{mTracking}![Tracking] + @{mTrackingMod}[Tracking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmTrackingRoll' title="@{gmmTrackingRoll}" value='/w gm @{character_name} attempts to track and rolls [[(1d@{mTracking}![Tracking] + @{mTrackingMod}[Tracking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmTracking' value='/em @{character_name} attempts to track and rolls [[(1d@{mTracking}![Tracking] + @{mTrackingMod}[Tracking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmTrackingRoll' title="@{tmTrackingRoll}" value='@{skillrt} @{rolltmTracking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmTrackingRoll' title="@{tgmmTrackingRoll}" value='/w gm @{skillrt} @{rolltmTracking}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mTrackingRoll' title="@{mTrackingRoll}" value='/em @{character_name} attempts to track and rolls @{rollmTracking}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmTrackingRoll' title="@{gmmTrackingRoll}" value='/w gm @{character_name} attempts to track and rolls @{rollmTracking}!'></button>
+											<input type='hidden' name='attr_rollmTracking' value='[[(1d@{mTracking}![Tracking] + @{mTrackingMod}[Tracking Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmTracking' value='{{name=@{character_name}}} {{skill_name=Tracking}} {{skill_rank=@{mTracking}}} {{skill_mod=@{mTrackingMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mTracking}! + @{mTrackingMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End Tracking -->
@@ -3836,13 +4117,17 @@
 											</select>+<input type="number" name="attr_mWeirdScienceMod" title="@{mWeirdScienceMod}" class="sheet-modifier" value="0" style='width:35px;'/>
 										</div>
 										<div class='sheet-col' style='width:70px;'>
-											<button type='roll' name='roll_mWeirdScienceRoll' title="@{mWeirdScienceRoll}" value='/em @{character_name} attempts some Weird Science and rolls [[(1d@{mWeirdScience}![WeirdScience] + @{mWeirdScienceMod}[WeirdScience Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmWeirdScienceRoll' title="@{gmmWeirdScienceRoll}" value='/w gm @{character_name} attempts some Weird Science and rolls [[(1d@{mWeirdScience}![WeirdScience] + @{mWeirdScienceMod}[WeirdScience Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-											<input type='hidden' name='attr_rollmWeirdScience' value='/em @{character_name} attempts some Weird Science and rolls [[(1d@{mWeirdScience}![WeirdScience] + @{mWeirdScienceMod}[WeirdScience Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+											<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
+											<button class="sheet-templatebutton" type='roll' name='roll_tmWeirdScienceRoll' title="@{tmWeirdScienceRoll}" value='@{skillrt} @{rolltmWeirdScience}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmWeirdScienceRoll' title="@{tgmmWeirdScienceRoll}" value='/w gm @{skillrt} @{rolltmWeirdScience}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mWeirdScienceRoll' title="@{mWeirdScienceRoll}" value='/em @{character_name} attempts some Weird Science and rolls @{rollmWeirdScience}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmWeirdScienceRoll' title="@{gmmWeirdScienceRoll}" value='/w gm @{character_name} attempts some Weird Science and rolls @{rollmWeirdScience}!'></button>
+											<input type='hidden' name='attr_rollmWeirdScience' value='[[(1d@{mWeirdScience}![WeirdScience] + @{mWeirdScienceMod}[WeirdScience Modifiers]) + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+											<input type='hidden' name='attr_rolltmWeirdScience' value='{{name=@{character_name}}} {{skill_name=Weird Science}} {{skill_rank=@{mWeirdScience}}} {{skill_mod=@{mWeirdScienceMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mWeirdScience}! + @{mWeirdScienceMod} + @{mModSum}[Other Modifiers]]]}}' />
 										</div>
 									</div> 
 									<!-- End WeirdScience (Agility) -->
 				
 									<!-- End Static Skills -->
+									<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillrt" value="0" style="display:none;" />
 									<fieldset class="repeating_mskills">
 										<div class='sheet-row' style='width: 309px;'>
 											<div class='sheet-col' style='width:185px;'>
@@ -3856,9 +4141,10 @@
 												</select>+<input type="number" name="attr_mSkillNameMod" title="@{repeating_mskills_#_mskillNameMod}" class="sheet-modifier" style='width: 35px;' value="0" />
 											</div>
 											<div class='sheet-col' style='width:70px;'>
-									
-												<button type='roll' name='roll_mSkillNameRoll' title="@{repeating_mskills_#_mskillNameRoll}" value='/em @{character_name} attempts to do something with @{mSkillName} and rolls: [[1d@{mSkillNameRank}![@{mSkillName}] + @{mSkillNameMod}[Skill Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSkillNameRoll' title="@{repeating_mskills_#_gmmskillNameRoll}" value='/w gm @{character_name} attempts to do something with @{mSkillName} and rolls: [[1d@{mSkillNameRank}![@{mSkillName}] + @{mSkillNameMod}[Skill Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!'></button>
-												<input type='hidden' name='attr_rollmSkill' value='/em @{character_name} attempts to do something with @{mSkillName} and rolls: [[1d@{mSkillNameRank}![@{mSkillName}] + @{mSkillNameMod}[Skill Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]!' />
+												<button class="sheet-templatebutton" type='roll' name='roll_tmSkillRoll' title="@{tmSkillRoll}" value='@{skillrt} @{rolltmSkill}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSkillRoll' title="@{tgmmSkillRoll}" value='/w gm @{skillrt} @{rolltmSkill}'></button>
+												<button class="sheet-normalbutton" type='roll' name='roll_mSkillNameRoll' title="@{repeating_mskills_#_mskillNameRoll}" value='/em @{character_name} attempts to do something with @{mSkillName} and rolls: @{rollmSkill}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSkillNameRoll' title="@{repeating_mskills_#_gmmskillNameRoll}" value='/w gm @{character_name} attempts to do something with @{mSkillName} and rolls: @{rollmSkill}!'></button>
+												<input type='hidden' name='attr_rollmSkill' value='[[1d@{mSkillNameRank}![@{mSkillName}] + @{mSkillNameMod}[Skill Modifiers] + @{mttmod}[Situational Modifiers] - @{mwoundsMod}[Wounds] - @{mfatigue}[Fatigue]]]' />
+												<input type='hidden' name='attr_rolltmSkill' value='{{name=@{character_name}}} {{skill_name=@{mSkillName}}} {{skill_rank=@{mSkillNameRank}}} {{skill_mod=@{mSkillNameMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{mSkillNameRank}! + @{mSkillNameMod} + @{mModSum}[Other Modifiers]]]}}' />
 											</div>
 										</div>
 									</fieldset>
@@ -3928,6 +4214,7 @@
 									</div>
 								</div>
 								<br />
+								<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" style="display:none;" />
 								<input type="checkbox" class="sheet-useRaiseHB" name="attr_RaiseHBRule" style="width: 15px; display: none;" />
 								<fieldset class="repeating_mmeleeweapons">
 									<div class='sheet-row' style='width: 460px;'>
@@ -3958,7 +4245,10 @@
 											<input type="checkbox" style="width: 15px;" name="attr_mDmgRaise" title="@{repeating_mmeleeweapons_#_mDmgRaise}" value="6!" />
 										</div>
 										<div class='sheet-col' style='width:70px;'> <!-- Notes (344px) -->
-											<button type='roll' name='roll_mWeaponTypeRoll' title="@{repeating_mmeleeweapons_#_mWeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{mWeaponType} and rolls: [[1d@{mStrength}![Strength]+1d@{mDmgType}+@{mMDmgMod}[Weapon Damage]+@{mdmgmod}[Damage Modifier]+1d@{mDmgRaise}[Bonus Damage]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmWeaponTypeRoll' title="@{repeating_mmeleeweapons_#_gmmWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{mWeaponType} and rolls: [[1d@{mStrength}![Strength]+1d@{mDmgType}+@{mMDmgMod}[Weapon Damage]+@{mdmgmod}[Damage Modifier]+1d@{mDmgRaise}[Bonus Damage]]]!'></button>
+											<button class="sheet-templatebutton" type='roll' name='roll_tmWeaponTypeRoll' title="@{repeating_mmeleeweapons_#_tmWeaponTypeRoll}" value='@{skillwrt} @{rolltmMeleeWeapon}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmWeaponTypeRoll' title="@{repeating_mmeleeweapons_#_tgmmWeaponTypeRoll}" value='/w gm @{skillwrt} @{rolltmMeleeWeapon}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mWeaponTypeRoll' title="@{repeating_mmeleeweapons_#_mWeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{mWeaponType} and rolls: @{rollmMeleeWeapon}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmWeaponTypeRoll' title="@{repeating_mmeleeweapons_#_gmmWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{mWeaponType} and rolls: @{rollmMeleeWeapon}!'></button>
+											<input type='hidden' name='attr_rollmMeleeWeapon' value="[[1d@{mStrength}![Strength]+1d@{mDmgType}+@{mMDmgMod}[Weapon Damage]+@{mdmgmod}[Damage Modifier]+1d@{mDmgRaise}[Bonus Damage]]]" />
+											<input type='hidden' name='attr_rolltmMeleeWeapon' value="{{name=@{character_name}}} {{weapon=@{mWeaponType}}} {{damage_type=Str+d@{mDmgType}+@{mMDmgMod}}} {{damage=@{rollmMeleeWeapon}}} {{raise=@{mDmgRaise}}} {{dmgmod=@{mdmgmod}}}" />
 										</div>
 									</div>
 								</fieldset>
@@ -4007,6 +4297,7 @@
 									</div>
 								</div>
 								<br />
+								<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" style="display:none;" />
 								<input type="checkbox" class="sheet-useRaiseHB" name="attr_RaiseHBRule" style="width: 15px; display: none;" />
 								<fieldset class="repeating_mrangeweapons">
 									<div class='sheet-row'>
@@ -4031,23 +4322,26 @@
 										</div>
 										<div class='sheet-useHB' style='width:50px;'> <!-- Bonus Damage (60px)-->
 											<select name="attr_mRDmgRaise" title="@{repeating_mrangeweapons_#_mRDmgRaise}" class="dtype">
-												<option value="1d0">n/a</option>
-												<option value="1d4!">d4</option>
-												<option value="1d6!">d6</option>
-												<option value="1d8!">d8</option>
-												<option value="1d10!">d10</option>
-												<option value="1d12!">d12</option>
+												<option value="0">n/a</option>
+												<option value="4!">d4</option>
+												<option value="6!">d6</option>
+												<option value="8!">d8</option>
+												<option value="10!">d10</option>
+												<option value="12!">d12</option>
 											</select>
 										</div>
 										<div class="sheet-useStandard sheet-col" style='width:50px; text-align: center;'>
-											<input type="checkbox" name="attr_mRDmgRaise" title="@{repeating_mrangeweapons_#_mRDmgRaise}" value="1d6!" />
+											<input type="checkbox" name="attr_mRDmgRaise" title="@{repeating_mrangeweapons_#_mRDmgRaise}" value="6!" />
 										</div>
 										<div class='sheet-col' style='width:55px;'> <!-- Weight (45px)-->
 											<input type="number" name="attr_mRWeaponWeight" title="@{repeating_mrangeweapons_#_mRWeaponWeight}" class="sheet-short" />
 										</div>
 										<div class='sheet-col' style='width:284px;'> <!-- Notes (224px) -->
 											<textarea name="attr_mrangeWNotes" title="@{repeating_mrangeweapons_#_mrangeWNotes}" class="sheet-smalltextarea" style="height:50px; width:205px;"></textarea>
-											<button type='roll' name='roll_mRWeaponTypeRoll' title="@{repeating_mrangeweapons_#_mRWeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{mRWeaponType} and rolls: [[@{mNoDmgDice}@{mRDmgType}+@{mRDmgMod}[Weapon Damage]+@{mdmgmod}[Damage Modifier]+@{mRDmgRaise}[Bonus Damage]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmRWeaponTypeRoll' title="@{repeating_mrangeweapons_#_mRWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{mRWeaponType} and rolls: [[@{mNoDmgDice}@{mRDmgType}+@{mRDmgMod}[Weapon Damage]+@{mdmgmod}[Damage Modifier]+@{mRDmgRaise}[Bonus Damage]]]!'></button>
+											<button class="sheet-templatebutton" type='roll' name='roll_tmRWeaponTypeRoll' title="@{repeating_mrangeweapons_#_tmRWeaponTypeRoll}" value='@{skillwrt} @{rolltmRangeWeapon}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRWeaponTypeRoll' title="@{repeating_rangeweapons_#_tgmmRWeaponTypeRoll}" value='/w gm @{skillwrt} @{rolltmRangeWeapon}'></button>
+											<button class="sheet-normalbutton" type='roll' name='roll_mRWeaponTypeRoll' title="@{repeating_mrangeweapons_#_mRWeaponTypeRoll}" value='/em @{character_name} attempts to do damage with a @{mRWeaponType} and rolls: @{rollmRangeWeapon}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmRWeaponTypeRoll' title="@{repeating_mrangeweapons_#_mRWeaponTypeRoll}" value='/w gm @{character_name} attempts to do damage with a @{mRWeaponType} and rolls: @{rollmRangeWeapon}!'></button>
+											<input type='hidden' name='attr_rollmRangeWeapon' value="[[@{mNoDmgDice}@{mRDmgType}+@{mRDmgMod}[Weapon Damage]+@{mdmgmod}[Damage Modifier]+1d@{mRDmgRaise}[Bonus Damage]]]" />
+											<input type='hidden' name='attr_rolltmRangeWeapon' value="{{name=@{character_name}}} {{weapon=@{mRWeaponType}}} {{damage_type=@{mNoDmgDice}@{mRDmgType}+@{mRDmgMod}}} {{damage=@{rollmRangeWeapon}}} {{raise=@{mRDmgRaise}}} {{dmgmod=@{mdmgmod}}}" />
 										</div>
 									</div>
 								</fieldset>
@@ -4092,6 +4386,7 @@
 								</div>
 							</div>
 							<br />
+							<input class="sheet-buttonbox" type="checkbox" class="sheet-rt sheet-rt0" name="attr_skillwrt" value="0" style="display:none;" />
 							<input type="checkbox" class="sheet-useRaiseHB" name="attr_RaiseHBRule" style="width: 15px; display: none;" />
 							<fieldset class="repeating_mdmgspells">
 								<div class='sheet-row'>
@@ -4116,20 +4411,23 @@
 									</div>
 									<div class='sheet-useHB' style='width:50px; text-align: center;'> <!-- Bonus Damage (60px)-->
 										<select name="attr_mSDmgRaise" title="@{repeating_mdmgspells_#_mSDmgRaise}" class="dtype">
-											<option value="1d0">n/a</option>
-											<option value="1d4!">d4</option>
-											<option value="1d6!">d6</option>
-											<option value="1d8!">d8</option>
-											<option value="1d10!">d10</option>
-											<option value="1d12!">d12</option>
+											<option value="0">n/a</option>
+											<option value="4!">d4</option>
+											<option value="6!">d6</option>
+											<option value="8!">d8</option>
+											<option value="10!">d10</option>
+											<option value="12!">d12</option>
 										</select>
 									</div>
 									<div class="sheet-useStandard sheet-col" style='width:50px; text-align: center;'>
-											<input type="checkbox" name="attr_mSDmgRaise" title="@{repeating_mdmgspells_#_mSDmgRaise}" value="1d6!" />
+											<input type="checkbox" name="attr_mSDmgRaise" title="@{repeating_mdmgspells_#_mSDmgRaise}" value="6!" />
 										</div>
 									<div class='sheet-col' style='width:370px;'> <!-- Notes (224px) -->
 										<textarea name="attr_mDmgSpellNotes" title="@{repeating_mdmgspells_#_mDmgSpellNotes}" class="sheet-smalltextarea" style="height:50px; width:288px;"></textarea>
-										<button type='roll' name='roll_mSpellRoll' title="@{repeating_mdmgspells_#_mSpellRoll}" value='/em @{character_name} attempts to do damage with the @{mSpell} spell and rolls: [[@{mNoSpllDmgDice}@{mSDmgType}+@{mSDmgMod}+@{dmgmod}[Damage Modifier]+@{mSDmgRaise}[Bonus Damage]]]!'></button><button type='roll' class="sheet-GM-button" name='roll_gmmSpellRoll' title="@{repeating_mdmgspells_#_gmmSpellRoll}" value='/w gm @{character_name} attempts to do damage with the @{mSpell} spell and rolls: [[@{mNoSpllDmgDice}@{mSDmgType}+@{mSDmgMod}+@{dmgmod}[Damage Modifier]+@{mSDmgRaise}[Bonus Damage]]]!'></button>
+										<button class="sheet-templatebutton" type='roll' name='roll_tmSpellRoll' title="@{repeating_mdgmspells_#_tmSpellRoll}" value='@{skillwrt} @{rolltmSpell}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSpelRoll' title="@{repeating_mdmgspells_#_tgmmSpellRoll}" value='/w gm @{skillwrt} @{rolltmSpell}'></button>
+										<button class="sheet-normalbutton" type='roll' name='roll_mSpellRoll' title="@{repeating_mdmgspells_#_mSpellRoll}" value='/em @{character_name} attempts to do damage with the @{mSpell} spell and rolls: @{rollmSpell}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmmSpellRoll' title="@{repeating_mdmgspells_#_gmmSpellRoll}" value='/w gm @{character_name} attempts to do damage with the @{mSpell} spell and rolls: @{rollmSpell}!'></button>
+										<input type='hidden' name='attr_rollmSpell' value="[[@{mNoSpllDmgDice}@{mSDmgType}+@{mSDmgMod}+@{dmgmod}[Damage Modifier]+1d@{mSDmgRaise}[Bonus Damage]]]" />
+										<input type='hidden' name='attr_rolltmSpell' value="{{name=@{character_name}}} {{weapon=@{mSpell}}} {{damage_type=@{mNoSpllDmgDice}@{mSDmgType}+@{mSDmgMod}}} {{damage=@{rollmSpell}}} {{raise=@{mSDmgRaise}}} {{dmgmod=@{mdmgmod}}}" />
 									</div>
 								</div>
 							</fieldset>
@@ -4225,7 +4523,13 @@
 							<td>&nbsp;&nbsp; Skill:</td>
 							<td class="sheet-roll">{{skill_mod}}</td>
 						</tr>
-					{{/skill_mod}}					
+					{{/skill_mod}}
+					{{#other_mods}}
+						<tr>
+							<td>&nbsp;&nbsp; {{other_mods}}</td>
+							<td class="sheet-roll">{{other_mod_vals}}</td>
+						</tr>
+					{{/other_mods}}				
 					{{#ttmod}}
 						<tr>
 							<td>&nbsp;&nbsp; Situational:</td>
@@ -4265,12 +4569,6 @@
 					<tr class="sheet-rth">
 						<th colspan="2">Modifiers Applied</th>
 					</tr>
-					{{#ttmod}}
-						<tr>
-							<td>&nbsp;&nbsp; Situational:</td>
-							<td class="sheet-roll">{{ttmod}}</td>
-						</tr>
-					{{/ttmod}}
 					{{#enc}}
 						<tr>
 							<td>&nbsp;&nbsp; Encumbrance:</td>
@@ -4307,6 +4605,17 @@
 							<td class="sheet-roll">{{other_mod_vals}}</td>
 						</tr>
 					{{/other_mods}}
+					{{#ttmod}}
+						<tr>
+							<td>&nbsp;&nbsp; Situational:</td>
+							<td class="sheet-roll">{{ttmod}}</td>
+						</tr>
+					{{/ttmod}}
+					{{#sit_notes}}
+						<tr>
+							<td colspan="2">&nbsp;&nbsp; <strong>Situational Notes</strong>:{{sit_notes}}</td>
+						</tr>
+					{{/sit_notes}}
 				</tbody>
 			</table>
 		</div>