diff --git a/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html b/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html
index f63f857504..3a40c07be0 100644
--- a/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html
+++ b/SavageWorlds-Tabbed/SW_CharSheet-tabbed.html
@@ -647,7 +647,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: 08 Oct 2016
+					sheet version: 24 Oct 2016
 					<div class='sheet-row'><h2 class='sheet-sectionHeader'>CONFIGURATION</h2></div>
 					API: Initiative Edges <span class="sheet-tooltip">i<span><strong style='line-height: 30px; text-align: center;'>DealInit API Script</strong><br><p>Initiative Edges must be stored in a comma separated list in an Attribute named InitEdges. (e.g. Qu,LH)</p><p>The Edge shorthand is as follows:<br /><ul><li><strong>Qui</strong> = Quick</li><li><strong>LH</strong> = Level Headed</li><li><strong>ILH</strong> = Improved Level Headed</li><li><strong>WCE</strong> = Any Joker Activated Wild Card Edge</li></ul></p></span></span>
 					<input class="sheet-standard" type="text" title="@{InitEdges}" name="attr_InitEdges"/><br />
@@ -1254,7 +1254,7 @@
 										<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>
 										<button class="sheet-templatebutton" type='roll' name='roll_tAgilityRoll' title="@{tAgilityRoll}" value='@{skillrt} @{defsTemplate} @{rolltAgility}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmAgilityRoll' title="@{tgmAgilityRoll}" value='/w gm @{skillrt} @{defsTemplate} @{rolltAgility}'></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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+										<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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;">
@@ -1289,7 +1289,7 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tSmartsRoll' title="@{tSmartsRoll}" value='@{skillrt} @{defsTemplate} @{rolltSmarts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSmartsRoll' title="@{tgmSmartsRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+										<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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;">
@@ -1323,7 +1323,7 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tSpiritRoll' title="@{tSpiritRoll}" value='@{skillrt} @{defsTemplate} @{rolltSpirit}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSpiritRoll' title="@{tgmSpiritRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+										<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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;">
@@ -1357,7 +1357,7 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tStrengthRoll' title="@{tStrengthRoll}" value='@{skillrt} @{defsTemplate} @{rolltStrength}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmStrengthRoll' title="@{tgmStrengthRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+										<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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;">
@@ -1392,7 +1392,7 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tVigorRoll' title="@{tVigorRoll}" value='@{skillrt} @{defsTemplate} @{rolltVigor}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmVigorRoll' title="@{tgmVigorRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+										<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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 -->
@@ -1532,7 +1532,7 @@
 									<input class="sheet-standard" type="text" name="attr_hindrance" title="@{repeating_hindrances_#_hindrance}" style='width:152px;'/>
 								</div>
 								<div class='sheet-col'>
-									<textarea class="sheet-standardtext" style="width: 625px;" name='attr_hindrancedescription' title="@{repeating_hindrances_#_hindrancedescription}" ></textarea>
+									<textarea class="sheet-standardtext" style="width: 625px; height: 50px;" name='attr_hindrancedescription' title="@{repeating_hindrances_#_hindrancedescription}" ></textarea>
 								</div>
 							</fieldset>
 						</div>
@@ -1586,7 +1586,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tUnskilledRoll' title="@{tUnskilledRoll}" value='@{skillrt} @{defsTemplate} @{rolltUnskilled}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmUnskilledRoll' title="@{tgmUnskilledRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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-->
@@ -1701,7 +1701,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tFightingRoll' title="@{tFightingRoll}" value='@{skillrt} @{defsTemplate} @{rolltFighting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmFightingRoll' title="@{tgmFightingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -1745,7 +1745,7 @@
 								<input type="checkbox" class="sheet-useFencingStyle" name="attr_fencinginfo" style="display: none;" />
 								<div class="sheet-FencingStyle">
 									<input type='hidden' name='attr_rollFencing' value='[[{1d@{fighting}![Fighting], 1d@{wilddie}![Wild Die]}kh1 + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] + (@{FightingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
-									<input type='hidden' name='attr_rolltFencing' value='{{name=@{character_name}}} {{skill_name=Fighting}} {{skill_rank=@{fighting}}} {{skill_rank_mod=@{FightingMod}}} {{skill_mod=@{FightingskillMod}}} {{ttmod=@{ttmod}}} {{wounds= [[@{woundsMod}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{enc=[[@{FightingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{fighting}![Fighting] + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
+									<input type='hidden' name='attr_rolltFencing' value='{{name=@{character_name}}} {{skill_name=Fighting}} {{skill_rank=@{fighting}}} {{skill_rank_mod=@{FightingMod}}} {{skill_mod=[[@{FightingskillMod}]]}} {{ttmod=[[@{ttmod}]]}} {{wounds= [[@{woundsMod}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{enc=[[@{FightingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{fighting}![Fighting] + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 									<!--<div class='sheet-col' style='width:280px;'>
 										<div class="sheet-col" style='width:102px;'>
 											&nbsp;
@@ -1757,7 +1757,7 @@
 									</div>
 									<div class='sheet-col' style='width:120px;'>
 										<input type='hidden' name='attr_rollFencing' value='[[{1d@{fighting}![Fighting], 1d@{wilddie}![Wild Die]}kh1 + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] + (@{FightingEncumbrance}*@{encumbrance}[Encumbrance Penalty]) - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
-										<input type='hidden' name='attr_rolltFencing' value='{{name=@{character_name}}} {{skill_name=Fighting}} {{skill_rank=@{fighting}}} {{skill_rank_mod=@{FightingMod}}} {{skill_mod=@{FightingskillMod}}} {{ttmod=@{ttmod}}} {{Fencing Style= +1}} {{wounds= [[@{woundsMod}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{enc=[[@{FightingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{fighting}![Fighting] + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
+										<input type='hidden' name='attr_rolltFencing' value='{{name=@{character_name}}} {{skill_name=Fighting}} {{skill_rank=@{fighting}}} {{skill_rank_mod=@{FightingMod}}} {{skill_mod=[[@{FightingskillMod}]]}} {{ttmod=[[@{ttmod}]]}} {{Fencing Style= +1}} {{wounds= [[@{woundsMod}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{enc=[[@{FightingEncumbrance}*@{encumbrance}]]}} {{skill_roll=[[1d@{fighting}![Fighting] + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + 1[Fencing Style] + @{FightingMod}[Fighting Rank Modifier] + @{FightingskillMod} [Skill Modifier] + @{ModSum}[Modifiers] +(@{FightingEncumbrance}*@{encumbrance})[Encumbrance Penalty]]]}}' />
 										--><!--Roll Button stuff-->
 										<!--<input class="sheet-buttonbox" type="checkbox" name="attr_skillrt" value="0" style="display:none;" />
 										<button class="sheet-templatebutton" type='roll' name='roll_tFencingRoll0' title="@{tFightingSpecRoll0}" value='@{skillrt} @{defsTemplate} {{skill_nameHeader=@{fencingstyle1}}} @{rolltFencing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmFencingRoll' title="@{tgmFightingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{rolltFencing}'></button>
@@ -1833,7 +1833,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tBoatingRoll' title="@{tBoatingRoll}" value='@{skillrt} @{defsTemplate} @{rolltBoating}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmBoatingRoll' title="@{tgmBoatingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -1921,7 +1921,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tClimbingRoll' title="@{tClimbingRoll}" value='@{skillrt} @{defsTemplate} @{rolltClimbing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmClimbingRoll' title="@{tgmClimbingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2010,7 +2010,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tDrivingRoll' title="@{tDrivingRoll}" value='@{skillrt} @{defsTemplate} @{rolltDriving}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmDrivingRoll' title="@{tgmDrivingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2099,7 +2099,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tFaithRoll' title="@{tFaithRoll}" value='@{skillrt} @{defsTemplate} @{rolltFaith}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmFaithRoll' title="@{tgmFaithRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2188,7 +2188,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tGamblingRoll' title="@{tGamblingRoll}" value='@{skillrt} @{defsTemplate} @{rolltGambling}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmGamblingRoll' title="@{tgmGamblingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2277,7 +2277,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tGutsRoll' title="@{tGutsRoll}" value='@{skillrt} @{defsTemplate} @{rolltGuts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmGutsRoll' title="@{tgmGutsRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2365,7 +2365,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tHealingRoll' title="@{tHealingRoll}" value='@{skillrt} @{defsTemplate} @{rolltHealing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmHealingRoll' title="@{tgmHealingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2453,7 +2453,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tIntimidationRoll' title="@{tIntimidationRoll}" value='@{skillrt} @{defsTemplate} @{rolltIntimidation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmIntimidationRoll' title="@{tgmIntimidationRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2541,7 +2541,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tInvestigationRoll' title="@{tInvestigationRoll}" value='@{skillrt} @{defsTemplate} @{rolltInvestigation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmInvestigationRoll' title="@{tgmInvestigationRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2629,7 +2629,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tLockpickingRoll' title="@{tLockpickingRoll}" value='@{skillrt} @{defsTemplate} @{rolltLockpicking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmLockpickingRoll' title="@{tgmLockpickingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2717,7 +2717,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tNoticeRoll' title="@{tNoticeRoll}" value='@{skillrt} @{defsTemplate} @{rolltNotice}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmNoticeRoll' title="@{tgmNoticeRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2805,7 +2805,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tPersuasionRoll' title="@{tPersuasionRoll}" value='@{skillrt} @{defsTemplate} @{rolltPersuasion}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmPersuasionRoll' title="@{tgmPersuasionRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2893,7 +2893,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tPilotingRoll' title="@{tPilotingRoll}" value='@{skillrt} @{defsTemplate} @{rolltPiloting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmPilotingRoll' title="@{tgmPilotingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -2989,7 +2989,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tPsionicsRoll' title="@{tPsionicsRoll}" value='@{skillrt} @{defsTemplate} @{rolltPsionics}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmPsionicsRoll' title="@{tgmPsionicsRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3077,7 +3077,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tRepairRoll' title="@{tRepairRoll}" value='@{skillrt} @{defsTemplate} @{rolltRepair}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRepairRoll' title="@{tgmRepairRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3165,7 +3165,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tRidingRoll' title="@{tRidingRoll}" value='@{skillrt} @{defsTemplate} @{rolltRiding}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRidingRoll' title="@{tgmRidingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3265,7 +3265,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tRitualRoll' title="@{tRitualRoll}" value='@{skillrt} @{defsTemplate} @{rolltRitual}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmRitualRoll' title="@{tgmRitualRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3353,7 +3353,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tShootingRoll' title="@{tShootingRoll}" value='@{skillrt} @{defsTemplate} @{rolltShooting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmShootingRoll' title="@{tgmShootingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3453,7 +3453,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tSpellcastingRoll' title="@{tSpellcastingRoll}" value='@{skillrt} @{defsTemplate} @{rolltSpellcasting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSpellcastingRoll' title="@{tgmSpellcastingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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> 
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3541,7 +3541,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tStealthRoll' title="@{tStealthRoll}" value='@{skillrt} @{defsTemplate} @{rolltStealth}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmStealthRoll' title="@{tgmStealthRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3629,7 +3629,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tStreetwiseRoll' title="@{tStreetwiseRoll}" value='@{skillrt} @{defsTemplate} @{rolltStreetwise}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmStreetwiseRoll' title="@{tgmStreetwiseRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3717,7 +3717,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tSurvivalRoll' title="@{tSurvivalRoll}" value='@{skillrt} @{defsTemplate} @{rolltSurvival}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSurvivalRoll' title="@{tgmSurvivalRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3805,7 +3805,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tSwimmingRoll' title="@{tSwimmingRoll}" value='@{skillrt} @{defsTemplate} @{rolltSwimming}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSwimmingRoll' title="@{tgmSwimmingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3893,7 +3893,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tTauntRoll' title="@{tTauntRoll}" value='@{skillrt} @{defsTemplate} @{rolltTaunt}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmTauntRoll' title="@{tgmTauntRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -3981,7 +3981,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tThrowingRoll' title="@{tThrowingRoll}" value='@{skillrt} @{defsTemplate} @{rolltThrowing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmThrowingRoll' title="@{tgmThrowingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -4069,7 +4069,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tTrackingRoll' title="@{tTrackingRoll}" value='@{skillrt} @{defsTemplate} @{rolltTracking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmTrackingRoll' title="@{tgmTrackingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -4169,7 +4169,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tWeirdScienceRoll' title="@{tWeirdScienceRoll}" value='@{skillrt} @{defsTemplate} @{rolltWeirdScience}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmWeirdScienceRoll' title="@{tgmWeirdScienceRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+									<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 								<!--Specializations-->
 								<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -4267,14 +4267,14 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tSkillRoll' title="@{tSkillRoll}" value='@{skillrt} @{defsTemplate} @{rolltSkill}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSkillRoll' title="@{tgmSkillRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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]]]}}' />
+										<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}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{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>
 							<div class="templatebutton">
 								<input type='checkbox' name='attr_SkillFormula' class='arrow' style='width:15px;' checked='checked'/> <span class="sheet-spaceBetween"> &nbsp; Hide Macro Formula &nbsp; </span>
 								<div class='sheet-formula' style='width:785px; height:60px; border:solid; border-width:1px;'>
-									<textarea style='width:775px; height:50px;'>&{template:solidtrait} {{name=@{character_name}}} {{skill_name=@{repeating_skills_0_SkillName}}} {{skill_rank=@{repeating_skills_0_SkillNameRank}}} {{skill_rank_mod=@{repeating_skills_0_SkillNameMod}}} {{skill_mod=@{repeating_skills_0_SkillMod}}} {{ttmod=@{ttmod}}} {{wounds= [[@{woundsMod}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{skill_roll=[[1d@{repeating_skills_0_SkillNameRank}![@{repeating_skills_0_SkillName}] + @{repeating_skills_0_SkillNameMod}[@{repeating_skills_0_SkillName} Rank Modifier] + @{repeating_skills_0_SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{repeating_skills_0_SkillNameMod}[@{SkillName} Rank Modifier] + @{repeating_skills_0_SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}'</textarea><br />
+									<textarea style='width:775px; height:50px;'>&{template:solidtrait} {{name=@{character_name}}} {{skill_name=@{repeating_skills_0_SkillName}}} {{skill_rank=@{repeating_skills_0_SkillNameRank}}} {{skill_rank_mod=@{repeating_skills_0_SkillNameMod}}} {{skill_mod=[[@{repeating_skills_0_SkillMod}]]}} {{ttmod=[[@{ttmod}]]}} {{wounds= [[@{woundsMod}*-1]]}} {{fatigue= [[@{fatigue}*-1]]}} {{skill_roll=[[1d@{repeating_skills_0_SkillNameRank}![@{repeating_skills_0_SkillName}] + @{repeating_skills_0_SkillNameMod}[@{repeating_skills_0_SkillName} Rank Modifier] + @{repeating_skills_0_SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{repeating_skills_0_SkillNameMod}[@{SkillName} Rank Modifier] + @{repeating_skills_0_SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}'</textarea><br />
 									<span style='color:red;'>
 										<strong>NOTE:</strong> &{template:solidtrait} can be replaced with &{template:spadestrait2}. Also, the <span style='border:solid, border-width:1px;'> _0_ </span> represents the first added skill. For each subsequent skill added, increment the number.
 									</span>
@@ -6343,7 +6343,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tmAgilityRoll' title="@{tmAgilityRoll}" value='@{skillrt} @{defsTemplate} @{rolltmAgility}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmAgilityRoll' title="@{tmgmAgilityRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+									<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>
@@ -6357,7 +6357,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tmSmartsRoll' title="@{tmSmartsRoll}" value='@{skillrt} @{defsTemplate} @{rolltmSmarts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmSmartsRoll' title="@{tmgmSmartsRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+									<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>
@@ -6370,7 +6370,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tmSpiritRoll' title="@{tmSpiritRoll}" value='@{skillrt} @{defsTemplate} @{rolltmSpirit}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmSpiritRoll' title="@{tmgmSpiritRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+									<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>
@@ -6383,7 +6383,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tmStrengthRoll' title="@{tmStrengthRoll}" value='@{skillrt} @{defsTemplate} @{rolltmStrength}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmStrengthRoll' title="@{tmgmStrengthRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+									<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>
@@ -6396,7 +6396,7 @@
 									<button class="sheet-templatebutton" type='roll' name='roll_tmVigorRoll' title="@{tmVigorRoll}" value='@{skillrt} @{defsTemplate} @{rolltmVigor}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tmgmVigorRoll' title="@{tmgmVigorRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+									<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
@@ -6481,7 +6481,7 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tmUnskilledRoll' title="@{tmUnskilledRoll}" value='@{skillrt} @{defsTemplate} @{rolltmUnskilled}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmUnskilledRoll' title="@{tgmmUnskilledRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+										<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 -->
@@ -6502,7 +6502,7 @@
 										<button class="sheet-templatebutton" type='roll' name='roll_tmFightingRoll' title="@{tmFightingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmFighting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmFightingRoll' title="@{tgmmFightingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+										<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>
 									<!--Specializations-->
 									<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6580,7 +6580,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmBoatingRoll' title="@{tmBoatingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmBoating}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmBoatingRoll' title="@{tgmmBoatingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6629,7 +6629,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmClimbingRoll' title="@{tmClimbingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmClimbing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmClimbingRoll' title="@{tgmmClimbingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6679,7 +6679,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmDrivingRoll' title="@{tmDrivingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmDriving}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmDrivingRoll' title="@{tgmmDrivingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6729,7 +6729,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmFaithRoll' title="@{tmFaithRoll}" value='@{skillrt} @{defsTemplate} @{rolltmFaith}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmFaithRoll' title="@{tgmmFaithRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6779,7 +6779,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmGamblingRoll' title="@{tmGamblingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmGambling}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmGamblingRoll' title="@{tgmmGamblingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6829,7 +6829,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmGutsRoll' title="@{tmGutsRoll}" value='@{skillrt} @{defsTemplate} @{rolltmGuts}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmGutsRoll' title="@{tgmmGutsRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6879,7 +6879,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmHealingRoll' title="@{tmHealingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmHealing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmHealingRoll' title="@{tgmmHealingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6929,7 +6929,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmIntimidationRoll' title="@{tmIntimidationRoll}" value='@{skillrt} @{defsTemplate} @{rolltmIntimidation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmIntimidationRoll' title="@{tgmmIntimidationRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -6979,7 +6979,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmInvestigationRoll' title="@{tmInvestigationRoll}" value='@{skillrt} @{defsTemplate} @{rolltmInvestigation}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmInvestigationRoll' title="@{tgmmInvestigationRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7029,7 +7029,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmLockpickingRoll' title="@{tmLockpickingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmLockpicking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmLockpickingRoll' title="@{tgmmLockpickingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7079,7 +7079,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmNoticeRoll' title="@{tmNoticeRoll}" value='@{skillrt} @{defsTemplate} @{rolltmNotice}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmNoticeRoll' title="@{tgmmNoticeRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7130,7 +7130,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmPersuasionRoll' title="@{tmPersuasionRoll}" value='@{skillrt} @{defsTemplate} @{rolltmPersuasion}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmPersuasionRoll' title="@{tgmmPersuasionRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7180,7 +7180,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmPilotingRoll' title="@{tmPilotingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmPiloting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmPilotingRoll' title="@{tgmmPilotingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7230,7 +7230,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmPsionicsRoll' title="@{tmPsionicsRoll}" value='@{skillrt} @{defsTemplate} @{rolltmPsionics}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmPsionicsRoll' title="@{tgmmPsionicsRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7280,7 +7280,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmRepairRoll' title="@{tmRepairRoll}" value='@{skillrt} @{defsTemplate} @{rolltmRepair}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRepairRoll' title="@{tgmmRepairRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7330,7 +7330,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmRidingRoll' title="@{tmRidingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmRiding}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRidingRoll' title="@{tgmmRidingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7380,7 +7380,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmRitualRoll' title="@{tmRitualRoll}" value='@{skillrt} @{defsTemplate} @{rolltmRitual}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmRitualRoll' title="@{tgmmRitualRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7430,7 +7430,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmShootingRoll' title="@{tmShootingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmShooting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmShootingRoll' title="@{tgmmShootingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7480,7 +7480,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmSpellcastingRoll' title="@{tmSpellcastingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmSpellcasting}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSpellcastingRoll' title="@{tgmmSpellcastingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7530,7 +7530,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmStealthRoll' title="@{tmStealthRoll}" value='@{skillrt} @{defsTemplate} @{rolltmStealth}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmStealthRoll' title="@{tgmmStealthRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7580,7 +7580,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmStreetwiseRoll' title="@{tmStreetwiseRoll}" value='@{skillrt} @{defsTemplate} @{rolltmStreetwise}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmStreetwiseRoll' title="@{tgmmStreetwiseRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7630,7 +7630,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmSurvivalRoll' title="@{tmSurvivalRoll}" value='@{skillrt} @{defsTemplate} @{rolltmSurvival}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSurvivalRoll' title="@{tgmmSurvivalRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7680,7 +7680,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmSwimmingRoll' title="@{tmSwimmingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmSwimming}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSwimmingRoll' title="@{tgmmSwimmingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7730,7 +7730,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmTauntRoll' title="@{tmTauntRoll}" value='@{skillrt} @{defsTemplate} @{rolltmTaunt}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmTauntRoll' title="@{tgmmTauntRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7780,7 +7780,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmThrowingRoll' title="@{tmThrowingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmThrowing}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmThrowingRoll' title="@{tgmmThrowingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7830,7 +7830,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmTrackingRoll' title="@{tmTrackingRoll}" value='@{skillrt} @{defsTemplate} @{rolltmTracking}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmTrackingRoll' title="@{tgmmTrackingRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7880,7 +7880,7 @@
 											<button class="sheet-templatebutton" type='roll' name='roll_tmWeirdScienceRoll' title="@{tmWeirdScienceRoll}" value='@{skillrt} @{defsTemplate} @{rolltmWeirdScience}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmWeirdScienceRoll' title="@{tgmmWeirdScienceRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+											<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>
 										<!--Specializations-->
 										<input type="checkbox" class="sheet-useSkillSpec" name="attr_altRuleSkillSpec" style="display: none;" />
@@ -7930,14 +7930,14 @@
 												<button class="sheet-templatebutton" type='roll' name='roll_tmSkillRoll' title="@{tmSkillRoll}" value='@{skillrt} @{defsTemplate} @{rolltmSkill}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmmSkillRoll' title="@{tgmmSkillRoll}" value='/w gm @{skillrt} @{defsTemplate} @{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]]]}}' />
+												<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>
 									<div class="sheet-templatebutton">
 										<input type='checkbox' name='attr_mSkillsFormula'class='arrow' style='width:15px;' checked='checked'/> <span class="sheet-spaceBetween"> &nbsp; Hide Macro Formula &nbsp; </span>
 										<div class='sheet-formula' style='width:440px; height:80px; border:solid; border-width:1px;'>
-											<textarea style='width:430px; height:70px;'>&{template:solidtrait} {{name=@{character_name}}} {{skill_name=@{repeating_mskills_0_mSkillName}}} {{skill_rank=@{repeating_mskills_0_mSkillNameRank}}} {{skill_mod=@{repeating_mskills_0_mSkillNameMod}}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{repeating_mskills_0_mSkillNameRank}! + @{repeating_mskills_0_mSkillNameMod} + @{mModSum}[Other Modifiers]]]}}</textarea><br />
+											<textarea style='width:430px; height:70px;'>&{template:solidtrait} {{name=@{character_name}}} {{skill_name=@{repeating_mskills_0_mSkillName}}} {{skill_rank=@{repeating_mskills_0_mSkillNameRank}}} {{skill_mod=[[@{repeating_mskills_0_mSkillNameMod}]]}} {{ttmod=@{mttmod}}} {{wounds= -[[@{mwoundsMod}]]}} {{fatigue= -@{mfatigue}}} {{skill_roll=[[1d@{repeating_mskills_0_mSkillNameRank}! + @{repeating_mskills_0_mSkillNameMod} + @{mModSum}[Other Modifiers]]]}}</textarea><br />
 											<span style='color:red;'>
 												<strong>NOTE:</strong> &{template:solidtrait} can be replaced with &{template:spadestrait2}. Also, the <span style='border:solid, border-width:1px;'> _0_ </span> represents the first added skill. For each subsequent skill added, increment the number.
 											</span>