diff --git a/Hc Svnt Dracones/Hc Svnt Dracones.html b/Hc Svnt Dracones/Hc Svnt Dracones.html
index e333b21e79..cc5e467000 100644
--- a/Hc Svnt Dracones/Hc Svnt Dracones.html	
+++ b/Hc Svnt Dracones/Hc Svnt Dracones.html	
@@ -1,5 +1,4 @@
 
-
     <div class="sheet-top_half">
         <div class='sheet-2colrow'>
             <div class='sheet-col'>
@@ -26,10 +25,10 @@
                 </table>
                 <table class="sheet-table">
                     <tr>
-                        <th><button type="roll" class="sheet-skillbtn" name="attr_Mind_roll"  title="Roll" value="/e rolls Mind [[ {@{Mind-Select}@{Mind-Dice} + @{Selected-Skill}}>8 ]]">Mind</button></th>
-                        <th><button type="roll" class="sheet-skillbtn" name="attr_Body_roll"  title="Roll" value="/e rolls Body [[ {@{Body-Select}@{Body-Dice} + @{Selected-Skill}}>8 ]]">Body</button></th>
-                        <th><button type="roll" class="sheet-skillbtn" name="attr_Community_roll"  title="Roll" value="/e rolls Community [[ {@{Community-Select}@{Community-Dice} + @{Selected-Skill}}>8 ]]">Community</button></th>
-                        <th><button type="roll" class="sheet-skillbtn" name="attr_Economy_roll"  title="Roll" value="/e rolls Economy [[ {@{Economy-Select}@{Economy-Dice} + @{Selected-Skill}}>8 ]]">Economy</button></th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Mind_roll"  title="Roll" value="/e rolls Mind [[ {(@{Mind-Select}+@{Mod_Mod})@{Mind-Dice} + @{Selected-Skill}}>8 ]]">Mind</button></th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Body_roll"  title="Roll" value="/e rolls Body [[ {(@{Body-Select}+@{Mod_Mod})@{Body-Dice} + @{Selected-Skill}}>8 ]]">Body</button></th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Community_roll"  title="Roll" value="/e rolls Community [[ {(@{Community-Select}+@{Mod_Mod})@{Community-Dice} + @{Selected-Skill}}>8 ]]">Community</button></th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Economy_roll"  title="Roll" value="/e rolls Economy [[ {(@{Economy-Select}+@{Mod_Mod})@{Economy-Dice} + @{Selected-Skill}}>8 ]]">Economy</button></th>
                     </tr>
                     <tr>
                         <th><select class="sheet-Specialty" name="attr_Mind-Select">
@@ -91,6 +90,7 @@
             </div>
         </div>
     </div>
+    <br>
 <!-- Set up the Tabs -->
 <input type="radio" class="sheet-tab sheet-tab1" name="attr_core-tab" value="1" title="Attributes" checked="checked"/> 
 <span class="sheet-tab sheet-tab1" style='line-height: 20px;'>Attributes</span>
@@ -117,7 +117,6 @@
                 </tr>
                 <tr>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Mind-Dexterity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Dexterity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Dexterity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Dexterity" value="3" /><span></span>
@@ -125,7 +124,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Mind-Dexterity" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Body-Dexterity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Dexterity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Dexterity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Dexterity" value="3" /><span></span>
@@ -134,7 +132,6 @@
                     </th>
                     <th>Dexterity</th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Community-Dexterity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Dexterity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Dexterity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Dexterity" value="3" /><span></span>
@@ -142,7 +139,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Community-Dexterity" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Economy-Dexterity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Dexterity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Dexterity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Dexterity" value="3" /><span></span>
@@ -152,7 +148,6 @@
                 </tr>
                 <tr>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Mind-Resilience" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Resilience" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Resilience" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Resilience" value="3" /><span></span>
@@ -160,7 +155,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Mind-Resilience" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Body-Resilience" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Resilience" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Resilience" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Resilience" value="3" /><span></span>
@@ -169,7 +163,6 @@
                     </th>
                     <th>Resilience</th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Community-Resilience" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Resilience" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Resilience" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Resilience" value="3" /><span></span>
@@ -177,7 +170,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Community-Resilience" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Economy-Resilience" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Resilience" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Resilience" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Resilience" value="3" /><span></span>
@@ -187,7 +179,6 @@
                 </tr>
                 <tr>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Mind-Acuity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Acuity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Acuity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Acuity" value="3" /><span></span>
@@ -195,7 +186,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Mind-Acuity" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Body-Acuity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Acuity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Acuity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Acuity" value="3" /><span></span>
@@ -204,7 +194,6 @@
                     </th>
                     <th>Acuity</th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Community-Acuity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Acuity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Acuity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Acuity" value="3" /><span></span>
@@ -212,7 +201,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Community-Acuity" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Economy-Acuity" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Acuity" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Acuity" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Acuity" value="3" /><span></span>
@@ -222,7 +210,6 @@
                 </tr>
                 <tr>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Mind-Strength" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Strength" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Strength" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Strength" value="3" /><span></span>
@@ -230,7 +217,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Mind-Strength" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Body-Strength" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Strength" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Strength" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Strength" value="3" /><span></span>
@@ -239,7 +225,6 @@
                     </th>
                     <th>Strength</th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Community-Strength" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Strength" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Strength" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Strength" value="3" /><span></span>
@@ -247,7 +232,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Community-Strength" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Economy-Strength" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Strength" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Strength" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Strength" value="3" /><span></span>
@@ -257,7 +241,6 @@
                 </tr>
                 <tr>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Mind-Presence" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Presence" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Presence" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Mind-Presence" value="3" /><span></span>
@@ -265,7 +248,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Mind-Presence" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Body-Presence" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Presence" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Presence" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Body-Presence" value="3" /><span></span>
@@ -274,7 +256,6 @@
                     </th>
                     <th>Presence</th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Community-Presence" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Presence" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Presence" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Community-Presence" value="3" /><span></span>
@@ -282,7 +263,6 @@
                         <input type="radio" class="sheet-normal" name="attr_Community-Presence" value="5" /><span></span>
                     </th>
                     <th>
-                        <input type="radio" class="sheet-normal sheet-zero" name="attr_Economy-Presence" value="0"  /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Presence" value="1" checked="checked"/><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Presence" value="2" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Economy-Presence" value="3" /><span></span>
@@ -303,7 +283,7 @@
                         <option value="d10">d10</option>
                         <option value="d12">d12</option>
                     </select></th>
-                    <th></th>
+                    <th><input type="number" class="sheet-Rating" name="attr_Mod_Mod" value="0" /></th>
                     <th>
                         <select class="sheet-Specialty" name="attr_Community-Dice">
                         <option value="d8">d8</option>
@@ -338,11 +318,11 @@
                         </tr>
                         <tr>
                             <th>Nerve</th>
-                            <th><input type="number" class="sheet-Specialty" name="attr_Nerve" value="(@{Mind-Resilience}+@{Mind-Presence})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Nerve_2" value="(@{Mind-Resilience}+@{Mind-Presence})*5" disabled='true'/></th>
                         </tr>
                         <tr>
                             <th>Range</th>
-                            <th><input type="number" class="sheet-Specialty" name="attr_Range" value="(@{Body-Dexterity}+@{Mind-Acuity})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Range_2" value="(@{Body-Dexterity}+@{Mind-Acuity})*2" disabled='true'/></th>
                         </tr>
                     </table>
                 </div>
@@ -500,8 +480,8 @@
                     <th class="sheet-white"></th>
                 </tr>
                 <tr>
-                    <th class="sheet-white">Untrained</th>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey">Untrained</th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -510,7 +490,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="0" title="None" checked='true'/> 
                         <span class="sheet-skill_select">None</span></th>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -518,7 +498,7 @@
                 </tr>
                 <tr>
                     <td><h4>Science</h4></td>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -527,7 +507,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Booksmarts}" title="Booksmarts"/> 
                         <span class="sheet-skill_select">Booksmarts</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Booksmarts" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Booksmarts" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Booksmarts" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Booksmarts" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Booksmarts" value="3" /><span></span></th>
@@ -536,7 +516,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Medicine}" title="Medicine"/> 
                         <span class="sheet-skill_select">Medicine</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Medicine" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Medicine" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Medicine" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Medicine" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Medicine" value="3" /><span></span></th>
@@ -545,7 +525,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Science}" title="Science"/> 
                         <span class="sheet-skill_select">Science</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Science" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Science" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Science" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Science" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Science" value="3" /><span></span></th>
@@ -554,7 +534,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Investigation}" title="Investigation"/> 
                         <span class="sheet-skill_select">Investigation</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Investigation" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Investigation" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Investigation" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Investigation" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Investigation" value="3" /><span></span></th>
@@ -562,7 +542,7 @@
                 </tr>
                 <tr>
                     <td><h4>Engineering</h4></td>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -571,7 +551,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Computers}" title="Computers"/> 
                         <span class="sheet-skill_select">Computers</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Computers" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Computers" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Computers" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Computers" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Computers" value="3" /><span></span></th>
@@ -580,7 +560,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Craft}" title="Craft"/> 
                         <span class="sheet-skill_select">Craft</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Craft" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Craft" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Craft" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Craft" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Craft" value="3" /><span></span></th>
@@ -589,7 +569,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Repair}" title="Repair"/> 
                         <span class="sheet-skill_select">Repair</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Repair" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Repair" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Repair" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Repair" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Repair" value="3" /><span></span></th>
@@ -598,7 +578,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Robotics}" title="Robotics"/> 
                         <span class="sheet-skill_select">Robotics</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Robotics" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Robotics" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Robotics" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Robotics" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Robotics" value="3" /><span></span></th>
@@ -606,7 +586,7 @@
                 </tr>
                 <tr>
                     <td><h4>Combat</h4></td>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -615,7 +595,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{CQC}" title="CQC"/> 
                         <span class="sheet-skill_select">CQC</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_CQC" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_CQC" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_CQC" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_CQC" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_CQC" value="3" /><span></span></th>
@@ -624,7 +604,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Ranged_Combat}" title="Ranged Combat"/> 
                         <span class="sheet-skill_select">Ranged Combat</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Ranged_Combat" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Ranged_Combat" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Ranged_Combat" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Ranged_Combat" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Ranged_Combat" value="3" /><span></span></th>
@@ -633,7 +613,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Security}" title="Security"/> 
                         <span class="sheet-skill_select">Security</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Security" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Security" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Security" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Security" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Security" value="3" /><span></span></th>
@@ -642,7 +622,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Survival}" title="Survival"/> 
                         <span class="sheet-skill_select">Survival</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Survival" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Survival" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Survival" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Survival" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Survival" value="3" /><span></span></th>
@@ -650,7 +630,7 @@
                 </tr>
                 <tr>
                     <td><h4>Communications</h4></td>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -659,7 +639,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Coercion}" title="Coercion"/> 
                         <span class="sheet-skill_select">Coercion</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Coercion" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Coercion" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Coercion" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Coercion" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Coercion" value="3" /><span></span></th>
@@ -668,7 +648,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Command}" title="Command"/> 
                         <span class="sheet-skill_select">Command</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Command" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Command" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Command" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Command" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Command" value="3" /><span></span></th>
@@ -677,7 +657,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Deception}" title="Deception"/> 
                         <span class="sheet-skill_select">Deception</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Deception" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Deception" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Deception" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Deception" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Deception" value="3" /><span></span></th>
@@ -686,7 +666,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Express}" title="Express"/> 
                         <span class="sheet-skill_select">Express</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Express" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Express" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Express" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Express" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Express" value="3" /><span></span></th>
@@ -695,7 +675,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Inspire}" title="Inspire"/> 
                         <span class="sheet-skill_select">Inspire</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Inspire" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Inspire" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Inspire" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Inspire" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Inspire" value="3" /><span></span></th>
@@ -704,7 +684,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Intimidate}" title="Intimidate"/> 
                         <span class="sheet-skill_select">Intimidate</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Intimidate" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Intimidate" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Intimidate" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Intimidate" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Intimidate" value="3" /><span></span></th>
@@ -712,7 +692,7 @@
                 </tr>
                 <tr>
                     <td><h4>General</h4></td>
-                    <th class="sheet-white"></th>
+                    <th class="sheet-grey"></th>
                     <th class="sheet-black"></th>
                     <th class="sheet-white"></th>
                     <th class="sheet-black"></th>
@@ -721,7 +701,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Athletics}" title="Athletics"/> 
                         <span class="sheet-skill_select">Athletics</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Athletics" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Athletics" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Athletics" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Athletics" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Athletics" value="3" /><span></span></th>
@@ -730,7 +710,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Finance}" title="Finance"/> 
                         <span class="sheet-skill_select">Finance</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Finance" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Finance" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Finance" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Finance" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Finance" value="3" /><span></span></th>
@@ -739,7 +719,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Fly}" title="Fly"/> 
                         <span class="sheet-skill_select">Fly</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Fly" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Fly" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Fly" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Fly" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Fly" value="3" /><span></span></th>
@@ -748,7 +728,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Lockpick}" title="Lockpick"/> 
                         <span class="sheet-skill_select">Lockpick</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Lockpick" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Lockpick" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Lockpick" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Lockpick" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Lockpick" value="3" /><span></span></th>
@@ -757,7 +737,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Navigation}" title="Navigation"/> 
                         <span class="sheet-skill_select">Navigation</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Navigation" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Navigation" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Navigation" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Navigation" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Navigation" value="3" /><span></span></th>
@@ -766,7 +746,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Operate}" title="Operate"/> 
                         <span class="sheet-skill_select">Operate</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Operate" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Operate" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Operate" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Operate" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Operate" value="3" /><span></span></th>
@@ -775,7 +755,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Pilot}" title="Pilot"/> 
                         <span class="sheet-skill_select">Pilot</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Pilot" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Pilot" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Pilot" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Pilot" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Pilot" value="3" /><span></span></th>
@@ -784,7 +764,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Scent}" title="Scent"/> 
                         <span class="sheet-skill_select">Scent</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Scent" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Scent" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Scent" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Scent" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Scent" value="3" /><span></span></th>
@@ -793,7 +773,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Sneak}" title="Sneak"/> 
                         <span class="sheet-skill_select">Sneak</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Sneak" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Sneak" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Sneak" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Sneak" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Sneak" value="3" /><span></span></th>
@@ -802,7 +782,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Spot}" title="Spot"/> 
                         <span class="sheet-skill_select">Spot</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Spot" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Spot" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Spot" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Spot" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Spot" value="3" /><span></span></th>
@@ -811,7 +791,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Streetsmarts}" title="Streetsmarts"/> 
                         <span class="sheet-skill_select">Streetsmarts</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Streetsmarts" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Streetsmarts" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Streetsmarts" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Streetsmarts" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Streetsmarts" value="3" /><span></span></th>
@@ -820,7 +800,7 @@
                 <tr>
                     <th><input type="radio" class="sheet-skill_select" name="attr_Selected-Skill" value="@{Swim}" title="Swim"/> 
                         <span class="sheet-skill_select">Swim</span></th>
-                    <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Swim" value="0" checked="checked"/><span></span></th>
+                    <th class="sheet-grey"><input type="radio" class="sheet-forms" name="attr_Swim" value="0" checked="checked"/><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Swim" value="1" /><span></span></th>
                     <th class="sheet-white"><input type="radio" class="sheet-forms" name="attr_Swim" value="2" /><span></span></th>
                     <th class="sheet-black"><input type="radio" class="sheet-forms" name="attr_Swim" value="3" /><span></span></th>
@@ -840,23 +820,26 @@
                     <table class="sheet-table">
                         <tr>
                             <th>Hit Points</th>
-                            <th><th><input type="number" class="sheet-Specialty" name="attr_HitPoints" value="(@{Body-Strength}+@{Body-Resilience})*10" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_HitPoints" value="(@{Body-Strength}+@{Body-Resilience})*10" disabled='true'/></th>
                         </tr>
                         <tr>
                             <th>Readiness</th>
-                            <th><th><input type="number" class="sheet-Specialty" name="attr_Readiness" value="(@{Body-Acuity}+@{Mind-Dexterity})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Readiness" value="(@{Body-Acuity}+@{Mind-Dexterity})" disabled='true'/></th>
                         </tr>
                         <tr>
                             <th>Movement</th>
-                            <th><th><input type="number" class="sheet-Specialty" name="attr_Movement" value="(@{Body-Resilience}+@{Body-Dexterity})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Movement" value="(@{Body-Resilience}+@{Body-Dexterity}+@{Movement-Mod})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Rating" name="attr_Movement-Mod" value="0" /></th>
                         </tr>
                         <tr>
                             <th>Nerve</th>
-                            <th><th><input type="number" class="sheet-Specialty" name="attr_Nerve" value="(@{Mind-Resilience}+@{Mind-Presence})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Nerve" value="(@{Mind-Resilience}+@{Mind-Presence})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Nerve_2" value="(@{Mind-Resilience}+@{Mind-Presence})*5" disabled='true'/></th>
                         </tr>
                         <tr>
                             <th>Range</th>
-                            <th><th><input type="number" class="sheet-Specialty" name="attr_Range" value="(@{Body-Dexterity}+@{Mind-Acuity})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Range" value="(@{Body-Dexterity}+@{Mind-Acuity})" disabled='true'/></th>
+                            <th><input type="number" class="sheet-Specialty" name="attr_Range_2" value="(@{Body-Dexterity}+@{Mind-Acuity})*2" disabled='true'/></th>
                         </tr>
                     </table>
                 </div>
@@ -1010,12 +993,12 @@
                         <td colspan="3"><h5>Mind</h5></td>
                     </tr>
                     <tr>
-                        <th>Dodge</th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Mind_Dodge_roll"  title="Roll" value="/e rolls Mind/Dodge [[ { 1@{Mind-Dice} +[[ @{Dodge-Mind} ]] } ]]">Dodge</button></th>
                         <th><input type="number" class="sheet-Specialty" name="attr_Dodge-Mind" value="@{Mind-Dexterity} + @{Mind-Acuity} + @{Dodge-Mind_misc}" disabled='true'/></td>
                         <th><input type="number" class="sheet-Rating" name="attr_Dodge-Mind_misc" value="0" /></td>
                     </tr>
                     <tr>
-                        <th>Resist</th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Mind_Resist_roll"  title="Roll" value="/e rolls Mind/Resist [[ { 1@{Mind-Dice} +[[ @{Resist-Mind} ]] } ]]">Resist</button></th>
                         <th><input type="number" class="sheet-Specialty" name="attr_Resist-Mind" value="@{Mind-Strength} + @{Mind-Resilience} + @{Resist-Mind_misc}" disabled='true' /></td>
                         <th><input type="number" class="sheet-Rating" name="attr_Resist-Mind_misc" value="0" />
                     </tr>
@@ -1023,12 +1006,12 @@
                         <td colspan="3"><h5>Body</h5></td>
                     </tr>
                     <tr>
-                        <th>Dodge</th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Dodge_Body_roll"  title="Roll" value="/e rolls Body/Dodge [[ {1@{Body-Dice} + [[ @{Dodge-Body} ]] } ]]">Dodge</button></th>
                         <th><input type="number" class="sheet-Specialty" name="attr_Dodge-Body" value="@{Body-Dexterity} + @{Body-Acuity} + @{Dodge-Body_misc}" disabled='true'/></td>
                         <th><input type="number" class="sheet-Rating" name="attr_Dodge-Body_misc" value="0" /></td>
                     </tr>
                     <tr>
-                        <th>Resist</th>
+                        <th><button type="roll" class="sheet-skillbtn" name="attr_Resist_Body_roll"  title="Roll" value="/e rolls Body/Resist [[ {1@{Body-Dice} + [[ @{Resist-Body} ]] } ]]">Resist</button></th>
                         <th><input type="number" class="sheet-Specialty" name="attr_Resist-Body" value="@{Body-Strength} + @{Body-Resilience} + @{Resist-Body_misc}" disabled='true' /></td>
                         <th><input type="number" class="sheet-Rating" name="attr_Resist-Body_misc" value="0" />
                     </tr>
@@ -1189,7 +1172,8 @@
                 </tr>
                 <tr>
                     <th>Debt</th>
-                    <th><input type="number" class="sheet-Rating" name="attr_Debt" value="(@{Body-Resilience}+@{Body-Dexterity})" disabled='true'/></th>
+                    <th><input type="number" class="sheet-Specialty" name="attr_Debt" value="(@{Body-Resilience}+@{Body-Dexterity})+@{Debt-Mod}" disabled='true'/></th>
+                    <th><input type="number" class="sheet-Rating" name="attr_Debt-Mod" value="0" /></th>
                 </tr>
                 <tr>
                     <th>Econ Dice</th>
@@ -1226,11 +1210,11 @@
             <table class="sheet-table">
                 <tr>
                     <th>Max Active</th>
-                    <th><input type="number" class="sheet-Specialty" name="attr_Ledger_Score" value="(@{Economy-Presence}+@{Economy-Strength})" disabled='true'/></th>
+                    <th><input type="number" class="sheet-Specialty" name="attr_Implants_Active_max" value="0" /></th>
                 </tr>
                 <tr>
                     <th>Max Installed</th>
-                    <th><input type="number" class="sheet-Specialty" name="attr_Credits" value="0" /></th>
+                    <th><input type="number" class="sheet-Specialty" name="attr_Implants_Installed" value="0" /></th>
                 </tr>
             </table>
             <br>