From 06f7e7e4c3774df9f48a8fc9bc7abeff545d6977 Mon Sep 17 00:00:00 2001
From: Diana P <suldae@hotmail.com>
Date: Fri, 5 May 2017 22:28:41 -0600
Subject: [PATCH] RMSS:  Update html and css to fix-

starting state for variable vs category stats for skills.
---
 Rolemaster-Standard-System/charsheet_RMSS.css |   4 +-
 ...harsheet_RMSS_fullcalcs_RollTemplates.html | 336 ++++++++----------
 2 files changed, 146 insertions(+), 194 deletions(-)

diff --git a/Rolemaster-Standard-System/charsheet_RMSS.css b/Rolemaster-Standard-System/charsheet_RMSS.css
index fb1ed30a02..6b62a4ce13 100644
--- a/Rolemaster-Standard-System/charsheet_RMSS.css
+++ b/Rolemaster-Standard-System/charsheet_RMSS.css
@@ -113,8 +113,8 @@
 .sheet-npc-vegetation6code-show:not(:checked)~.sheet-npc-vegetation6code {display:none;}
 .sheet-npc-vegetation7code-show:not(:checked)~.sheet-npc-vegetation7code {display:none;}
 .sheet-npc-vegetation8code-show:not(:checked)~.sheet-npc-vegetation8code {display:none;}
-.sheet-npc-variablestatbonuscalc-show:not(:checked)~.sheet-npc-variablestatbonuscalc {display:none;}
-.sheet-npc-variablestatbonuscalc-show:checked~.sheet-npc-variablestatbonuscalc1 {display:none;}
+.sheet-npc-variablestatbonuscalc-show:checked~.sheet-npc-variablestatbonuscalc {display:none;}
+.sheet-npc-variablestatbonuscalc-show:not(:checked)~.sheet-npc-variablestatbonuscalc1 {display:none;}
 
 .sheet-statlabel-big {
     border: 1px solid white;
diff --git a/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html b/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html
index 011df198db..a49a10edf1 100644
--- a/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html
+++ b/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html
@@ -1,10 +1,10 @@
 <!-- RoleMaster Standard System Character Sheet -->
 <!-- by Diana P. -->
 <!-- I borrowed some code/equations from Brian. And Sam. And Aaron I. And others -->
-<!-- Version 2.3.6 (full nested calculations; sheet helpers; npc import.) dated 5/4/2017 -->
+<!-- Version 2.3.6 (full nested calculations; sheet helpers; npc import.) dated 5/5/2017 -->
 <input type="hidden" name="attr_character_sheet" title="character-sheet" value="RMSS-FullCalcs"/>
 <input type="hidden" name="attr_currentsheetversion" title="currentsheetversion" value="3.6" />
-<p style="font-size: 0.6em;">V2.<span name="attr_sheetversion" title="sheetversion" ></span> 5/4/17 by Diana P.</p>
+<p style="font-size: 0.6em;">V2.<span name="attr_sheetversion" title="sheetversion" ></span> 5/5/17 by Diana P.</p>
 <input type="radio" class="sheet-switch-pc-show sheet-switch" title="npc-show" name="attr_npc-show" value="1" checked /><span style="text-align: left;"><span data-i18n="pc">PC</span> &nbsp; &nbsp; </span>
 <input type="radio" class="sheet-switch-npc-show sheet-switch" title="npc-show" name="attr_npc-show" value="2" /><span style="text-align: left;"><span data-i18n="npc">NPC</span> &nbsp; &nbsp; </span>
 <input type="radio" class="sheet-switch-rtmplt-show sheet-switch" title="npc-show" name="attr_npc-show" value="3" /><span style="text-align: left;" data-i18n="roll-templates">Roll Templates</span>
@@ -1205,7 +1205,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_actingstat" title="actingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span>  <!--Acting SD, Artistic-Active Ag-->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_actingstat" title="actingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span>  <!--Acting SD, Artistic-Active Ag-->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_actingcatbonus" title="actingcatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_actingspecialmod" title="actingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_actingitemmod" title="actingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1236,7 +1236,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_mimerystat" title="mimerystat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]" disabled="true" /></span><!--Mimery SD, Artistic-Active Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_mimerystat" title="mimerystat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]" disabled="true" /></span><!--Mimery SD, Artistic-Active Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mimerycatbonus" title="mimerycatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mimeryspecialmod" title="mimeryspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mimeryitemmod" title="mimeryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1252,7 +1252,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_mimicrystat" title="mimicrystat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Mimicry Me, Artistic-Active Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_mimicrystat" title="mimicrystat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Mimicry Me, Artistic-Active Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mimicrycatbonus" title="mimicrycatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mimicryspecialmod" title="mimicryspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mimicryitemmod" title="mimicryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1313,7 +1313,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_poeticimprovstat" title="poeticimprovstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Poetic Improvisation Me, Artistic-Active Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_poeticimprovstat" title="poeticimprovstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Poetic Improvisation Me, Artistic-Active Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poeticimprovcatbonus" title="poeticimprovcatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poeticimprovspecialmod" title="poeticimprovspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poeticimprovitemmod" title="poeticimprovitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1329,7 +1329,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_singingstat" title="singingstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Singing Me, Artistic-Active Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_singingstat" title="singingstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Singing Me, Artistic-Active Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_singingcatbonus" title="singingcatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_singingspecialmod" title="singingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_singingitemmod" title="singingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1345,7 +1345,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_taletellingstat" title="taletellingstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Tale Telling Me, Artistic-Active Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_taletellingstat" title="taletellingstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Tale Telling Me, Artistic-Active Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_taletellingcatbonus" title="taletellingcatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_taletellingspecialmod" title="taletellingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_taletellingitemmod" title="taletellingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1361,7 +1361,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_ventriloquismstat" title="ventriloquismstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Ventriloquism SD, Artistic-Active Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_ventriloquismstat" title="ventriloquismstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Ventriloquism SD, Artistic-Active Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_ventriloquismcatbonus" title="ventriloquismcatbonus (Category Bonus)" value="@{cat-artistic-active}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_ventriloquismspecialmod" title="ventriloquismspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_ventriloquismitemmod" title="ventriloquismitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1408,7 +1408,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_paintingstat" title="paintingstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Painting Ag, Artistic-Passive Pr -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_paintingstat" title="paintingstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Painting Ag, Artistic-Passive Pr -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_paintingcatbonus" title="paintingcatbonus (Category Bonus)" value="@{cat-artistic-passive}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_paintingspecialmod" title="paintingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_paintingitemmod" title="paintingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1424,7 +1424,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_poetrystat" title="poetrystat (Stat Bonus)" value="[[@{rebonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Poetry Re, Artistic-Passive Pr -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_poetrystat" title="poetrystat (Stat Bonus)" value="[[@{rebonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Poetry Re, Artistic-Passive Pr -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poetrycatbonus" title="poetrycatbonus (Category Bonus)" value="@{cat-artistic-passive}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poetryspecialmod" title="poetryspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poetryitemmod" title="poetryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1440,7 +1440,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_sculptingstat" title="sculptingstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Sculpting Ag, Artistic-Passive Pr -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_sculptingstat" title="sculptingstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Sculpting Ag, Artistic-Passive Pr -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_sculptingcatbonus" title="sculptingcatbonus (Category Bonus)" value="@{cat-artistic-passive}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_sculptingspecialmod" title="sculptingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_sculptingitemmod" title="sculptingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1535,7 +1535,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_powerstrikingstat" title="powerstrikingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Power-striking St, Athletic-Brawn Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_powerstrikingstat" title="powerstrikingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Power-striking St, Athletic-Brawn Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_powerstrikingcatbonus" title="powerstrikingcatbonus (Category Bonus)" value="@{cat-athletic-brawn}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_powerstrikingspecialmod" title="powerstrikingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_powerstrikingitemmod" title="powerstrikingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1551,7 +1551,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_powerthrowingstat" title="powerthrowingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Power-throwing St, Athletic-Brawn Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_powerthrowingstat" title="powerthrowingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Power-throwing St, Athletic-Brawn Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_powerthrowingcatbonus" title="powerthrowingcatbonus (Category Bonus)" value="@{cat-athletic-brawn}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_powerthrowingspecialmod" title="powerthrowingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_powerthrowingitemmod" title="powerthrowingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1598,7 +1598,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur1stat" title="athleticgamesendur1stat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Athletic Games (Endurance) Co, Athletic-Endurance St -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur1stat" title="athleticgamesendur1stat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Athletic Games (Endurance) Co, Athletic-Endurance St -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur1catbonus" title="athleticgamesendur1catbonus (Category Bonus)" value="@{cat-athletic-endur}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur1specialmod" title="athleticgamesendur1specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur1itemmod" title="athleticgamesendur1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -1614,7 +1614,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur2stat" title="athleticgamesendur2stat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Athletic Games (Endurance) Co, Athletic-Endurance St -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur2stat" title="athleticgamesendur2stat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Athletic Games (Endurance) Co, Athletic-Endurance St -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur2catbonus" title="athleticgamesendur2catbonus (Category Bonus)" value="@{cat-athletic-endur}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur2specialmod" title="athleticgamesendur2specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur2itemmod" title="athleticgamesendur2itemmod (Bonus modification from Item)" value="0"/></span>
@@ -1630,7 +1630,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur3stat" title="athleticgamesendur3stat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Athletic Games (Endurance) Co, Athletic-Endurance St -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur3stat" title="athleticgamesendur3stat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Athletic Games (Endurance) Co, Athletic-Endurance St -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur3catbonus" title="athleticgamesendur3catbonus (Category Bonus)" value="@{cat-athletic-endur}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur3specialmod" title="athleticgamesendur3specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesendur3itemmod" title="athleticgamesendur3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -1646,7 +1646,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_distancerunningstat" title="distancerunningstat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Distance Running Co, Athletic-Endurance St -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_distancerunningstat" title="distancerunningstat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Distance Running Co, Athletic-Endurance St -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_distancerunningcatbonus" title="distancerunningcatbonus (Category Bonus)" value="@{cat-athletic-endur}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_distancerunningspecialmod" title="distancerunningspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_distancerunningitemmod" title="distancerunningitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1692,7 +1692,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="quickness-a">Qu</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_sprintingstat" title="sprintingstat (Stat Bonus)" value="[[@{qubonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Springing Qu, Athletic-Endurance St -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_sprintingstat" title="sprintingstat (Stat Bonus)" value="[[@{qubonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Springing Qu, Athletic-Endurance St -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_sprintingcatbonus" title="sprintingcatbonus (Category Bonus)" value="@{cat-athletic-endur}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_sprintingspecialmod" title="sprintingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_sprintingitemmod" title="sprintingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1708,7 +1708,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_swimmingstat" title="swimmingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Swimming SD, Athletic-Endurance St -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_swimmingstat" title="swimmingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Swimming SD, Athletic-Endurance St -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_swimmingcatbonus" title="swimmingcatbonus (Category Bonus)" value="@{cat-athletic-endur}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_swimmingspecialmod" title="swimmingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_swimmingitemmod" title="swimmingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1755,7 +1755,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym1stat" title="athleticgamesgym1stat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Athletic Games (Gymnastics) Co, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym1stat" title="athleticgamesgym1stat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Athletic Games (Gymnastics) Co, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym1catbonus" title="athleticgamesgym1catbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym1specialmod" title="athleticgamesgym1specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym1itemmod" title="athleticgamesgym1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -1771,7 +1771,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym2stat" title="athleticgamesgym2stat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Athletic Games (Gymnastics) Co, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym2stat" title="athleticgamesgym2stat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Athletic Games (Gymnastics) Co, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym2catbonus" title="athleticgamesgym2catbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym2specialmod" title="athleticgamesgym2specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym2itemmod" title="athleticgamesgym2itemmod (Bonus modification from Item)" value="0"/></span>
@@ -1787,7 +1787,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym3stat" title="athleticgamesgym3stat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Athletic Games (Gymnastics) Co, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym3stat" title="athleticgamesgym3stat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Athletic Games (Gymnastics) Co, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym3catbonus" title="athleticgamesgym3catbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym3specialmod" title="athleticgamesgym3specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_athleticgamesgym3itemmod" title="athleticgamesgym3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -1803,7 +1803,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_climbingstat" title="climbingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Climbing St, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_climbingstat" title="climbingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Climbing St, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_climbingcatbonus" title="climbingcatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_climbingspecialmod" title="climbingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_climbingitemmod" title="climbingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1819,7 +1819,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_contortionsstat" title="contortionsstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Contortions SD, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_contortionsstat" title="contortionsstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Contortions SD, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_contortionscatbonus" title="contortionscatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_contortionsspecialmod" title="contortionsspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_contortionsitemmod" title="contortionsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1850,7 +1850,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_flyglidestat" title="flyglidestat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Flying/Gliding In, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_flyglidestat" title="flyglidestat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Flying/Gliding In, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_flyglidecatbonus" title="flyglidecatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_flyglidespecialmod" title="flyglidespecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_flyglideitemmod" title="flyglideitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1866,7 +1866,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_jugglingstat" title="jugglingstat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Juggling In, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_jugglingstat" title="jugglingstat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Juggling In, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_jugglingcatbonus" title="jugglingcatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_jugglingspecialmod" title="jugglingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_jugglingitemmod" title="jugglingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1897,7 +1897,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_rappellingstat" title="rappellingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Rappelling St, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_rappellingstat" title="rappellingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Rappelling St, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_rappellingcatbonus" title="rappellingcatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_rappellingspecialmod" title="rappellingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_rappellingitemmod" title="rappellingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1928,7 +1928,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_skiingstat" title="skiingstat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Skiing Co, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_skiingstat" title="skiingstat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Skiing Co, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_skiingcatbonus" title="skiingcatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_skiingspecialmod" title="skiingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_skiingitemmod" title="skiingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1959,7 +1959,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="constitution-a">Co</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_surfingstat" title="surfingstat (Stat Bonus)" value="[[@{cobonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Surfing Co, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_surfingstat" title="surfingstat (Stat Bonus)" value="[[@{cobonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Surfing Co, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_surfingcatbonus" title="surfingcatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_surfingspecialmod" title="surfingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_surfingitemmod" title="surfingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -1975,7 +1975,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_tightropestat" title="tightropestat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Tightrope-walking SD, Athletic-Gymnastics Ag -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_tightropestat" title="tightropestat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Tightrope-walking SD, Athletic-Gymnastics Ag -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_tightropecatbonus" title="tightropecatbonus (Category Bonus)" value="@{cat-athletic-gym}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_tightropespecialmod" title="tightropespecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_tightropeitemmod" title="tightropeitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2041,7 +2041,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_senseambushstat" title="senseambushstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Sense Ambush Em, Awareness-Perceptions In -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_senseambushstat" title="senseambushstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Sense Ambush Em, Awareness-Perceptions In -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_senseambushcatbonus" title="senseambushcatbonus (Category Bonus)" value="@{cat-aware-percept}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_senseambushspecialmod" title="senseambushspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_senseambushitemmod" title="senseambushitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2074,7 +2074,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_detecttrapsstat" title="detecttrapsstat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Detect Traps In, Awareness-Searching SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_detecttrapsstat" title="detecttrapsstat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Detect Traps In, Awareness-Searching SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_detecttrapscatbonus" title="detecttrapscatbonus (Category Bonus)" value="@{cat-aware-search}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_detecttrapsspecialmod" title="detecttrapsspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_detecttrapsitemmod" title="detecttrapsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2091,7 +2091,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_lieperceptionstat" title="lieperceptionstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Lie Perception Em, Awareness-Searching SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_lieperceptionstat" title="lieperceptionstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Lie Perception Em, Awareness-Searching SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_lieperceptioncatbonus" title="lieperceptioncatbonus (Category Bonus)" value="@{cat-aware-search}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_lieperceptionspecialmod" title="lieperceptionspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_lieperceptionitemmod" title="lieperceptionitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2108,7 +2108,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_locatehiddenstat" title="locatehiddenstat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Locate Hidden In, Awareness-Searching SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_locatehiddenstat" title="locatehiddenstat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Locate Hidden In, Awareness-Searching SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_locatehiddencatbonus" title="locatehiddencatbonus (Category Bonus)" value="@{cat-aware-search}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_locatehiddenspecialmod" title="locatehiddenspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_locatehiddenitemmod" title="locatehiddenitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2141,7 +2141,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_poisonperceptionstat" title="poisonperceptionstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Poison Perception Me, Awareness-Searching SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_poisonperceptionstat" title="poisonperceptionstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Poison Perception Me, Awareness-Searching SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poisonperceptioncatbonus" title="poisonperceptioncatbonus (Category Bonus)" value="@{cat-aware-search}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poisonperceptionspecialmod" title="poisonperceptionspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_poisonperceptionitemmod" title="poisonperceptionitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2238,7 +2238,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_realityawarenessstat" title="realityawarenessstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Reality Awareness Em, Awareness-Senses In -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_realityawarenessstat" title="realityawarenessstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Reality Awareness Em, Awareness-Senses In -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_realityawarenesscatbonus" title="realityawarenesscatbonus (Category Bonus)" value="@{cat-aware-senses}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_realityawarenessspecialmod" title="realityawarenessspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_realityawarenessitemmod" title="realityawarenessitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2255,7 +2255,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_senseawareness1stat" title="senseawareness1stat (Stat Bonus)" value="@{prbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Sense Awareness Pr, Awareness-Senses In -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_senseawareness1stat" title="senseawareness1stat (Stat Bonus)" value="@{prbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Sense Awareness Pr, Awareness-Senses In -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_senseawareness1catbonus" title="senseawareness1catbonus (Category Bonus)" value="@{cat-aware-senses}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_senseawareness1specialmod" title="senseawareness1specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_senseawareness1itemmod" title="senseawareness1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -2288,7 +2288,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_slastat" title="slastat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Spacial Location Awareness Pr, Awareness-Senses In -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_slastat" title="slastat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Spacial Location Awareness Pr, Awareness-Senses In -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_slacatbonus" title="slacatbonus (Category Bonus)" value="@{cat-aware-senses}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_slaspecialmod" title="slaspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_slaitemmod" title="slaitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2305,7 +2305,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_timesensestat" title="timesensestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Time Sense Em, Awareness-Senses In -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_timesensestat" title="timesensestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Time Sense Em, Awareness-Senses In -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_timesensecatbonus" title="timesensecatbonus (Category Bonus)" value="@{cat-aware-senses}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_timesensespecialmod" title="timesensespecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_timesenseitemmod" title="timesenseitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2456,7 +2456,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_mountedcombatstat" title="mountedcombatstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Mounted Combat Em, Combat Maneuvers SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_mountedcombatstat" title="mountedcombatstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Mounted Combat Em, Combat Maneuvers SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mountedcombatcatbonus" title="mountedcombatcatbonus (Category Bonus)" value="@{cat-combat-maneuvers}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mountedcombatspecialmod" title="mountedcombatspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_mountedcombatitemmod" title="mountedcombatitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2487,7 +2487,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_reversestroke1stat" title="reversestroke1stat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Reverse Stroke Pr, Combat Maneuvers SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_reversestroke1stat" title="reversestroke1stat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Reverse Stroke Pr, Combat Maneuvers SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_reversestroke1catbonus" title="reversestroke1catbonus (Category Bonus)" value="@{cat-combat-maneuvers}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_reversestroke1specialmod" title="reversestroke1specialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_reversestroke1itemmod" title="reversestroke1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -2518,7 +2518,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_swashbucklingstat" title="swashbucklingstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Swashbuckling Pr, Combat Maneuvers SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_swashbucklingstat" title="swashbucklingstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Swashbuckling Pr, Combat Maneuvers SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_swashbucklingcatbonus" title="swashbucklingcatbonus (Category Bonus)" value="@{cat-combat-maneuvers}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_swashbucklingspecialmod" title="swashbucklingspecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_swashbucklingitemmod" title="swashbucklingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2534,7 +2534,7 @@
 						<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 						<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 						<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-						<span class="sheet-table-data-skills"><input type="text" name="attr_tumbleevadestat" title="tumbleevadestat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Tumbling Ag, Combat Maneuvers SD -->
+						<span class="sheet-table-data-skills"><input type="text" name="attr_tumbleevadestat" title="tumbleevadestat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Tumbling Ag, Combat Maneuvers SD -->
 						<span class="sheet-table-data-skills"><input type="text" name="attr_tumbleevadecatbonus" title="tumbleevadecatbonus (Category Bonus)" value="@{cat-combat-maneuvers}" disabled="true" /></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_tumbleevadespecialmod" title="tumbleevadespecialmod (Any Special bonuses)" value="0"/></span>
 						<span class="sheet-table-data-skills"><input type="text" name="attr_tumbleevadeitemmod" title="tumbleevadeitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2707,7 +2707,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
-							<span class="sheet-table-data-skills" style="width: 55px;"><input type="text" name="attr_lipreadingstat" title="lipreadingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{embonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Lip Reading SD, Communication Em -->
+							<span class="sheet-table-data-skills" style="width: 55px;"><input type="text" name="attr_lipreadingstat" title="lipreadingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{embonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Lip Reading SD, Communication Em -->
 							<span class="sheet-table-data-skills" style="width: 55px;"><input type="text" name="attr_lipreadingcatbonus" title="lipreadingcatbonus (Category Bonus)" value="@{cat-communications}" disabled="true" /></span>
 							<span class="sheet-table-data-skills" style="width: 55px;"><input type="text" name="attr_lipreadingspecialmod" title="lipreadingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills" style="width: 55px;"><input type="text" name="attr_lipreadingitemmod" title="lipreadingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2724,7 +2724,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_signalingstat" title="signalingstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{embonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Signaling Me, Communication Em -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_signalingstat" title="signalingstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{embonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Signaling Me, Communication Em -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_signalingcatbonus" title="signalingcatbonus (Category Bonus)" value="@{cat-communications}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_signalingspecialmod" title="signalingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_signalingitemmod" title="signalingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2759,7 +2759,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_cookingstat" title="cookingstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Cooking In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_cookingstat" title="cookingstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Cooking In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_cookingcatbonus" title="cookingcatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_cookingspecialmod" title="cookingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_cookingitemmod" title="cookingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2775,7 +2775,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_fletchingstat" title="fletchingstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Fletching In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_fletchingstat" title="fletchingstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Fletching In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_fletchingcatbonus" title="fletchingcatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_fletchingspecialmod" title="fletchingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_fletchingitemmod" title="fletchingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2806,7 +2806,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_metalcraftsstat" title="metalcraftsstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Metal-crafts In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_metalcraftsstat" title="metalcraftsstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Metal-crafts In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_metalcraftscatbonus" title="metalcraftscatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_metalcraftsspecialmod" title="metalcraftsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_metalcraftsitemmod" title="metalcraftsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2822,7 +2822,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_ropemasterystat" title="ropemasterystat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Rope Mastery In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_ropemasterystat" title="ropemasterystat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Rope Mastery In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_ropemasterycatbonus" title="ropemasterycatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_ropemasteryspecialmod" title="ropemasteryspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_ropemasteryitemmod" title="ropemasteryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2853,7 +2853,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_sewingstat" title="sewingstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Sewing/Weaving In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_sewingstat" title="sewingstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Sewing/Weaving In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sewingcatbonus" title="sewingcatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sewingspecialmod" title="sewingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sewingitemmod" title="sewingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2869,7 +2869,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_skinningstat" title="skinningstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Skinning In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_skinningstat" title="skinningstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Skinning In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_skinningcatbonus" title="skinningcatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_skinningspecialmod" title="skinningspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_skinningitemmod" title="skinningitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2885,7 +2885,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_stonecraftsstat" title="stonecraftsstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Stone-crafts In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_stonecraftsstat" title="stonecraftsstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Stone-crafts In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stonecraftscatbonus" title="stonecraftscatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stonecraftsspecialmod" title="stonecraftsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stonecraftsitemmod" title="stonecraftsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2901,7 +2901,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_trappingstat" title="trappingstat (Stat Bonus Value)" value="[[@{embonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Trapping Em, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_trappingstat" title="trappingstat (Stat Bonus Value)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Trapping Em, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_trappingcatbonus" title="trappingcatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_trappingspecialmod" title="trappingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_trappingitemmod" title="trappingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -2917,7 +2917,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_woodcraftsstat" title="woodcraftsstat (Stat Bonus Value)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Wood-crafts In, Crafts SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_woodcraftsstat" title="woodcraftsstat (Stat Bonus Value)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Wood-crafts In, Crafts SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_woodcraftscatbonus" title="woodcraftscatbonus (Category Bonus)" value="@{cat-crafts}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_woodcraftsspecialmod" title="woodcraftsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_woodcraftsitemmod" title="woodcraftsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3170,7 +3170,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_interrogationstat" title="interrogationstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Interrogation SD, Influence In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_interrogationstat" title="interrogationstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Interrogation SD, Influence In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_interrogationcatbonus" title="interrogationcatbonus (Category Bonus)" value="@{cat-influence}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_interrogationspecialmod" title="interrogationspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_interrogationitemmod" title="interrogationitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3187,7 +3187,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_leadershipstat" title="leadershipstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Leadership Pr, Influence In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_leadershipstat" title="leadershipstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Leadership Pr, Influence In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_leadershipcatbonus" title="leadershipcatbonus (Category Bonus)" value="@{cat-influence}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_leadershipspecialmod" title="leadershipspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_leadershipitemmod" title="leadershipitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3204,7 +3204,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_propagandastat" title="propagandastat (Stat Bonus)" value="[[@{rebonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Propaganda Re, Influence In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_propagandastat" title="propagandastat (Stat Bonus)" value="[[@{rebonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Propaganda Re, Influence In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_propagandacatbonus" title="propagandacatbonus (Category Bonus)" value="@{cat-influence}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_propagandaspecialmod" title="propagandaspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_propagandaitemmod" title="propagandaitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3253,7 +3253,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_tradingstat" title="tradingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Trading SD, Influence In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_tradingstat" title="tradingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Trading SD, Influence In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_tradingcatbonus" title="tradingcatbonus (Category Bonus)" value="@{cat-influence}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_tradingspecialmod" title="tradingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_tradingitemmod" title="tradingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3304,7 +3304,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_faunalorestat" title="faunalorestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Fauna Lore Em, Lore-General Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_faunalorestat" title="faunalorestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Fauna Lore Em, Lore-General Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_faunalorecatbonus" title="faunalorecatbonus (Category Bonus)" value="@{cat-lore-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_faunalorespecialmod" title="faunalorespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_faunaloreitemmod" title="faunaloreitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3321,7 +3321,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_floralorestat" title="floralorestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Flora Lore Em, Lore-General Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_floralorestat" title="floralorestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Flora Lore Em, Lore-General Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_floralorecatbonus" title="floralorecatbonus (Category Bonus)" value="@{cat-lore-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_floralorespecialmod" title="floralorespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_floraloreitemmod" title="floraloreitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3370,7 +3370,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_philosophystat" title="philosophystat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Philosophy In, Lore-General Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_philosophystat" title="philosophystat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Philosophy In, Lore-General Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_philosophycatbonus" title="philosophycatbonus (Category Bonus)" value="@{cat-lore-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_philosophyspecialmod" title="philosophyspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_philosophyitemmod" title="philosophyitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3548,7 +3548,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_planarlorestat" title="planarlorestat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Planar Lore In, Lore-Magical Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_planarlorestat" title="planarlorestat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Planar Lore In, Lore-Magical Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_planarlorecatbonus" title="planarlorecatbonus (Category Bonus)" value="@{cat-lore-magical}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_planarlorespecialmod" title="planarlorespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_planarloreitemmod" title="planarloreitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3581,7 +3581,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_symbollorestat" title="symbollorestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Symbol Lore Em, Lore-Magical Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_symbollorestat" title="symbollorestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Symbol Lore Em, Lore-Magical Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_symbollorecatbonus" title="symbollorecatbonus (Category Bonus)" value="@{cat-lore-magical}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_symbollorespecialmod" title="symbollorespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_symbolloreitemmod" title="symbolloreitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3916,7 +3916,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_striking3stat" title="striking3stat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Striking Degree 3 SD, Martial Arts-Striking St -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_striking3stat" title="striking3stat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Striking Degree 3 SD, Martial Arts-Striking St -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_striking3catbonus" title="striking3catbonus (Category Bonus)" value="@{cat-ma-striking}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_striking3specialmod" title="striking3specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_striking3itemmod" title="striking3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -3932,7 +3932,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_striking4stat" title="striking4stat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Striking Degree 4 SD, Martial Arts-Striking St -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_striking4stat" title="striking4stat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Striking Degree 4 SD, Martial Arts-Striking St -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_striking4catbonus" title="striking4catbonus (Category Bonus)" value="@{cat-ma-striking}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_striking4specialmod" title="striking4specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_striking4itemmod" title="striking4itemmod (Bonus modification from Item)" value="0"/></span>
@@ -3948,7 +3948,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="quickness-a">Qu</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_tacklingstat" title="tacklingstat (Stat Bonus)" value="[[@{qubonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Tackling Qu, Martial Arts-Striking St -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_tacklingstat" title="tacklingstat (Stat Bonus)" value="[[@{qubonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Tackling Qu, Martial Arts-Striking St -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_tacklingcatbonus" title="tacklingcatbonus (Category Bonus)" value="@{cat-ma-striking}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_tacklingspecialmod" title="tacklingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_tacklingitemmod" title="tacklingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -3979,7 +3979,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_blockingstat" title="blockingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Blocking St, Martial Arts-Sweeps Ag -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_blockingstat" title="blockingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Blocking St, Martial Arts-Sweeps Ag -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_blockingcatbonus" title="blockingcatbonus (Category Bonus)" value="@{cat-ma-sweeps}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_blockingspecialmod" title="blockingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_blockingitemmod" title="blockingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4025,7 +4025,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps3stat" title="sweeps3stat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Sweeps Degree 3 SD, Martial Arts-Sweeps Ag -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps3stat" title="sweeps3stat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Sweeps Degree 3 SD, Martial Arts-Sweeps Ag -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps3catbonus" title="sweeps3catbonus (Category Bonus)" value="@{cat-ma-sweeps}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps3specialmod" title="sweeps3specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps3itemmod" title="sweeps3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4041,7 +4041,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps4stat" title="sweeps4stat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Sweeps Degree 4 SD, Martial Arts-Sweeps Ag -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps4stat" title="sweeps4stat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Sweeps Degree 4 SD, Martial Arts-Sweeps Ag -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps4catbonus" title="sweeps4catbonus (Category Bonus)" value="@{cat-ma-sweeps}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps4specialmod" title="sweeps4specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_sweeps4itemmod" title="sweeps4itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4057,7 +4057,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_wrestlingstat" title="wrestlingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{agbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Wrestling SD, Martial Arts-Sweeps Ag -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_wrestlingstat" title="wrestlingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{agbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Wrestling SD, Martial Arts-Sweeps Ag -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_wrestlingcatbonus" title="wrestlingcatbonus (Category Bonus)" value="@{cat-ma-sweeps}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_wrestlingspecialmod" title="wrestlingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_wrestlingitemmod" title="wrestlingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4123,7 +4123,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_animalmasterystat" title="animalmasterystat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{embonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Animal Mastery Pr, Outdoor-Animal Em -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_animalmasterystat" title="animalmasterystat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{embonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Animal Mastery Pr, Outdoor-Animal Em -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_animalmasterycatbonus" title="animalmasterycatbonus (Category Bonus)" value="@{cat-outdoor-animal}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_animalmasteryspecialmod" title="animalmasteryspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_animalmasteryitemmod" title="animalmasteryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4140,7 +4140,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_animaltraining1stat" title="animaltraining1stat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{embonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Animal Training SD, Outdoor-Animal Em -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_animaltraining1stat" title="animaltraining1stat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{embonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Animal Training SD, Outdoor-Animal Em -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_animaltraining1catbonus" title="animaltraining1catbonus (Category Bonus)" value="@{cat-outdoor-animal}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_animaltraining1specialmod" title="animaltraining1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_animaltraining1itemmod" title="animaltraining1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4157,7 +4157,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_driving1stat" title="driving1stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{embonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Driving In, Outdoor-Animal Em -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_driving1stat" title="driving1stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{embonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Driving In, Outdoor-Animal Em -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_driving1catbonus" title="driving1catbonus (Category Bonus)" value="@{cat-outdoor-animal}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_driving1specialmod" title="driving1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_driving1itemmod" title="driving1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4315,7 +4315,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_foragingstat" title="foragingstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Foraging Em, Outdoor-Environmental Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_foragingstat" title="foragingstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Foraging Em, Outdoor-Environmental Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_foragingcatbonus" title="foragingcatbonus (Category Bonus)" value="@{cat-outdoor-environ}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_foragingspecialmod" title="foragingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_foragingitemmod" title="foragingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4331,7 +4331,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_huntingstat" title="huntingstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Hunting Em, Outdoor-Environmental Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_huntingstat" title="huntingstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Hunting Em, Outdoor-Environmental Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_huntingcatbonus" title="huntingcatbonus (Category Bonus)" value="@{cat-outdoor-environ}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_huntingspecialmod" title="huntingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_huntingitemmod" title="huntingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4362,7 +4362,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_survival1stat" title="survival1stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Survival In, Outdoor-Environmental Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_survival1stat" title="survival1stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Survival In, Outdoor-Environmental Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival1catbonus" title="survival1catbonus (Category Bonus)" value="@{cat-outdoor-environ}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival1specialmod" title="survival1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival1itemmod" title="survival1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4378,7 +4378,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_survival2stat" title="survival2stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Survival In, Outdoor-Environmental Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_survival2stat" title="survival2stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Survival In, Outdoor-Environmental Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival2catbonus" title="survival2catbonus (Category Bonus)" value="@{cat-outdoor-environ}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival2specialmod" title="survival2specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival2itemmod" title="survival2itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4394,7 +4394,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_survival3stat" title="survival3stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Survival In, Outdoor-Environmental Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_survival3stat" title="survival3stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Survival In, Outdoor-Environmental Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival3catbonus" title="survival3catbonus (Category Bonus)" value="@{cat-outdoor-environ}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival3specialmod" title="survival3specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_survival3itemmod" title="survival3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4410,7 +4410,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_weatherwatchingstat" title="weatherwatchingstat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{mebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Weather Watching In, Outdoor-Environmental Me -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_weatherwatchingstat" title="weatherwatchingstat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{mebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Weather Watching In, Outdoor-Environmental Me -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weatherwatchingcatbonus" title="weatherwatchingcatbonus (Category Bonus)" value="@{cat-outdoor-environ}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weatherwatchingspecialmod" title="weatherwatchingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weatherwatchingitemmod" title="weatherwatchingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4460,7 +4460,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_divination1stat" title="divination1stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Divination In, Power Awareness Pr -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_divination1stat" title="divination1stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Divination In, Power Awareness Pr -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination1catbonus" title="divination1catbonus (Category Bonus)" value="@{cat-power-awareness}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination1specialmod" title="divination1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination1itemmod" title="divination1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4477,7 +4477,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_divination2stat" title="divination2stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Divination In, Power Awareness Pr -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_divination2stat" title="divination2stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Divination In, Power Awareness Pr -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination2catbonus" title="divination2catbonus (Category Bonus)" value="@{cat-power-awareness}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination2specialmod" title="divination2specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination2itemmod" title="divination2itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4494,7 +4494,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_divination3stat" title="divination3stat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Divination In, Power Awareness Pr -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_divination3stat" title="divination3stat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Divination In, Power Awareness Pr -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination3catbonus" title="divination3catbonus (Category Bonus)" value="@{cat-power-awareness}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination3specialmod" title="divination3specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_divination3itemmod" title="divination3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4527,7 +4527,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_readrunesstat" title="readrunesstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Read Runes Me, Power Awareness Pr -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_readrunesstat" title="readrunesstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Read Runes Me, Power Awareness Pr -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_readrunescatbonus" title="readrunescatbonus (Category Bonus)" value="@{cat-power-awareness}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_readrunesspecialmod" title="readrunesspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_readrunesitemmod" title="readrunesitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4559,7 +4559,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_channelingstat" title="channelingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Channeling SD, Power Manipulation Pr -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_channelingstat" title="channelingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Channeling SD, Power Manipulation Pr -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_channelingcatbonus" title="channelingcatbonus (Category Bonus)" value="@{cat-power-manipulation}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_channelingspecialmod" title="channelingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_channelingitemmod" title="channelingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4576,7 +4576,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_magicritualstat" title="magicritualstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{prbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Magic Ritual SD, Power Manipulation Pr -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_magicritualstat" title="magicritualstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{prbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Magic Ritual SD, Power Manipulation Pr -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_magicritualcatbonus" title="magicritualcatbonus (Category Bonus)" value="@{cat-power-manipulation}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_magicritualspecialmod" title="magicritualspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_magicritualitemmod" title="magicritualitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4704,7 +4704,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_researchstat" title="researchstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Research SD, Science/Analytic-Basic Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_researchstat" title="researchstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Research SD, Science/Analytic-Basic Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_researchcatbonus" title="researchcatbonus (Category Bonus)" value="@{cat-science-basic}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_researchspecialmod" title="researchspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_researchitemmod" title="researchitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4751,7 +4751,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_anthropology1stat" title="anthropology1stat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Anthropology Em, Science/Analytic-Specialized Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_anthropology1stat" title="anthropology1stat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Anthropology Em, Science/Analytic-Specialized Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_anthropology1catbonus" title="anthropology1catbonus (Category Bonus)" value="@{cat-science-specialized}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_anthropology1specialmod" title="anthropology1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_anthropology1itemmod" title="anthropology1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -4768,7 +4768,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_alchemystat" title="alchemystat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Alchemy In, Science/Analytic-Specialized Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_alchemystat" title="alchemystat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Alchemy In, Science/Analytic-Specialized Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_alchemycatbonus" title="alchemycatbonus (Category Bonus)" value="@{cat-science-specialized}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_alchemyspecialmod" title="alchemyspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_alchemyitemmod" title="alchemyitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4785,7 +4785,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_astronomystat" title="astronomystat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Astronomy Pr, Science/Analytic-Specialized Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_astronomystat" title="astronomystat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Astronomy Pr, Science/Analytic-Specialized Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_astronomycatbonus" title="astronomycatbonus (Category Bonus)" value="@{cat-science-specialized}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_astronomyspecialmod" title="astronomyspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_astronomyitemmod" title="astronomyitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4802,7 +4802,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_biochemistrystat" title="biochemistrystat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Biochemistry In, Science/Analytic-Specialized Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_biochemistrystat" title="biochemistrystat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Biochemistry In, Science/Analytic-Specialized Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_biochemistrycatbonus" title="biochemistrycatbonus (Category Bonus)" value="@{cat-science-specialized}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_biochemistryspecialmod" title="biochemistryspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_biochemistryitemmod" title="biochemistryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4818,7 +4818,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_psychologystat" title="psychologystat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Psychology Pr, Science/Analytic-Specialized Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_psychologystat" title="psychologystat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Psychology Pr, Science/Analytic-Specialized Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_psychologycatbonus" title="psychologycatbonus (Category Bonus)" value="@{cat-science-specialized}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_psychologyspecialmod" title="psychologyspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_psychologyitemmod" title="psychologyitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4907,7 +4907,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalbalancestat" title="adrenalbalancestat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Balance Ag, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalbalancestat" title="adrenalbalancestat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Balance Ag, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalbalancecatbonus" title="adrenalbalancecatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalbalancespecialmod" title="adrenalbalancespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalbalanceitemmod" title="adrenalbalanceitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4923,7 +4923,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalconcentrationstat" title="adrenalconcentrationstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Concentration Pr, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalconcentrationstat" title="adrenalconcentrationstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Concentration Pr, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalconcentrationcatbonus" title="adrenalconcentrationcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalconcentrationspecialmod" title="adrenalconcentrationspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalconcentrationitemmod" title="adrenalconcentrationitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4939,7 +4939,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenallandingstat" title="adrenallandingstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Landing Ag, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenallandingstat" title="adrenallandingstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Landing Ag, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenallandingcatbonus" title="adrenallandingcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenallandingspecialmod" title="adrenallandingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenallandingitemmod" title="adrenallandingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4955,7 +4955,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalleapingstat" title="adrenalleapingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Leaping St, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalleapingstat" title="adrenalleapingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Leaping St, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalleapingcatbonus" title="adrenalleapingcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalleapingspecialmod" title="adrenalleapingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalleapingitemmod" title="adrenalleapingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4971,7 +4971,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalquickdrawstat" title="adrenalquickdrawstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Quickdraw Ag, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalquickdrawstat" title="adrenalquickdrawstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Quickdraw Ag, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalquickdrawcatbonus" title="adrenalquickdrawcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalquickdrawspecialmod" title="adrenalquickdrawspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalquickdrawitemmod" title="adrenalquickdrawitemmod (Bonus modification from Item)" value="0"/></span>
@@ -4987,7 +4987,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="quickness-a">Qu</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalspeedstat" title="adrenalspeedstat (Stat Bonus)" value="[[@{qubonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Speed Qu, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalspeedstat" title="adrenalspeedstat (Stat Bonus)" value="[[@{qubonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Speed Qu, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalspeedcatbonus" title="adrenalspeedcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalspeedspecialmod" title="adrenalspeedspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalspeeditemmod" title="adrenalspeeditemmod (Bonus modification from Item)" value="0"/></span>
@@ -5018,7 +5018,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalstrengthstat" title="adrenalstrengthstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Adrenal Strength St, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalstrengthstat" title="adrenalstrengthstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Adrenal Strength St, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalstrengthcatbonus" title="adrenalstrengthcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalstrengthspecialmod" title="adrenalstrengthspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_adrenalstrengthitemmod" title="adrenalstrengthitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5094,7 +5094,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_healingtrancestat" title="healingtrancestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Healing Trance Em, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_healingtrancestat" title="healingtrancestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Healing Trance Em, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_healingtrancecatbonus" title="healingtrancecatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_healingtrancespecialmod" title="healingtrancespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_healingtranceitemmod" title="healingtranceitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5125,7 +5125,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="memory-a">Me</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_mnemonicsstat" title="mnemonicsstat (Stat Bonus)" value="[[@{mebonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Mnemonics Me, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_mnemonicsstat" title="mnemonicsstat (Stat Bonus)" value="[[@{mebonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Mnemonics Me, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_mnemonicscatbonus" title="mnemonicscatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_mnemonicsspecialmod" title="mnemonicsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_mnemonicsitemmod" title="mnemonicsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5156,7 +5156,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_stunnedmaneuveringstat" title="stunnedmaneuveringstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Stunned Maneuvering Pr, Self Control  SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_stunnedmaneuveringstat" title="stunnedmaneuveringstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Stunned Maneuvering Pr, Self Control  SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stunnedmaneuveringcatbonus" title="stunnedmaneuveringcatbonus (Category Bonus)" value="@{cat-self-control}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stunnedmaneuveringspecialmod" title="stunnedmaneuveringspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stunnedmaneuveringitemmod" title="stunnedmaneuveringitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5190,7 +5190,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_brawlingstat" title="brawlingstat (Stat Bonus)" value="[[@{stbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Brawling St, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_brawlingstat" title="brawlingstat (Stat Bonus)" value="[[@{stbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Brawling St, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_brawlingcatbonus" title="brawlingcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_brawlingspecialmod" title="brawlingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_brawlingitemmod" title="brawlingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5206,7 +5206,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hstat" title="disarmarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hstat" title="disarmarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
 							<!--span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hcatbonus" title="disarmarmedvs1hcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hspecialmod" title="disarmarmedvs1hspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hitemmod" title="disarmarmedvs1hitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5222,7 +5222,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hstat" title="disarmarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hstat" title="disarmarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hcatbonus" title="disarmarmedvs1hcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hspecialmod" title="disarmarmedvs1hspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs1hitemmod" title="disarmarmedvs1hitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5238,7 +5238,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2hstat" title="disarmarmedvs2hstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2hstat" title="disarmarmedvs2hstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2hcatbonus" title="disarmarmedvs2hcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2hspecialmod" title="disarmarmedvs2hspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2hitemmod" title="disarmarmedvs2hitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5254,7 +5254,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvspolearmstat" title="disarmarmedvspolearmstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvspolearmstat" title="disarmarmedvspolearmstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvspolearmcatbonus" title="disarmarmedvspolearmcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvspolearmspecialmod" title="disarmarmedvspolearmspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvspolearmitemmod" title="disarmarmedvspolearmitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5270,7 +5270,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2wcombostat" title="disarmarmedvs2wcombostat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2wcombostat" title="disarmarmedvs2wcombostat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (armed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2wcombocatbonus" title="disarmarmedvs2wcombocatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2wcombospecialmod" title="disarmarmedvs2wcombospecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmarmedvs2wcomboitemmod" title="disarmarmedvs2wcomboitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5286,7 +5286,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hstat" title="disarmunarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hstat" title="disarmunarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
 							<!--span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hcatbonus" title="disarmunarmedvs1hcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hspecialmod" title="disarmunarmedvs1hspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hitemmod" title="disarmunarmedvs1hitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5302,7 +5302,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hstat" title="disarmunarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hstat" title="disarmunarmedvs1hstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hcatbonus" title="disarmunarmedvs1hcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hspecialmod" title="disarmunarmedvs1hspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs1hitemmod" title="disarmunarmedvs1hitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5318,7 +5318,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2hstat" title="disarmunarmedvs2hstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2hstat" title="disarmunarmedvs2hstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2hcatbonus" title="disarmunarmedvs2hcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2hspecialmod" title="disarmunarmedvs2hspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2hitemmod" title="disarmunarmedvs2hitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5334,7 +5334,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvspolearmstat" title="disarmunarmedvspolearmstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvspolearmstat" title="disarmunarmedvspolearmstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvspolearmcatbonus" title="disarmunarmedvspolearmcatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvspolearmspecialmod" title="disarmunarmedvspolearmspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvspolearmitemmod" title="disarmunarmedvspolearmitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5350,7 +5350,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2wcombostat" title="disarmunarmedvs2wcombostat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2wcombostat" title="disarmunarmedvs2wcombostat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarm Foe (unarmed) vs ? Ag, Special Attacks SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2wcombocatbonus" title="disarmunarmedvs2wcombocatbonus (Category Bonus)" value="@{cat-special-attacks}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2wcombospecialmod" title="disarmunarmedvs2wcombospecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmunarmedvs2wcomboitemmod" title="disarmunarmedvs2wcomboitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5508,7 +5508,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_camouflagestat" title="camouflagestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Camouflage Em, Subterfuge-Mechanics Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_camouflagestat" title="camouflagestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Camouflage Em, Subterfuge-Mechanics Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_camouflagecatbonus" title="camouflagecatbonus (Category Bonus)" value="@{cat-subterfuge-mechanics}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_camouflagespecialmod" title="camouflagespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_camouflageitemmod" title="camouflageitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5525,7 +5525,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmingtrapsstat" title="disarmingtrapsstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disarming Traps SD, Subterfuge-Mechanics Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmingtrapsstat" title="disarmingtrapsstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disarming Traps SD, Subterfuge-Mechanics Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmingtrapscatbonus" title="disarmingtrapscatbonus (Category Bonus)" value="@{cat-subterfuge-mechanics}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmingtrapsspecialmod" title="disarmingtrapsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disarmingtrapsitemmod" title="disarmingtrapsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5542,7 +5542,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_disguisestat" title="disguisestat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Disguise Pr, Subterfuge-Mechanics Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_disguisestat" title="disguisestat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Disguise Pr, Subterfuge-Mechanics Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disguisecatbonus" title="disguisecatbonus (Category Bonus)" value="@{cat-subterfuge-mechanics}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disguisespecialmod" title="disguisespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_disguiseitemmod" title="disguiseitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5623,7 +5623,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_settrapsstat" title="settrapsstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Setting Traps SD, Subterfuge-Mechanics Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_settrapsstat" title="settrapsstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Setting Traps SD, Subterfuge-Mechanics Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_settrapscatbonus" title="settrapscatbonus (Category Bonus)" value="@{cat-subterfuge-mechanics}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_settrapsspecialmod" title="settrapsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_settrapsitemmod" title="settrapsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5656,7 +5656,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_usepoisonstat" title="usepoisonstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Using/Removing Poison SD, Subterfuge-Mechanics Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_usepoisonstat" title="usepoisonstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Using/Removing Poison SD, Subterfuge-Mechanics Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_usepoisoncatbonus" title="usepoisoncatbonus (Category Bonus)" value="@{cat-subterfuge-mechanics}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_usepoisonspecialmod" title="usepoisonspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_usepoisonitemmod" title="usepoisonitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5759,7 +5759,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_pickpocketsstat" title="pickpocketsstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Picking Pockets Pr, Subterfuge-Stealth In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_pickpocketsstat" title="pickpocketsstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Picking Pockets Pr, Subterfuge-Stealth In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_pickpocketscatbonus" title="pickpocketscatbonus (Category Bonus)" value="@{cat-subterfuge-stealth}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_pickpocketsspecialmod" title="pickpocketsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_pickpocketsitemmod" title="pickpocketsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5776,7 +5776,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_stalkingstat" title="stalkingstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Stalking SD, Subterfuge-Stealth In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_stalkingstat" title="stalkingstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Stalking SD, Subterfuge-Stealth In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stalkingcatbonus" title="stalkingcatbonus (Category Bonus)" value="@{cat-subterfuge-stealth}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stalkingspecialmod" title="stalkingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_stalkingitemmod" title="stalkingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5793,7 +5793,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_trickerystat" title="trickerystat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Trickery Pr, Subterfuge-Stealth In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_trickerystat" title="trickerystat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Trickery Pr, Subterfuge-Stealth In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_trickerycatbonus" title="trickerycatbonus (Category Bonus)" value="@{cat-subterfuge-stealth}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_trickeryspecialmod" title="trickeryspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_trickeryitemmod" title="trickeryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5828,7 +5828,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_beggingstat" title="beggingstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Begging Pr, Technical/Trade-General SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_beggingstat" title="beggingstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Begging Pr, Technical/Trade-General SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_beggingcatbonus" title="beggingcatbonus (Category Bonus)" value="@{cat-tech-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_beggingspecialmod" title="beggingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_beggingitemmod" title="beggingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5844,7 +5844,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_firstaidstat" title="firstaidstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--First Aid Em, Technical/Trade-General SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_firstaidstat" title="firstaidstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--First Aid Em, Technical/Trade-General SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_firstaidcatbonus" title="firstaidcatbonus (Category Bonus)" value="@{cat-tech-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_firstaidspecialmod" title="firstaidspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_firstaiditemmod" title="firstaiditemmod (Bonus modification from Item)" value="0"/></span>
@@ -5861,7 +5861,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_gamblingstat" title="gamblingstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Gambling Pr, Technical/Trade-General SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_gamblingstat" title="gamblingstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Gambling Pr, Technical/Trade-General SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_gamblingcatbonus" title="gamblingcatbonus (Category Bonus)" value="@{cat-tech-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_gamblingspecialmod" title="gamblingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_gamblingitemmod" title="gamblingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5894,7 +5894,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_operatingequipmentstat" title="operatingequipmentstat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Operating Equipment In, Technical/Trade-General SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_operatingequipmentstat" title="operatingequipmentstat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Operating Equipment In, Technical/Trade-General SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_operatingequipmentcatbonus" title="operatingequipmentcatbonus (Category Bonus)" value="@{cat-tech-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_operatingequipmentspecialmod" title="operatingequipmentspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_operatingequipmentitemmod" title="operatingequipmentitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5910,7 +5910,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_orienteeringstat" title="orienteeringstat (Stat Bonus)" value="[[@{inbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Orienteering In, Technical/Trade-General SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_orienteeringstat" title="orienteeringstat (Stat Bonus)" value="[[@{inbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Orienteering In, Technical/Trade-General SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_orienteeringcatbonus" title="orienteeringcatbonus (Category Bonus)" value="@{cat-tech-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_orienteeringspecialmod" title="orienteeringspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_orienteeringitemmod" title="orienteeringitemmod (Bonus modification from Item)" value="0"/></span>
@@ -5959,7 +5959,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_useprepherbsstat" title="useprepherbsstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{sdbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Using Prepared Herbs Ag, Technical/Trade-General SD -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_useprepherbsstat" title="useprepherbsstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{sdbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Using Prepared Herbs Ag, Technical/Trade-General SD -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_useprepherbscatbonus" title="useprepherbscatbonus (Category Bonus)" value="@{cat-tech-general}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_useprepherbsspecialmod" title="useprepherbsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_useprepherbsitemmod" title="useprepherbsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6020,7 +6020,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_diagnostics1stat" title="diagnostics1stat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Diagnostics Em, Technical/Trade-Professional In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_diagnostics1stat" title="diagnostics1stat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Diagnostics Em, Technical/Trade-Professional In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_diagnostics1catbonus" title="diagnostics1catbonus (Category Bonus)" value="@{cat-tech-professional}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_diagnostics1specialmod" title="diagnostics1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_diagnostics1itemmod" title="diagnostics1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -6068,7 +6068,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_mechanition1stat" title="mechanition1stat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Mechanition Ag, Technical/Trade-Professional In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_mechanition1stat" title="mechanition1stat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Mechanition Ag, Technical/Trade-Professional In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_mechanition1catbonus" title="mechanition1catbonus (Category Bonus)" value="@{cat-tech-professional}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_mechanition1specialmod" title="mechanition1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_mechanition1itemmod" title="mechanition1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -6115,7 +6115,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_secondaidstat" title="secondaidstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Second Aid Em, Technical/Trade-Professional In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_secondaidstat" title="secondaidstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Second Aid Em, Technical/Trade-Professional In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_secondaidcatbonus" title="secondaidcatbonus (Category Bonus)" value="@{cat-tech-professional}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_secondaidspecialmod" title="secondaidspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_secondaiditemmod" title="secondaiditemmod (Bonus modification from Item)" value="0"/></span>
@@ -6131,7 +6131,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="intuition-a">In</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_surgerystat" title="surgerystat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{inbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Surgery Em, Technical/Trade-Professional In -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_surgerystat" title="surgerystat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{inbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Surgery Em, Technical/Trade-Professional In -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_surgerycatbonus" title="surgerycatbonus (Category Bonus)" value="@{cat-tech-professional}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_surgeryspecialmod" title="surgeryspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_surgeryitemmod" title="surgeryitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6241,7 +6241,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="presence-a">Pr</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_administrationstat" title="administrationstat (Stat Bonus)" value="[[@{prbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Administration Pr, Technical/Trade-Vocational Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_administrationstat" title="administrationstat (Stat Bonus)" value="[[@{prbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Administration Pr, Technical/Trade-Vocational Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_administrationcatbonus" title="administrationcatbonus (Category Bonus)" value="@{cat-tech-vocational}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_administrationspecialmod" title="administrationspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_administrationitemmod" title="administrationitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6274,7 +6274,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_boatpilot1stat" title="boatpilot1stat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Boat Pilot Ag, Technical/Trade-Vocational Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_boatpilot1stat" title="boatpilot1stat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Boat Pilot Ag, Technical/Trade-Vocational Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_boatpilot1catbonus" title="boatpilot1catbonus (Category Bonus)" value="@{cat-tech-vocational}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_boatpilot1specialmod" title="boatpilot1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_boatpilot1itemmod" title="boatpilot1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -6386,7 +6386,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_hypnosisstat" title="hypnosisstat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Hypnosis Em, Technical/Trade-Vocational Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_hypnosisstat" title="hypnosisstat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Hypnosis Em, Technical/Trade-Vocational Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_hypnosiscatbonus" title="hypnosiscatbonus (Category Bonus)" value="@{cat-tech-vocational}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_hypnosisspecialmod" title="hypnosisspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_hypnosisitemmod" title="hypnosisitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6403,7 +6403,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_midwiferystat" title="midwiferystat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Midwifery Em, Technical/Trade-Vocational Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_midwiferystat" title="midwiferystat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Midwifery Em, Technical/Trade-Vocational Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_midwiferycatbonus" title="midwiferycatbonus (Category Bonus)" value="@{cat-tech-vocational}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_midwiferyspecialmod" title="midwiferyspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_midwiferyitemmod" title="midwiferyitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6436,7 +6436,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_prepareherbsstat" title="prepareherbsstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Preparing Herbs Ag, Technical/Trade-Vocational Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_prepareherbsstat" title="prepareherbsstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Preparing Herbs Ag, Technical/Trade-Vocational Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_prepareherbscatbonus" title="prepareherbscatbonus (Category Bonus)" value="@{cat-tech-vocational}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_prepareherbsspecialmod" title="prepareherbsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_prepareherbsitemmod" title="prepareherbsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6453,7 +6453,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="self-discipline-a">SD</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_preparepoisonsstat" title="preparepoisonsstat (Stat Bonus)" value="[[@{sdbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Preparing Poisons SD, Technical/Trade-Vocational Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_preparepoisonsstat" title="preparepoisonsstat (Stat Bonus)" value="[[@{sdbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Preparing Poisons SD, Technical/Trade-Vocational Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_preparepoisonscatbonus" title="preparepoisonscatbonus (Category Bonus)" value="@{cat-tech-vocational}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_preparepoisonsspecialmod" title="preparepoisonsspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_preparepoisonsitemmod" title="preparepoisonsitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6589,7 +6589,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_minglingstat" title="minglingstat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Mingling Ag, Urban Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_minglingstat" title="minglingstat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Mingling Ag, Urban Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_minglingcatbonus" title="minglingcatbonus (Category Bonus)" value="@{cat-urban}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_minglingspecialmod" title="minglingspecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_minglingitemmod" title="minglingitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6622,7 +6622,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="empathy-a">Em</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="reasoning-a">Re</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_streetwisestat" title="streetwisestat (Stat Bonus)" value="[[@{embonus}*@{variablestatbonuscalc} +@{rebonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Streetwise Em, Urban Re -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_streetwisestat" title="streetwisestat (Stat Bonus)" value="[[@{embonus}*(1-@{variablestatbonuscalc}) +@{rebonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Streetwise Em, Urban Re -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_streetwisecatbonus" title="streetwisecatbonus (Category Bonus)" value="@{cat-urban}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_streetwisespecialmod" title="streetwisespecialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_streetwiseitemmod" title="streetwiseitemmod (Bonus modification from Item)" value="0"/></span>
@@ -6733,7 +6733,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he1stat" title="weapon1he1stat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Weapon-1h Edged Ag, Weapon-1h Edged St -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he1stat" title="weapon1he1stat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Weapon-1h Edged Ag, Weapon-1h Edged St -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he1catbonus" title="weapon1he1catbonus (Category Bonus)" value="@{cat-weapon-1hedged}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he1specialmod" title="weapon1he1specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he1itemmod" title="weapon1he1itemmod (Bonus modification from Item)" value="0"/></span>
@@ -6749,7 +6749,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he2stat" title="weapon1he2stat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Weapon-1h Edged Ag, Weapon-1h Edged St -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he2stat" title="weapon1he2stat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Weapon-1h Edged Ag, Weapon-1h Edged St -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he2catbonus" title="weapon1he2catbonus (Category Bonus)" value="@{cat-weapon-1hedged}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he2specialmod" title="weapon1he2specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he2itemmod" title="weapon1he2itemmod (Bonus modification from Item)" value="0"/></span>
@@ -6765,7 +6765,7 @@
 							<input type="checkbox" class="sheet-npc-variablestatbonuscalc-show sheet-rules-toggle" style="width: 1px;" title="variablestatbonuscalc" name="attr_variablestatbonuscalc" value="1" />
 							<span class="sheet-npc-variablestatbonuscalc sheet-table-data-skills-wide"><b><span data-i18n="agility-a">Ag</span></b></span>
 							<span class="sheet-npc-variablestatbonuscalc1 sheet-table-data-skills-wide"><b><span data-i18n="strength-a">St</span></b></span>
-							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he3stat" title="weapon1he3stat (Stat Bonus)" value="[[@{agbonus}*@{variablestatbonuscalc} +@{stbonus}*(1-@{variablestatbonuscalc})]]" disabled="true" /></span><!--Weapon-1h Edged Ag, Weapon-1h Edged St -->
+							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he3stat" title="weapon1he3stat (Stat Bonus)" value="[[@{agbonus}*(1-@{variablestatbonuscalc}) +@{stbonus}*@{variablestatbonuscalc}]]" disabled="true" /></span><!--Weapon-1h Edged Ag, Weapon-1h Edged St -->
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he3catbonus" title="weapon1he3catbonus (Category Bonus)" value="@{cat-weapon-1hedged}" disabled="true" /></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he3specialmod" title="weapon1he3specialmod (Any Special bonuses)" value="0"/></span>
 							<span class="sheet-table-data-skills"><input type="text" name="attr_weapon1he3itemmod" title="weapon1he3itemmod (Bonus modification from Item)" value="0"/></span>
@@ -8612,35 +8612,14 @@
 					<td><span data-i18n="subjective">Subjective</span>:</td>
 					<td>
 						<input type="text" class="sheet-table-data-center" style="width: 130px;" name="attr_subjectiveuc" title="subjectiveuc" data-i18n-placeholder="he-she-it-they-etc-uf" placeholder="He/She/It/They/etc" />
-						<!--select class="sheet-table-data-center-sm" style="height: 24px; width: 70px; font-size: 0.75em;" name="attr_subjectiveuc" title="subjectiveuc">
-							<option type="text" value="@{character_name}" selected>None</option>
-							<option type="text" value="He">He</option>
-							<option type="text"value="She">She</option>
-							<option type="text"value="It">It</option>
-							<option type="text"value="They">They</option>
-						</select-->
 					</td>
 					<td> &nbsp; <span data-i18n="objective">Objective</span>:</td>
 					<td>
 						<input type="text" class="sheet-table-data-center" style="width: 130px;" name="attr_objectiveuc" title="objectiveuc" data-i18n-placeholder="him-her-it-them-etc-uf" placeholder="Him/Her/It/Them/etc" />
-						<!--select class="sheet-table-data-center-sm" style="height: 24px; width: 70px; font-size: 0.75em;" name="attr_objectiveuc" title="objectiveuc">
-							<option type="text" value="@{character_name}" selected>None</option>
-							<option type="text" value="Him">Him</option>
-							<option type="text"value="Her">Her</option>
-							<option type="text"value="It">It</option>
-							<option type="text"value="Them">Them</option>
-						</select-->
 					</td>
 					<td> &nbsp; <span data-i18n="possessive">Possessive</span>:</td>
 					<td>
 						<input type="text" class="sheet-table-data-center" style="width: 130px;" name="attr_possessiveuc" title="possessiveuc" data-i18n-placeholder="his-hers-its-their-etc-uf" placeholder="His/Hers/Its/Their/etc" />
-						<!--select class="sheet-table-data-center-sm" style="height: 24px; width: 70px; font-size: 0.75em;" name="attr_possessiveuc" title="possessiveuc">
-							<option type="text" value="@{character_name}'s" selected>None</option>
-							<option type="text" value="His">His</option>
-							<option type="text"value="Hers">Hers</option>
-							<option type="text"value="Its">Its</option>
-							<option type="text"value="Their">Their</option>
-						</select-->
 					</td>
 				</tr>
 				<tr>
@@ -8648,46 +8627,19 @@
 					<td><span data-i18n="subjective">Subjective</span>:</td>
 					<td>
 						<input type="text" class="sheet-table-data-center" style="width: 130px;" name="attr_subjectivelc" title="subjectivelc" data-i18n-placeholder="he-she-it-they-etc" placeholder="he/she/it/they/etc" />
-						<!--select class="sheet-table-data-center-sm" style="height: 24px; width: 70px; font-size: 0.75em;" name="attr_subjectivelc" title="subjectivelc">
-							<option type="text" value="@{character_name}" selected>None</option>
-							<option type="text" value="he">he</option>
-							<option type="text"value="she">she</option>
-							<option type="text"value="it">it</option>
-							<option type="text"value="they">they</option>
-						</select-->
 					</td>
 					<td> &nbsp; <span data-i18n="objective">Objective</span>:</td>
 					<td>
 						<input type="text" class="sheet-table-data-center" style="width: 130px;" name="attr_objectivelc" title="objectivelc" data-i18n-placeholder="him-her-it-them-etc" placeholder="him/her/it/them/etc" />
-						<!--select class="sheet-table-data-center-sm" style="height: 24px; width: 70px; font-size: 0.75em;" name="attr_objectivelc" title="objectivelc">
-							<option type="text" value="@{character_name}" selected>None</option>
-							<option type="text" value="him">him</option>
-							<option type="text"value="her">her</option>
-							<option type="text"value="it">it</option>
-							<option type="text"value="them">them</option>
-						</select-->
 					</td>
 					<td> &nbsp; <span data-i18n="possessive">Possessive</span>:</td>
 					<td>
 						<input type="text" class="sheet-table-data-center" style="width: 130px;" name="attr_possessivelc" title="possessivelc" data-i18n-placeholder="his-hers-its-their-etc" placeholder="his/hers/its/their/etc" />
-						<!--select class="sheet-table-data-center-sm" style="height: 24px; width: 70px; font-size: 0.75em;" name="attr_possessivelc" title="possessivelc">
-							<option type="text" value="@{character_name}'s" selected>None</option>
-							<option type="text" value="his">his</option>
-							<option type="text"value="hers">hers</option>
-							<option type="text"value="its">its</option>
-							<option type="text"value="their">their</option>
-						</select-->
 					</td>
 				</tr>
 			</table>
 			<hr/>
 		</div>
-		<!--table>
-			<tr>
-				<td style="width: 30px;"><input type="checkbox" name="attr_recalc" title="recalc" value="1" /> </td>
-				<td style="text-align:left">Ability score recalc.  Click this box to force a recalc of the ability scores. (depreciated)</td>
-			</tr>
-		</table-->
 		<table>
 			<input type="checkbox" class="sheet-pc-skillstatsetup-show sheet-arrow" title="skillstatsetup-show" name="attr_skillstatsetup-show" value="1" checked /><span></span><td class="sheet-statlabel-big" style="width: 800px;"><span data-i18n="stat-bonus-setup-for-skills">Stat Bonus Setup For Skills</span></td>
 		</table>
@@ -8697,8 +8649,8 @@
 					<td colspan="2" style="border-bottom: thin solid silver;"><h3> <span data-i18n="variable-stat-bonus-based-on-skills">Variable Stat Bonuses Based on Skills</span>. </h3> <span data-i18n="variable-stat-bonus-directions">Set up to use the standard category stats with the skills rather than the alternate (individual) stats as explained in Variable Stat Bonuses Based on Skills, section A-9.2 in the Rolemaster Standard Rules.</span></td>
 				</tr>
 				<tr>
-					<td style="width: 30px; border-bottom: thin solid silver;"><input type="checkbox" name="attr_variablestatbonuscalc" title="variablestatbonuscalc" value="1" checked /> </td>
-					<td style="text-align:left; border-bottom: thin solid silver;"><span style="font-size: 1.2em;"><span data-i18n="variable-stat-bonus-based-on-skills">Variable Stat Bonuses Based on Skills.</span></span> <span data-i18n="stats-standard-stats-for-skills">(Uncheck the box to switch to the standard category stats for the skills.)</span>  </td>
+					<td style="width: 30px; border-bottom: thin solid silver;"><input type="checkbox" name="attr_variablestatbonuscalc" title="variablestatbonuscalc" value="1" /> </td>
+					<td style="text-align:left; border-bottom: thin solid silver;"><span style="font-size: 1.2em;"><span data-i18n="standard-stat-bonus-based-on-categories">Standard Stat Bonuses Based on Categories.</span></span> <span data-i18n="stats-standard-stats-for-skills">(Check the box to switch to the standard category stats for the skills.)</span>  </td>
 				</tr>
 			</table>
 			<hr/>