diff --git a/Star Wars Revised RPG/SWRRPG.html b/Star Wars Revised RPG/SWRRPG.html
index f2e37b77df..786868d611 100644
--- a/Star Wars Revised RPG/SWRRPG.html	
+++ b/Star Wars Revised RPG/SWRRPG.html	
@@ -95,26 +95,43 @@
     <td>
         <table>
             <tr>
-                <td class="sheet-statlabel-big" style="width: 70px;">Vit<br><div style="font-size: 0.65em;">Vitality</div></td>
+                <th>&nbsp;<br>&nbsp;<br>&nbsp;<br></th><th>&nbsp;</th>
+            <tr>
+                <td class="sheet-statlabel-big" style="width: 70px;">Vitality<br>&nbsp;</td>
                 <td><input class="sheet-inputbox" type="number" name="attr_vitalitycurrent" style="height: 24px; width: 50px;"><br><div style="font-size: 0.5em;">Current</div></td>
                 <td><input class="sheet-inputbox" type="number" name="attr_vitalitytotal" style="height: 24px; width: 50px;"><br><div style="font-size: 0.5em;">Total</div></td>
             </tr>
             <tr>
-                <td class="sheet-statlabel-big" style="width: 70px;">Wou<br><div style="font-size: 0.65em;">Wounds</div></td>
-                <td><input class="sheet-inputbox" type="number" name="attr_woundscurrent" style="height: 24px; width: 40px;"><br><div style="font-size: 0.5em;">Current</div></td>
-                <td><input class="sheet-inputbox" type="number" name="attr_woundstotal" style="height: 24px; width: 40px;"><br><div style="font-size: 0.5em;">Total</div></td>
+                <td class="sheet-statlabel-big" style="width: 70px;">Wounds<br>&nbsp;</td>
+                <td><input class="sheet-inputbox" type="number" name="attr_woundscurrent" style="height: 24px; width: 50px;"><br><div style="font-size: 0.5em;">Current</div></td>
+                <td><input class="sheet-inputbox" type="number" name="attr_woundstotal" style="height: 24px; width: 50px;"><br><div style="font-size: 0.5em;">Total</div></td>
             </tr>
-            <tr>
-                <td colspan="3"><input class="sheet-inputbox" type="text" name="attr_vitalitydice" style="height: 24px; width: 200px;"><br><div style="font-size: 0.5em;">Vitality Dice</div></td
-            </tr>
-        </table>    
+        </table>
         <table>
             <tr>
-                <td class="sheet-statlabel-big" style="width: 70px;">INITIATIVE<br><button type="roll" value="&{template:check} {{name=Initiative}} {{Roll=[[floor(@{dex}/2-5)+@{initmiscmod}+1d20]]}}" name="roll_initiative"</button></td>
-                <td><input class="sheet-inputbox" type="number" name="attr_init" style="height: 24px; width: 35px;" value="floor(@{dex}/2-5)+@{initmiscmod}" disabled="true"> =<br><div style="font-size: 0.5em;">Total<br>&nbsp;</div></td>
-                <td><input class="sheet-inputbox" type="number" name="attr_initdexmod" value="floor(@{dex}/2-5)" disabled="true" style="height: 24px; width: 33px;"> +<br><div style="font-size: 0.5em;">Dex<br>Modifier</div></td>
-                <td><input class="sheet-inputbox" type="number" name="attr_initmiscmod" value="0" style="height: 24px; width: 33px;"><br><div style="font-size: 0.5em;">Misc<br>Modifier</div></td>
+                <td class="sheet-statlabel-big" style="width: 70px;">Vitality<br>Dice</td>
+                <td><div style="float: left"><select style="width: 100px;" name="attr_vitalitydice">
+        <option value="0" selected>-</option>
+        <option value="1">1d6</option>
+        <option value="2">1d8</option>
+        <option value="4">1d10</option>
+    </select></td>
             </tr>
+
+        </table>
+        <br>
+        <table>
+            <tr>
+                <td style="width: 50px; height: 24px;" class="sheet-statlabel">Speed<div style="font-size: 0.65em;">Total</div></td>
+                <td valign="top"><input class="sheet-inputbox" type="text" name="attr_speed" style="height: 24px; width: 50px;"></td>
+            </tr>
+            <tr>
+                <td class="sheet-statlabel" style="width: 50px;">INITIATIVE<br><p>&darr;</p><button type="roll" value="&{template:check} {{name=Initiative}} {{Roll=[[floor(@{dex}/2-5)+@{initmiscmod}+1d20]]}}" style="height: 24px" name="roll_initiative"</button></td>
+                <td><input class="sheet-inputbox" type="number" name="attr_init" style="height: 24px; width: 40px;" value="floor(@{dex}/2-5)+@{initmiscmod}" disabled="true"> =<br><div style="font-size: 0.5em;">Total<br>&nbsp;</div></td>
+                <td><input class="sheet-inputbox" type="number" name="attr_initdexmod" value="floor(@{dex}/2-5)" disabled="true" style="height: 24px; width: 40px;"> +<br><div style="font-size: 0.5em;">Dex<br>Modifier</div></td>
+                <td><input class="sheet-inputbox" type="number" name="attr_initmiscmod" value="0" style="height: 24px; width: 40px;"><br><div style="font-size: 0.5em;">Misc<br>Modifier</div></td>
+            </tr>
+
         </table>
 
     </td>
@@ -126,11 +143,11 @@
                 <td style="width: 70px;" class="sheet-statlabel">AC<br><div style="font-size: 0.65em;">Armor Class</div></td>
                 <td><input class="sheet-inputbox" type="number" name="attr_armorclass" value="10+@{armorclassbonus}+@{armorclassmiscmod}+@{armorclasstempmod}+@{dexmod}+@{size}" disabled="true" style="height: 24px; width: 50px; font-weight: bolder"><br><div style="font-size: 0.5em;">Total<br>&nbsp;</div></td>
                 <td>= 10 +<br><br><br></td>
-                <td><input class="sheet-inputbox" type="number" name="attr_armorclassbonus" style="height: 24px; width: 35px;" value="0" > <br><div style="font-size: 0.5em;">Class<br>Bonus</div></td>
-                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclassdexmod" value="@{dexmod}" disabled="true" style="height: 24px; width: 35px;"> <br><div style="font-size: 0.5em;">Dex<br>Modifier</div></td>
-                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclasssizemod" value="@{size}" disabled="true" style="height: 24px; width: 35px;"> <br><div style="font-size: 0.5em;">Size<br>Modifier</div></td>
-                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclassmiscmod" value="0" style="height: 24px; width: 35px;"> <br><div style="font-size: 0.5em;">Misc<br>Modifier</div></td>
-                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclasstempmod" value="0" style="height: 24px; width: 35px;"> <br><div style="font-size: 0.5em;">Temp<br>Modifier</div></td>
+                <td><input class="sheet-inputbox" type="number" name="attr_armorclassbonus" style="height: 24px; width: 40px;" value="0" > <br><div style="font-size: 0.5em;">Class<br>Bonus</div></td>
+                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclassdexmod" value="@{dexmod}" disabled="true" style="height: 24px; width: 40px;"> <br><div style="font-size: 0.5em;">Dex<br>Modifier</div></td>
+                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclasssizemod" value="@{size}" disabled="true" style="height: 24px; width: 40px;"> <br><div style="font-size: 0.5em;">Size<br>Modifier</div></td>
+                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclassmiscmod" value="0" style="height: 24px; width: 40px;"> <br><div style="font-size: 0.5em;">Misc<br>Modifier</div></td>
+                <td>+ <input class="sheet-inputbox" type="number" name="attr_armorclasstempmod" value="0" style="height: 24px; width: 40px;"> <br><div style="font-size: 0.5em;">Temp<br>Modifier</div></td>
             </tr>
         </table>
     </td>
@@ -143,8 +160,6 @@
                 <td valign="top"><input class="sheet-inputbox" type="number" value="10+@{armorclassbonus}+@{armorclassmiscmod}+@{armorclasstempmod}+@{size}" disabled="true" name="attr_flatac" style="height: 24px; width: 50px; font-weight: bolder"><br><div style="font-size: 0.5em;">Total<br>&nbsp;</div></td>
                 <td style="width: 70px; height: 24px;" class="sheet-statlabel">AC Penalty<br><div style="font-size: 0.65em;">Armor Class Penalty</div></td>
                 <td valign="top"><input class="sheet-inputbox" type="text" name="attr_acpenalty" style="height: 24px; width: 100px;"></td>
-                <td style="width: 70px; height: 24px;" class="sheet-statlabel">Speed<br><div style="font-size: 0.65em;">Total</div></td>
-                <td valign="top"><input class="sheet-inputbox" type="text" name="attr_speed" style="height: 24px; width: 100px;"></td>
             </tr>
         </table>
         <br>
@@ -217,7 +232,7 @@
             </tr>
         </table>
 
-        <fieldset class="repeating_weapons">
+        <fieldset class="repeating_meleeweapons">
             <table cellpadding="0" cellspacing="0">
                 <tr>
                     <td colspan="3" class="sheet-statlabel-big" style="font-size: 1.5em; width: 260px;">Name</td>
@@ -251,7 +266,7 @@
             </tr>
         </table>
 
-        <fieldset class="repeating_weapons">
+        <fieldset class="repeating_rangedweapons">
             <table cellpadding="0" cellspacing="0">
                 <tr>
                     <td colspan="3" class="sheet-statlabel-big" style="font-size: 1.5em; width: 260px;">Name</td>
@@ -312,64 +327,217 @@
             <tr><td valign="top">
                 <table cellpadding="10" cellspacing="0">
                     <tr>
-                        <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 230px;">Gear</td>
+                        <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 190px;">Gear</td>
                     </tr>
                 </table>
 
                 <fieldset class="repeating_gear">
                     <table cellpadding="0" cellspacing="0">
                         <tr>
-                            <td class="sheet-statlabel" style="font-size: 1em; width: 200px;">Item Name</td>
+                            <td class="sheet-statlabel" style="font-size: 0.65em; width: 160px;">Item Name</td>
                             <td class="sheet-statlabel" style="font-size: 0.65em; width: 50px;">Wt.</td>
                         </tr>
                         <tr>
-                            <td><input class="sheet-inputbox" type="text" name="attr_gearitenname" style="height: 24px; width: 200px;"></td>
-                            <td><input class="sheet-inputbox" type="number" name="attr_gearitemwt" style="height: 24px; width: 50px;"></td>
+                            <td><input class="sheet-inputbox" type="text" name="attr_gearitemname" style="height: 24px; width: 160px;"></td>
+                            <td><input class="sheet-inputbox" type="text" name="attr_gearitemwt" style="height: 24px; width: 50px;"></td>
                         </tr>
                     </table>
+                    
                 </fieldset>
             </td>
             <td valign="top">
                 <table cellpadding="10" cellspacing="0">
                     <tr>
-                        <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 190px;">Feats</td>
+                        <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 230px;">Feats</td>
                     </tr>
                 </table>
 
                 <fieldset class="repeating_feats">
                     <table cellpadding="0" cellspacing="0">
                         <tr>
-                            <td class="sheet-statlabel" style="font-size: 1em; width: 210px;">Feat Name</td>
+                            <td class="sheet-statlabel" style="font-size: .65em; width: 250px;">Feat Name</td>
                         </tr>
                         <tr>
-                            <td><input class="sheet-inputbox" type="text" name="attr_gearitenname" style="height: 24px; width: 210px;"></td>
+                            <td><input class="sheet-inputbox" type="text" name="attr_featname" style="height: 24px; width: 250px;"></td>
                         </tr>
                     </table>
                 </fieldset>            
             </td>
             </tr>
         </table>
-        <h3>Notes</h3>
-
-		<textarea name="attr_notes" style="width: 450px"></textarea>
+        
+        <table cellpadding="10" cellspacing="0">
+            <tr>
+                <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 450px;">Character Notes</td>
+            </tr>
+        </table>
+		<textarea name="attr_notes" style="width: 460px"></textarea>
         
         <br>
-        <h3>Starships</h3>
 
-		<textarea name="attr_starships" style="width: 450px"></textarea>
-        
-        <br>
+        <table cellpadding="10" cellspacing="0">
+            <tr>
+                <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 450px;">Vehicles</td>
+            </tr>
+        </table>
+
+        <fieldset class="repeating_vehicles">
+            <table cellpadding="0" cellspacing="0">
+                <tr>
+                    <td class="sheet-statlabel-big" style="width: 140px;">Class</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Initiative</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Shield Points</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Hull Points</td>                    
+                </tr>
+                <tr>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehicleclass" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehicleinitiative" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehicleshieldpoints" style="height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclehullpoints" style="height: 24px; width: 95px;"></td>
+                </tr>            
+                <tr>
+                    <td class="sheet-statlabel" style="width: 140px;">Maneuver</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Defense</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Speed</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Max Velocity</td>
+                </tr>
+                <tr>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclemaneuver" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehicledefense" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclespeed" style="height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclemaxvelocity" style="height: 24px; width: 95px;"></td>
+                </tr>
+                <tr>
+                    <td class="sheet-statlabel" style="width: 140px;">Size</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Crew</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Passengers</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Cargo Capacity</td>
+                </tr>
+                <tr>
+                    <td>
+                    <select style="float: left; height: 24px; width: 80px;" name="attr_vehiclesize">
+                        <option value="-8">Colossal</option>
+                        <option value="-4">Gargantuan</option>
+                        <option value="-2">Huge</option>
+                        <option value="-1">Large</option>
+                        <option value="0" selected>Medium</option>
+                        <option value="1">Small</option>
+                        <option value="2">Tiny</option>
+                        <option value="4">Diminutive</option>
+                        <option value="8">Fine</option>
+                    </select>
+                    <input class="sheet-inputbox" type="text" name="attr_vehiclesizenumber" style=" float: right; height: 24px; width: 55px;">
+                    </td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclecrew" style="float: right; height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclepassengers" style="float: left; height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_vehiclecargocapacity" style="float: right; height: 24px; width: 95px;"></td>
+                </tr>
+            </table>
+        </fieldset>
 
     </td>
 </tr>
 
 </table>
+        <table cellpadding="10" cellspacing="0">
+            <tr>
+                <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 450px;">Vehicle Notes and Weapons</td>
+            </tr>
+        </table>
 
+		<textarea name="attr_vehiclenotes" style="width: 460px"></textarea>
+
+        <table cellpadding="10" cellspacing="0">
+            <tr>
+                <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 450px;">Starships</td>
+            </tr>
+        </table>
+
+        <fieldset class="repeating_starships">
+            <table cellpadding="0" cellspacing="0">
+                <tr>
+                    <td class="sheet-statlabel-big" style="width: 140px;">Class</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Initiative</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Shield Points</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Hull Points</td>                    
+                </tr>
+                <tr>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipclass" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipinitiative" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipshieldpoints" style="height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshiphullpoints" style="height: 24px; width: 95px;"></td>
+                </tr>            
+                <tr>
+                    <td class="sheet-statlabel" style="width: 140px;">Maneuver</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Defense</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Speed</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Max Velocity</td>
+                </tr>
+                <tr>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipmaneuver" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipdefense" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipspeed" style="height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipmaxvelocity" style="height: 24px; width: 95px;"></td>
+                </tr>
+                <tr>
+                    <td class="sheet-statlabel" style="width: 140px;">Max Speed in Space</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Atmospheric Speed</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Hyperdrive</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Consumables</td>
+                </tr>
+                <tr>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipmaxspeedinspace" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipatmosphericspeed" style="height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshiphyperdrive" style="height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipconsumables" style="height: 24px; width: 95px;"></td>
+                </tr>
+                <tr>
+                    <td class="sheet-statlabel" style="width: 140px;">Size</td>
+                    <td class="sheet-statlabel" style="width: 140px;">Crew</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Passengers</td>
+                    <td class="sheet-statlabel" style="width: 95px;">Cargo Capacity</td>
+                </tr>
+                <tr>
+                    <td>
+                    <select style="float: left; height: 24px; width: 80px;" name="attr_starshipsize">
+                        <option value="-8">Colossal</option>
+                        <option value="-4">Gargantuan</option>
+                        <option value="-2">Huge</option>
+                        <option value="-1">Large</option>
+                        <option value="0" selected>Medium</option>
+                        <option value="1">Small</option>
+                        <option value="2">Tiny</option>
+                        <option value="4">Diminutive</option>
+                        <option value="8">Fine</option>
+                    </select>
+                    <input class="sheet-inputbox" type="text" name="attr_starshipsizenumber" style=" float: right; height: 24px; width: 55px;">
+                    </td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipcrew" style="float: right; height: 24px; width: 140px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshippassengers" style="float: left; height: 24px; width: 95px;"></td>
+                    <td><input class="sheet-inputbox" type="text" name="attr_starshipcargocapacity" style="float: right; height: 24px; width: 95px;"></td>
+                </tr>
+            </table>
+        </fieldset>
+
+    </td>
+</tr>
+
+</table>
+        <table cellpadding="10" cellspacing="0">
+            <tr>
+                <td colspan="3" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 450px;">Starship Notes and Weapons</td>
+            </tr>
+        </table>
+		<textarea name="attr_starshipnotes" style="width: 460px"></textarea>
+        
+        <br>
 </div>
 
-
 <div style="float: left">
     <table>
+        <tr>
+            <th>&nbsp;<br>&nbsp;<br></th><th>&nbsp;</th>
+        </tr>
         <tr>
             <td class="sheet-statlabel-big" style="width: 70px;">Reputation Bonus<br><div style="font-size: 0.65em;"></div></td>
             <td><input class="sheet-inputbox" type="number" name="attr_reputationbonus" style="height: 24px; width: 95px;"><br><div style="font-size: 0.5em;">Total</div></td>
@@ -444,7 +612,13 @@
             <tr><td><input type='checkbox' name='attr_craftcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox"><input type="text" name="attr_craftname" style="width: 100px" ></td><td><input type="number" name="attr_crafttotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{craftranks}+@{craftmiscmod}" disabled="true"></td><td><input type="number" name="attr_craftabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_craftranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_craftmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Craft: @{craftname}}} {{Roll=[[@{crafttotal}+1d20]]}}" name="roll_craftcheck"</button> </td></tr>
         </table>
     </fieldset>
-        <b>Knowledge</b><br>
+    <b>Entertain</b><br>
+    <fieldset class="repeating_entertain">
+        <table style="width: 350px;">
+            <tr><td><input type='checkbox' name='attr_entertaincheckbox' value='1' /><span></span></td><td class="sheet-skillsbox"><input type="text" name="attr_entertainname" style="width: 100px" ></td><td><input type="number" name="attr_entertaintotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{entertainranks}+@{entertainmiscmod}" disabled="true"></td><td><input type="number" name="attr_entertainabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_entertainranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_entertainmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Entertain: @{entertainname}}} {{Roll=[[@{entertaintotal}+1d20]]}}" name="roll_entertaincheck"</button> </td></tr>
+        </table>
+    </fieldset>
+    <b>Knowledge</b><br>
     <fieldset class="repeating_craft">
         <table style="width: 350px;">
             <tr><td><input type='checkbox' name='attr_knowledgecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox"><input type="text" name=attr_knowledgename style="width: 100px" ></td><td><input type="number" name="attr_knowledgetotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{knowledgeranks}+@{knowledgemiscmod}" disabled="true"></td><td><input type="number" name="attr_knowledgeabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_knowledgeranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_knowledgemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Knowledge: @{knowledgename}}} {{Roll=[[@{knowledgetotal}+1d20]]}}" name="roll_knowledgecheck"</button> </td></tr>
@@ -481,6 +655,7 @@
             <th style="font-size: 0.6em;">Roll</th>
         </tr>
         <tr><td><input type='checkbox' name='attr_affectmindcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Affect Mind</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_affectmindtotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{affectmindranks}+@{affectmindmiscmod}" disabled="true"></td><td><input type="number" name="attr_affectmindabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_affectmindranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_affectmindmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Affect Mind}} {{Roll=[[@{affectmindtotal}+1d20]]}}" name="roll_affectmindcheck"</button> </td></tr>
+        <tr><td><input type='checkbox' name='attr_battleinfluencecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Battle Influence*</td><td class="sheet-skillsbox" style=>Alter, <br>B med, <br>Sense</td><td><input type="number" name="attr_battleinfluencetotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{battleinfluenceranks}+@{battleinfluencemiscmod}" disabled="true"></td><td><input type="number" name="attr_battleinfluenceabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_battleinfluenceranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_battleinfluencemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Battle Influence}} {{Roll=[[@{battleinfluencetotal}+1d20]]}}" name="roll_battleinfluencecheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_battlemindcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Battlemind</td><td class="sheet-skillsbox" style=>Control</td><td><input type="number" name="attr_battlemindtotal" style="width: 45px; font-weight: bolder" value="@{conmod}+@{battlemindranks}+@{battlemindmiscmod}" disabled="true"></td><td><input type="number" name="attr_battlemindabilitymod" style="width: 45px;" value="@{conmod}" disabled="true"></td><td><input type="number" name="attr_battlemindranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_battlemindmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Battlemind}} {{Roll=[[@{battlemindtotal}+1d20]]}}" name="roll_battlemindcheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_drainenergycheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">~Drain Energy*</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_drainenergytotal" style="width: 45px; font-weight: bolder" value="@{conmod}+@{drainenergyranks}+@{drainenergymiscmod}" disabled="true"></td><td><input type="number" name="attr_drainenergyabilitymod" style="width: 45px;" value="@{conmod}" disabled="true"></td><td><input type="number" name="attr_drainenergyranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_drainenergymiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Drain Energy}} {{Roll=[[@{drainenergytotal}+1d20]]}}" name="roll_drainenergycheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_empathycheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Empathy*</td><td class="sheet-skillsbox" style=>Force</td><td><input type="number" name="attr_empathytotal" style="width: 45px; font-weight: bolder" value="@{wismod}+@{empathyranks}+@{empathymiscmod}" disabled="true"></td><td><input type="number" name="attr_empathyabilitymod" style="width: 45px;" value="@{wismod}" disabled="true"></td><td><input type="number" name="attr_empathyranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_empathymiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Empathy}} {{Roll=[[@{empathytotal}+1d20]]}}" name="roll_empathycheck"</button> </td></tr>
@@ -490,6 +665,7 @@
         <tr><td><input type='checkbox' name='attr_fearcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">~Fear*</td><td class="sheet-skillsbox" style=>Sense</td><td><input type="number" name="attr_feartotal" style="width: 45px; font-weight: bolder" value="@{wismod}+@{fearranks}+@{fearmiscmod}" disabled="true"></td><td><input type="number" name="attr_fearabilitymod" style="width: 45px;" value="@{wismod}" disabled="true"></td><td><input type="number" name="attr_fearranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_fearmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Fear}} {{Roll=[[@{feartotal}+1d20]]}}" name="roll_fearcheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_forcedefensecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Force Defense</td><td class="sheet-skillsbox" style=>Control</td><td><input type="number" name="attr_forcedefensetotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{forcedefenseranks}+@{forcedefensemiscmod}" disabled="true"></td><td><input type="number" name="attr_forcedefenseabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_forcedefenseranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_forcedefensemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Force Defense}} {{Roll=[[@{forcedefensetotal}+1d20]]}}" name="roll_forcedefensecheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_forcegripcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">~Force Grip*</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_forcegriptotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{forcegripranks}+@{forcegripmiscmod}" disabled="true"></td><td><input type="number" name="attr_forcegripabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_forcegripranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_forcegripmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Force Grip}} {{Roll=[[@{forcegriptotal}+1d20]]}}" name="roll_forcegripcheck"</button> </td></tr>
+        <tr><td><input type='checkbox' name='attr_forcelightcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Force Light*</td><td class="sheet-skillsbox" style=>Alter <br>Sense</td><td><input type="number" name="attr_forcelighttotal" style="width: 45px; font-weight: bolder" value="@{wismod}+@{forcelightranks}+@{forcelightmiscmod}" disabled="true"></td><td><input type="number" name="attr_forcelightabilitymod" style="width: 45px;" value="@{wismod}" disabled="true"></td><td><input type="number" name="attr_forcelightranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_forcelightmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Force Light}} {{Roll=[[@{forcelighttotal}+1d20]]}}" name="roll_forcelightcheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_forcelightningcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">~Lightning*</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_forcelightningtotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{forcelightningranks}+@{forcelightningmiscmod}" disabled="true"></td><td><input type="number" name="attr_forcelightningabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_forcelightningranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_forcelightningmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Force Lightning}} {{Roll=[[@{forcelightningtotal}+1d20]]}}" name="roll_forcelightningcheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_forcestealthcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Force Stealth*</td><td class="sheet-skillsbox" style=>Control</td><td><input type="number" name="attr_forcestealthtotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{forcestealthranks}+@{forcestealthmiscmod}" disabled="true"></td><td><input type="number" name="attr_forcestealthabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_forcestealthranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_forcestealthmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Force Stealth}} {{Roll=[[@{forcestealthtotal}+1d20]]}}" name="roll_forcestealthcheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_forcestrikecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Force Strike*</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_forcestriketotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{forcestrikeranks}+@{forcestrikemiscmod}" disabled="true"></td><td><input type="number" name="attr_forcestrikeabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_forcestrikeranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_forcestrikemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Force Strike}} {{Roll=[[@{forcestriketotal}+1d20]]}}" name="roll_forcestrikecheck"</button> </td></tr>
@@ -497,8 +673,12 @@
         <tr><td><input type='checkbox' name='attr_healanothercheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Heal Another*</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_healanothertotal" style="width: 45px; font-weight: bolder" value="@{wismod}+@{healanotherranks}+@{healanothermiscmod}" disabled="true"></td><td><input type="number" name="attr_healanotherabilitymod" style="width: 45px;" value="@{wismod}" disabled="true"></td><td><input type="number" name="attr_healanotherranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_healanothermiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Heal Another}} {{Roll=[[@{healanothertotal}+1d20]]}}" name="roll_healanothercheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_healselfcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Heal Self*</td><td class="sheet-skillsbox" style=>Control</td><td><input type="number" name="attr_healselftotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{healselfranks}+@{healselfmiscmod}" disabled="true"></td><td><input type="number" name="attr_healselfabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_healselfranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_healselfmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Heal Self}} {{Roll=[[@{healselftotal}+1d20]]}}" name="roll_healselfcheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_illusioncheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Illusion</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_illusiontotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{illusionranks}+@{illusionmiscmod}" disabled="true"></td><td><input type="number" name="attr_illusionabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_illusionranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_illusionmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Illusion}} {{Roll=[[@{illusiontotal}+1d20]]}}" name="roll_illusioncheck"</button> </td></tr>
+        <tr><td><input type='checkbox' name='attr_inspirecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Inspire</td><td class="sheet-skillsbox" style=>Alter, <br>B med, <br>Sense</td><td><input type="number" name="attr_inspiretotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{inspireranks}+@{inspiremiscmod}" disabled="true"></td><td><input type="number" name="attr_inspireabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_inspireranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_inspiremiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Inspire}} {{Roll=[[@{inspiretotal}+1d20]]}}" name="roll_inspirecheck"</button> </td></tr>
+        <tr><td><input type='checkbox' name='attr_malaciacheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Malacia</td><td class="sheet-skillsbox" style=>All</td><td><input type="number" name="attr_malaciatotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{malaciaranks}+@{malaciamiscmod}" disabled="true"></td><td><input type="number" name="attr_malaciaabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_malaciaranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_malaciamiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Malacia}} {{Roll=[[@{malaciatotal}+1d20]]}}" name="roll_malaciacheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_moveobjectcheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Move Object*</td><td class="sheet-skillsbox" style=>Alter</td><td><input type="number" name="attr_moveobjecttotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{moveobjectranks}+@{moveobjectmiscmod}" disabled="true"></td><td><input type="number" name="attr_moveobjectabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_moveobjectranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_moveobjectmiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Move Object}} {{Roll=[[@{moveobjecttotal}+1d20]]}}" name="roll_moveobjectcheck"</button> </td></tr>
+        <tr><td><input type='checkbox' name='attr_plantsurgecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Plant Surge</td><td class="sheet-skillsbox" style=>Alter, <br>Ctrl, <br>Sense</td><td><input type="number" name="attr_plantsurgetotal" style="width: 45px; font-weight: bolder" value="@{intmod}+@{plantsurgeranks}+@{plantsurgemiscmod}" disabled="true"></td><td><input type="number" name="attr_plantsurgeabilitymod" style="width: 45px;" value="@{intmod}" disabled="true"></td><td><input type="number" name="attr_plantsurgeranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_plantsurgemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Plant Surge}} {{Roll=[[@{plantsurgetotal}+1d20]]}}" name="roll_plantsurgecheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_seeforcecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">See Force*</td><td class="sheet-skillsbox" style=>Sense</td><td><input type="number" name="attr_seeforcetotal" style="width: 45px; font-weight: bolder" value="@{wismod}+@{seeforceranks}+@{seeforcemiscmod}" disabled="true"></td><td><input type="number" name="attr_seeforceabilitymod" style="width: 45px;" value="@{wismod}" disabled="true"></td><td><input type="number" name="attr_seeforceranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_seeforcemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=See Force}} {{Roll=[[@{seeforcetotal}+1d20]]}}" name="roll_seeforcecheck"</button> </td></tr>
+        <tr><td><input type='checkbox' name='attr_severforcecheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Sever Force</td><td class="sheet-skillsbox" style=>Alter, <br>B med, <br>Sense</td><td><input type="number" name="attr_severforcetotal" style="width: 45px; font-weight: bolder" value="@{chamod}+@{severforceranks}+@{severforcemiscmod}" disabled="true"></td><td><input type="number" name="attr_severforceabilitymod" style="width: 45px;" value="@{chamod}" disabled="true"></td><td><input type="number" name="attr_severforceranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_severforcemiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Sever Force}} {{Roll=[[@{severforcetotal}+1d20]]}}" name="roll_severforcecheck"</button> </td></tr>
         <tr><td><input type='checkbox' name='attr_telepathycheckbox' value='1' /><span></span></td><td class="sheet-skillsbox">Telepathy</td><td class="sheet-skillsbox" style=>Sense</td><td><input type="number" name="attr_telepathytotal" style="width: 45px; font-weight: bolder" value="@{wismod}+@{telepathyranks}+@{telepathymiscmod}" disabled="true"></td><td><input type="number" name="attr_telepathyabilitymod" style="width: 45px;" value="@{wismod}" disabled="true"></td><td><input type="number" name="attr_telepathyranks" value="0" style="width: 45px;"></td><td><input type="number" name="attr_telepathymiscmod" value="0" style="width: 45px;"></td><td><button type="roll" value="&{template:check} {{name=Telepathy}} {{Roll=[[@{telepathytotal}+1d20]]}}" name="roll_telepathycheck"</button> </td></tr>
     </table