diff --git a/Unisystem-Buffy or Angel/Buffy_or_Angel.html b/Unisystem-Buffy or Angel/Buffy_or_Angel.html
index c5a0afb6cf..2703fd8486 100644
--- a/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
+++ b/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
@@ -1,3 +1,5 @@
+
+
 <!-- Buffy/Angel RPG, made from All Flesh Must Be Eaten -->
 <!-- Version 1.03 -->
 
@@ -9,14 +11,12 @@
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab3" value="3" title="Combat" /><span></span>
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab4" value="4" title="Gear & Notes" /><span></span>
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab5" value="5" title="NPC Sheet" /><span></span>
-    <br>
-    <input type="radio" class="sheet-new sheet-hidden" name="attr_sheet_type3" value="0" checked/><span></span>
-    <input type="radio" class="sheet-old sheet-hidden" name="attr_sheet_type3" value="1" /><span></span>
-
     <!--TAB 1 -->
     <!-- Attributes -->
+<br>
     <div class="sheet-tab-content sheet-tab1">
         <div class="sheet-center">
+<br>
             <input type="text" class="sheet-bigname" name="attr_character_name" placeholder="Character Name" /><br> Character
             Type:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <input type="text" class="sheet-mediumname" name="attr_character_type" /><br> Character Archetype:&nbsp;<input
@@ -104,7 +104,7 @@
                     <tr>
                         <td></td>
                         <td>
-                            <h3>Life Points</h3>
+                            <h3>Life max</h3>
                         </td>
                         <td><input type="number" class="sheet-trait" name="attr_trait_base-Life_Points" value="0" /></td>
                     </tr>
@@ -114,9 +114,9 @@
                                            <tr>
                     <td></td>
                     <td>
-                        <h3>Wounds</h3>
+                        <h3>Life Points</h3>
                     </td>
-                    <td><input type="number" class="sheet-trait" name="attr_trait_NPC-Life_Points" value="0" /></td>
+                    <td><input type="number" class="sheet-trait" name="attr_trait_wounds_Points" value="0" /></td>
                 </tr>
                 <tr>
                     <td><br></td>
@@ -314,10 +314,10 @@
 
     <!--TAB 2 -->
     <!-- Skills -->
+      <br>
+      <br>
     <div class="sheet-tab-content sheet-tab2">
-        <h3>Skills</h3>
-        <br>
-        <div class='sheet-2colrow'>
+            <div class='sheet-2colrow'>
             <input type="radio" class="sheet-new sheet-hidden" name="attr_sheet_type5" value="0" checked/><span></span>
             <input type="radio" class="sheet-old sheet-hidden" name="attr_sheet_type5" value="1" /><span></span>
             <div class='sheet-col'>
@@ -339,6 +339,7 @@
                     <!-- Acrobatics -->
                     <tr>
                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Acrobatics} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Acrobatics_rating}+ @{Acrobatics_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
+                       
                         <td><input type="hidden" class="sheet-textbox" value="Acrobatics" disabled="true" name="attr_Acrobatics"
                             />&nbsp;&nbsp;&nbsp;Acrobatics</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Acrobatics_rating" value="0" /></td>
@@ -356,7 +357,7 @@
                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Art} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Art_rating}+ @{Art_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Art" disabled="true" name="attr_Art" />&nbsp;&nbsp;&nbsp;Art</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Art_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Art_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Art_attribute_select" >
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
                             <option value="@{base-Perception} + @{mod-Perception}">Per</option>
@@ -369,7 +370,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Computer" disabled="true" name="attr_Computer"
                             />&nbsp;&nbsp;&nbsp;Computer</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Computer_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Computer_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Computer_attribute_select" >
                             <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
                             <option value="@{base-Perception} + @{mod-Perception}">Per</option>
                             <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
@@ -380,7 +381,7 @@
                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Crime} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Crime_rating} + @{Crime_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Crime" disabled="true" name="attr_Crime" />&nbsp;&nbsp;&nbsp;Crime</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Crime_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Crime_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Crime_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -395,7 +396,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Doctor" disabled="true" name="attr_Doctor"
                             />&nbsp;&nbsp;&nbsp;Doctor</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Doctor_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Doctor_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Doctor_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -406,10 +407,10 @@
                     </tr>
                     <!-- Drive -->
                     <tr>
-                      <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Drive} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Drive_rating}++ @{Drive_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
+                      <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Drive} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Drive_rating}+ @{Drive_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Drive" disabled="true" name="attr_Drive" />&nbsp;&nbsp;&nbsp;Drive</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Drive_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Drive_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Drive_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -420,18 +421,34 @@
                     </tr>
                     <!-- Getting_Medieval -->
                     <tr>
-                        <td></td>
+                        <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Getting_Medieval} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Getting_Medieval_rating}+ @{Getting_Medieval_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Getting Medieval" disabled="true" name="attr_Getting_Medieval"
                             />&nbsp;&nbsp;&nbsp;Getting Medieval</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Getting_Medieval_rating" value="0" /></td>
-                        <td></td>
+                        <td><select class="sheet-skill_select" name="attr_Getting_Medieval_attribute_select" >
+                            <option value="@{base-Strength} + @{mod-Strength}">Str</option>
+                            <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
+                            <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
+                            <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
+                            <option value="@{base-Perception} + @{mod-Perception}">Per</option>
+                            <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
+                        </td>
+			<td></td>
                     </tr>
                     <!-- Gun_Fu -->
                     <tr>
-                        <td></td>
+                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Gun_Fu} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Gun_Fu_rating}+ @{Gun_Fu_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Gun Fu" disabled="true" name="attr_Gun_Fu"
                             />&nbsp;&nbsp;&nbsp;Gun Fu</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Gun_Fu_rating" value="0" /></td>
+                        <td><select class="sheet-skill_select" name="attr_Gun_Fu_attribute_select" >
+                            <option value="@{base-Strength} + @{mod-Strength}">Str</option>
+                            <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
+                            <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
+                            <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
+                            <option value="@{base-Perception} + @{mod-Perception}">Per</option>
+                            <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
+                        </td>
                         <td></td>
                     </tr>
                     <!-- Influence -->
@@ -440,7 +457,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Influence" disabled="true" name="attr_Influence"
                             />&nbsp;&nbsp;&nbsp;Influence</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Influence_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Influence_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Influence_attribute_select" >
                             <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
                             <option value="@{base-Perception} + @{mod-Perception}">Per</option>
                             <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
@@ -451,7 +468,7 @@
                        <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Wildcard2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Wildcard2_rating}+ @{Wildcard2_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_Wildcard2" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Wildcard2_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Wildcard2_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Wildcard2_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -484,7 +501,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Knowledge" disabled="true" name="attr_Knowledge"
                             />&nbsp;&nbsp;&nbsp;Knowledge</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Knowledge_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Knowledge_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Knowledge_attribute_select" >
                             <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
                             <option value="@{base-Perception} + @{mod-Perception}">Per</option>
                             <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
@@ -492,10 +509,17 @@
                     </tr>
                     <!-- Kung Fu -->
                     <tr>
-                        <td></td>
+                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Kung_Fu} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Kung_Fu_rating}+ @{Kung_Fu_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Kung Fu" disabled="true" name="attr_Kung_Fu"
                             />&nbsp;&nbsp;&nbsp;Kung Fu</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Kung_Fu_rating" value="0" /></td>
+                        <td><select class="sheet-skill_select" name="attr_Kung_Fu_attribute_select" >
+                            <option value="@{base-Strength} + @{mod-Strength}">Str</option>
+                            <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
+                            <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
+                            <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
+                            <option value="@{base-Perception} + @{mod-Perception}">Per</option>
+                            <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
                         <td></td>
                     </tr>
                     <!-- Languages -->
@@ -504,7 +528,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Languages" disabled="true" name="attr_Languages"
                             />&nbsp;&nbsp;&nbsp;Languages</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Languages_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Languages_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Languages_attribute_select" >
                             <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
                             <option value="@{base-Perception} + @{mod-Perception}">Per</option>
                             <option value="@{base-Willpower} + @{mod-Willpower}">Will</option>
@@ -516,7 +540,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Mr Fix It" disabled="true" name="attr_Mr_Fix_It"
                             />&nbsp;&nbsp;&nbsp;Mr Fix It</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Mr_Fix_It_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Mr_Fix_It_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Mr_Fix_It_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -531,7 +555,7 @@
                         <td><input type="Hidden" class="sheet-textbox" value="Notice" disabled="true" name="attr_Notice"
                             />&nbsp;&nbsp;&nbsp;Notice</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Notice_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Notice_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Notice_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -546,7 +570,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Occultism" disabled="true" name="attr_Occultism"
                             />&nbsp;&nbsp;&nbsp;Occultism</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Occultism_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Occultism_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Occultism_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -561,7 +585,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Science" disabled="true" name="attr_Science"
                             />&nbsp;&nbsp;&nbsp;Science</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Science_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Science_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Science_attribute_select" >
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
                             <option value="@{base-Intelligence} + @{mod-Intelligence}">Int</option>
@@ -575,7 +599,7 @@
                         <td><input type="hidden" class="sheet-textbox" value="Sports" disabled="true" name="attr_Sports"
                             />&nbsp;&nbsp;&nbsp;Sports</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Sports_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Sports_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Sports_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -589,7 +613,7 @@
  			<td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name}  rolls @{Wildcard1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Wildcard1_rating}+ @{Wildcard1_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_Wildcard1" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Wildcard1_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Wildcard1_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Wildcard1_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -603,7 +627,7 @@
 		<td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name}  rolls @{Wildcard3} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Wildcard3_rating}+ @{Wildcard3_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_Wildcard3" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Wildcard3_rating" value="0" /></td>
-                        <td><select class="sheet-skill_select" name="attr_Wildcard3_attribute_select" />
+                        <td><select class="sheet-skill_select" name="attr_Wildcard3_attribute_select" >
                             <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                             <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                             <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -628,7 +652,7 @@
                                 /></td>
                             <td><input type="number" class="sheet-numberbox" name="attr_WildcardRepeating2_rating" value="0"
                                 /></td>
-                            <td><select class="sheet-skill_select" name="attr_WildcardRepeating2_attribute_select" />
+                            <td><select class="sheet-skill_select" name="attr_WildcardRepeating2_attribute_select" >
                                 <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                                 <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                                 <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -648,7 +672,7 @@
                                 /></td>
                             <td><input type="number" class="sheet-numberbox" name="attr_WildcardRepeating1_rating" value="0"
                                 /></td>
-                            <td><select class="sheet-skill_select" name="attr_WildcardRepeating1_attribute_select" />
+                            <td><select class="sheet-skill_select" name="attr_WildcardRepeating1_attribute_select" >
                                 <option value="@{base-Strength} + @{mod-Strength}">Str</option>
                                 <option value="@{base-Dexterity} + @{mod-Dexterity}">Dex</option>
                                 <option value="@{base-Constitution} + @{mod-Constitution}">Con</option>
@@ -891,9 +915,8 @@
 
     <!--TAB 3 -->
     <!-- Combat Tab -->
+      <br>
     <div class="sheet-tab-content sheet-tab3">
-        <h3>Combat</h3>
-        <br>
         <h4><button type='roll' class="sheet-Initiative_roll" value="/e rolls Initiative [[@{base-Dexterity} + @{mod-Dexterity} + @{mod-Initiative} + 1d10 &{tracker}]]">Initiative</button>
             <input type="number" class="sheet-numberbox" name="attr_mod-Initiative" value="0" /> Modifier</h4>
         <br>
@@ -939,17 +962,17 @@
                 <th class="sheet-lb"><input type="number" name="attr_Punch_damage_base" value="[[2* (@{base-Strength} + @{mod-Strength})]]"
                         disabled="true" /></th>
             </tr>
-            <!-- Kick / Jump Kick -->
+            <!-- Airborne/ Jump Kick -->
             <tr>
-                <!-- Kick -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Kick_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Kick_attack_rating-1}+?{Modifiers|0}]] ]]+ @{Kick_damage_base} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
-                <td><input type="hidden" class="sheet-textbox" style="width:200px" value="Kick" disabled="true" name="attr_Kick_name-1"
-                    />&nbsp;&nbsp;&nbsp;Kick</td>
-                <th><input type="number" class="sheet-numberbox" style "width:150px" name="attr_Kick_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Kung_Fu_rating}-1"
+    <!-- get airborne -->
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} gets airborne}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Dexterity} + @{mod-Dexterity}+@{Acrobatics_rating}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button>
+                <td><input type="hidden" class="sheet-textbox" style="width:200px" value="Get airborne" disabled="true" name="attr_airborne_name-1"
+                    />&nbsp;&nbsp;&nbsp;Get Airborne </td>
+                <th><input type="number" class="sheet-numberbox" name="attr_airborne_rating-1" value="@{base-Dexterity} + @{mod-Dexterity}+@{Acrobatics_rating}"
                         disabled="true" /></th>
-                <th class="sheet-lb"><input type="number" name="attr_Kick_damage_base" value="[[2* (@{base-Strength} + @{mod-Strength}+1)]]"
-                        disabled="true" /></th>
-                <th class="sheet-lb"></th>
+      <th class="sheet-lb"><input type="text" class="sheet-textbox" style="width:70px" value="pg 131" disabled="true"
+                    /></th>    
+<th class="sheet-lb"></th>                        
                 <!-- Jump Kick -->
                 <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Jump_Kick_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{Jump_Kick_attack_rating-1}+?{Modifiers|0}]] ]]*2 +@{Jump_Kick_damage_base} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
                 <td><input type="hidden" class="sheet-textbox" style="width:200px" value="Jump Kick" disabled="true" name="attr_Jump_Kick_name-1"
@@ -1081,18 +1104,16 @@
                 <th class="sheet-lb"><input type="number" name="attr_Slam_Tackle_damage_base" value="2*([[@{base-Strength} + @{mod-Strength}]])"
                         disabled="true" /></th>
             </tr>
-            <!-- Knock-Out / Head Butt -->
+            <!-- Kick / Head Butt -->
             <tr>
-                <!-- Knockout -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} tries to @{Knockout_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{Knockout_attack_rating-1}+?{Modifiers|0}]]/2 ]]  +@{Knockout_damage_base}]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
-                <td><input type="hidden" class="sheet-textbox" style="width:200px" value="Knockout" disabled="true" name="attr_Knockout_name-1"
-                    />&nbsp;&nbsp;&nbsp;Knockout</td>
-                <!-- Max Parry is the max of Getting Medieval or Kung Fu. So the following agrees with pg 132 -->
-                <th><input type="number" class="sheet-numberbox" name="attr_Knockout_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Kung_Fu_rating}-2"
+		 <!-- Kick -->
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Kick_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Kick_attack_rating-1}+?{Modifiers|0}]] ]]+ @{Kick_damage_base} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
+                <td><input type="hidden" class="sheet-textbox" style="width:200px" value="Kick" disabled="true" name="attr_Kick_name-1"
+                    />&nbsp;&nbsp;&nbsp;Kick</td>
+                <th><input type="number" class="sheet-numberbox" style "width:150px" name="attr_Kick_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Kung_Fu_rating}-1"
                         disabled="true" /></th>
-                <th class="sheet-lb"><input type="number" name="attr_Knockout_damage_base" value="([[@{base-Strength} + @{mod-Strength}]])"
+                <th class="sheet-lb"><input type="number" name="attr_Kick_damage_base" value="[[2* (@{base-Strength} + @{mod-Strength}+1)]]"
                         disabled="true" /></th>
-                    /></th>
                 <th class="sheet-lb"></th>
                 <!-- Head Butt -->
                 <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} tries to @{Head_Butt_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{Head_Butt_attack_rating-1}+?{Modifiers|0}]] ]]  +@{Head_Butt_damage_base}]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
@@ -1122,7 +1143,12 @@
                     /></th>
                 <th class="sheet-lb"><input type="text" class="sheet-textbox" style="width:70px" value="pg 131" disabled="true"
                     /></th>
+ <!-- Aim / Knockout -->
             </tr>
+
+<tr>
+
+
             <!-- Combat Maneuver1 / Combat Maneuver2 -->
             <tr>
                 <!-- Combat Maneuver1 -->
@@ -1153,8 +1179,7 @@
                 <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
                 <th>Multiplier</th>
                 <th class="sheet-rb" title="Bash or Slash/Stab">Type</th>
-                <th class="sheet-rb">Two<br>Handed?</th>
-                <th class="sheet-lb"></th>
+                               <th class="sheet-lb"></th>
                 <th class="sheet-lb">Button</th>
                 <td>
                     <h5>Weapon</h5>
@@ -1163,11 +1188,10 @@
                 <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
                 <th>Multiplier</th>
                 <th class="sheet-rb" title="Bash or Slash/Stab">Type</th>
-                <th>Two<br>Handed?</th>
-            </tr>
+                          </tr>
             <tr>
                <!-- Stake -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Mongo_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Mongo_attack_rating-1}+?{Modifiers|0}]] ]]*@{Mongo_damage_Multiplier-1}+ @{Mongo_damage_base-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Mongo_name-1} }} [[( [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Mongo_attack_rating-1}+?{Modifiers|0}]] ]]+ @{Mongo_damage_base-1})*@{Mongo_damage_Multiplier-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
                 <td><input type="hidden" class="sheet-textbox" style="width:115px" value="Stake" disabled="true" name="attr_Mongo_name-1"
                     />&nbsp;&nbsp;&nbsp;Stake</td>
                 <th><input type="number" class="sheet-numberbox" name="attr_Mongo_attack_rating-1" / value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
@@ -1176,15 +1200,15 @@
                         disabled="true" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_Mongo_damage_Multiplier-1" value="@{Mongo_damage_type-1}"
                         disabled="true" /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Mongo_damage_type-1" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Mongo_damage_type-1" >
                     <option value="1">Bash</option>
 		  <option value="2">Stab</option>
                     </select>
                 </th>
                 <th class="sheet-rb"></th>
-                <th class="sheet-lb"></th>
+            
                 <!-- Stake Through the Heart -->
-                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Bongo_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Bongo_attack_rating-1}+?{Modifiers|0}]] ]]*@{Bongo_damage_Multiplier-1}+ @{Bongo_damage_base-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
+                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Bongo_name-1} }} [[ ([[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Bongo_attack_rating-1}+?{Modifiers|0}]] ]]+ @{Bongo_damage_base-1})*@{Bongo_damage_Multiplier-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
                 <td><input type="hidden" class="sheet-textbox" style="width:115px" value="Stake thru Heart" disabled="true"
                         name="attr_Bongo_name-1" />&nbsp;&nbsp;&nbsp;Stake thru Heart</td>
                 <th><input type="number" class="sheet-numberbox" name="attr_Bongo_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}-3"
@@ -1193,7 +1217,7 @@
                         disabled="true" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_Bongo_damage_Multiplier-1" value="@{Bongo_damage_type-1}"
                         disabled="true" /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Bongo_damage_type-1" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Bongo_damage_type-1" >
                     <option value="4">Thru Heart</option>
                     <option value="5">Vampire Heart</option>
                     </select>
@@ -1209,7 +1233,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-1" 
                     /></th>
 	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-1" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-1" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-1" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1220,7 +1244,7 @@
 			
                 </th>
                 <th class="sheet-rb"></th>
-                <th class="sheet-lb"></th>
+              
 
                 <!-- Melee 2 -->
                 <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-2" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-2}-@{melee_weapon_attack_penalty-2}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-2}+ (@{melee_weapon_damage_base-2}*@{melee_weapon_damage_Multiplier-2}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
@@ -1230,7 +1254,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-2" 
                     /></th>
  		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-2" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-2" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-2" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1250,7 +1274,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-3" 
                     /></th>
 	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-3" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-3" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-3" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1261,7 +1285,7 @@
 			
                 </th>
                 <th class="sheet-rb"></th>
-                <th class="sheet-lb"></th>
+              
 
                 <!-- Melee 4 -->
                 <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-4" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-4} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-4}-@{melee_weapon_attack_penalty-4}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-4}+ (@{melee_weapon_damage_base-4}*@{melee_weapon_damage_Multiplier-4}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
@@ -1271,7 +1295,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-4" 
                     /></th>
  		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-4" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-4" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-4" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1291,7 +1315,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-5" 
                     /></th>
 	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-5" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-5" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-5" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1302,7 +1326,7 @@
 			
                 </th>
                 <th class="sheet-rb"></th>
-                <th class="sheet-lb"></th>
+              
 
                 <!-- Melee 6 -->
                 <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-6" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-6} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-6}-@{melee_weapon_attack_penalty-6}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-6}+ (@{melee_weapon_damage_base-6}*@{melee_weapon_damage_Multiplier-6}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
@@ -1312,7 +1336,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-6" 
                     /></th>
  		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-6" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-6" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-6" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1332,7 +1356,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-7" 
                     /></th>
 	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-7" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-7" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-7" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1343,7 +1367,7 @@
 			
                 </th>
                 <th class="sheet-rb"></th>
-                <th class="sheet-lb"></th>
+             
 
                 <!-- Melee 8 -->
                 <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-8" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-8} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-8}-@{melee_weapon_attack_penalty-8}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-8}+ (@{melee_weapon_damage_base-8}*@{melee_weapon_damage_Multiplier-8}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
@@ -1353,7 +1377,7 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-8" 
                     /></th>
  		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-8" value="0" readonly /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-8" />
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-8" >
                     <option value="bash">Bash</option>
                     <option value="slash">Slash/Stab</option>
                     <option value="heart">Thru Heart</option>
@@ -1373,33 +1397,30 @@
   
                <table style="width:100%">
             <tr>
+  			<td></td>
+                <td></td>
+                <td></td>
+                <td></td>
                 <td></td>
                 <td></td>
-                <th style="width:120px">Rate of Fire /</th>
                 <td></td>
-                <th class="sheet-lb sheet-rb" colspan="2">Damage</th>
-                <th colspan="5">Range</th>
-                <th class="sheet-lb"></th>
             </tr>
             <tr>
                 <th>Button</th>
                 <td>
-                    <h5>Medieval Ranged Weapon</h5>
+                <h5>Medieval Ranged Weapon</h5>
                 </td>
-                <th>Number of Attacks</th>
+                <th>ROF</th>
                 <th>Maneuver<br>Rating</th>
                 <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
                 <th class="sheet-rb">Multiplier</th>
-                <th>Point<br>Blank</th>
                 <th>Short</th>
                 <th>Medium</th>
                 <th>Long</th>
-                <th>Extreme</th>
-                <th class="sheet-lb">Aimed?</th>
                 <th title="Slash/Stab or Bash">Type</th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-1}+@{medieval_weapon_aim-1}+?{Modifiers|0}]] ]]*@{medieval_weapon_damage_Multiplier-1}+ @{medieval_weapon_damage_base-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-1} }} [[ ([[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-1}+?{Modifiers|0}]] ]]+ @{medieval_weapon_damage_base-1}) * @{medieval_weapon_damage_Multiplier-1}]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_medieval_weapon_name-1" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_RoF-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
@@ -1407,15 +1428,11 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_base-1"
                     / value="(@{base-Strength} + @{mod-Strength})*(@{weapon_damage_Multiplier-1})"></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_Multiplier-1"
-                        value="@{medieval_weapon_damage_type-1}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_PointBlank-1" /></th>
+                        value="@{medieval_weapon_damage_type-1}" disabled="true" ></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Short-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Medium-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Long-1" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Extreme-1" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_medieval_weapon_aim-1"
-                        value="@{base-Perception} + @{mod-Perception} + @{Getting_Medieval_rating}" /></th>
-                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-1" />
+                 <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-1" >
                     <option value="2">Slash/Stab</option>
                     <option value="1">Bash</option>
                     <option value="4">Thru Heart</option>
@@ -1423,7 +1440,7 @@
                     </select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-2}+@{medieval_weapon_aim-2}+?{Modifiers|0}]] ]]*@{medieval_weapon_damage_Multiplier-2}+ @{medieval_weapon_damage_base-2} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-2} }} [[ ([[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-2}+?{Modifiers|0}]] ]]+ @{medieval_weapon_damage_base-2})*@{medieval_weapon_damage_Multiplier-2} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_medieval_weapon_name-2" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_RoF-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_attack_rating-2" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
@@ -1431,15 +1448,11 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_base-2"
                     / value="(@{base-Strength} + @{mod-Strength})*(@{weapon_damage_Multiplier-2})"></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_Multiplier-2"
-                        value="@{medieval_weapon_damage_type-2}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_PointBlank-2" /></th>
+                        value="@{medieval_weapon_damage_type-2}" disabled="true" ></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Short-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Medium-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Long-2" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Extreme-2" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_medieval_weapon_aim-2"
-                        value="@{base-Perception} + @{mod-Perception} + @{Getting_Medieval_rating}" /></th>
-                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-2" />
+                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-2" >
                     <option value="2">Slash/Stab</option>
                     <option value="1">Bash</option>
                     <option value="4">Thru Heart</option>
@@ -1447,7 +1460,7 @@
                     </select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-3} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-3}+@{medieval_weapon_aim-3}+?{Modifiers|0}]] ]]*@{medieval_weapon_damage_Multiplier-3}+ @{medieval_weapon_damage_base-3} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-3} }} [[ ([[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-3}+?{Modifiers|0}]] ]]+@{medieval_weapon_damage_Multiplier-3})* @{medieval_weapon_damage_base-3} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_medieval_weapon_name-3" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_RoF-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_attack_rating-3" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
@@ -1455,15 +1468,11 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_base-3"
                     / value="(@{base-Strength} + @{mod-Strength})*(@{weapon_damage_Multiplier-3})"></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_Multiplier-3"
-                        value="@{medieval_weapon_damage_type-3}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_PointBlank-3" /></th>
+                        value="@{medieval_weapon_damage_type-3}" disabled="true" ></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Short-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Medium-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Long-3" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Extreme-3" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_medieval_weapon_aim-3"
-                        value="@{base-Perception} + @{mod-Perception} + @{Getting_Medieval_rating}" /></th>
-                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-3" />
+                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-3" >
                     <option value="2">Slash/Stab</option>
                     <option value="1">Bash</option>
                     <option value="4">Thru Heart</option>
@@ -1471,7 +1480,7 @@
                     </select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-4} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-4}+@{medieval_weapon_aim-4}]] ]]*@{medieval_weapon_damage_Multiplier-4}+ @{medieval_weapon_damage_base-4} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{medieval_weapon_name-4} }} [[( [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{medieval_weapon_attack_rating-4}+?{Modifiers|0}]] ]]+@{medieval_weapon_damage_base-4})*@{medieval_weapon_damage_Multiplier-4} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_medieval_weapon_name-4" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_RoF-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_attack_rating-4" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
@@ -1479,15 +1488,11 @@
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_base-4"
                     / value="(@{base-Strength} + @{mod-Strength})*(@{weapon_damage_Multiplier-4})"></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_damage_Multiplier-4"
-                        value="@{medieval_weapon_damage_type-4}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_PointBlank-4" /></th>
+                        value="@{medieval_weapon_damage_type-4}" disabled="true" ></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Short-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Medium-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Long-4" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_medieval_weapon_range_Extreme-4" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_medieval_weapon_aim-4"
-                        value="@{base-Perception} + @{mod-Perception} + @{Getting_Medieval_rating}" /></th>
-                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-4" />
+                <th><select class="sheet-skill_select" name="attr_medieval_weapon_damage_type-4" >
                     <option value="2">Slash/Stab</option>
                     <option value="1">Bash</option>
                     <option value="4">Thru Heart</option>
@@ -1502,126 +1507,103 @@
             <tr>
                 <td></td>
                 <td></td>
-                <th style="width:120px">Rate of Fire /</th>
                 <td></td>
-                <th class="sheet-lb sheet-rb" colspan="2">Damage</th>
-                <th colspan="5">Range</th>
-                <th class="sheet-lb"></th>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
             </tr>
             <tr>
                 <th>Button</th>
                 <td>
                     <h5>Modern Ranged Weapon</h5>
                 </td>
-                <th>Number of Attacks</th>
+                <th>ROF</th>
                 <th>Maneuver<br>Rating</th>
                 <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
                 <th class="sheet-rb">Multiplier</th>
-                <th>Point<br>Blank</th>
                 <th>Short</th>
                 <th>Medium</th>
                 <th>Long</th>
-                <th>Extreme</th>
-                <th class="sheet-lb">Aimed?</th>
                 <th title="Bullet or Alternate Value">Type</th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-1}, rolling [[@{weapon_attack_rating-1} + @{weapon_aim-1} + d10]] to hit and [[(@{weapon_damage_base-1})*(@{weapon_damage_type-1})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
+ <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{weapon_name-1} }} [[ ([[{9,11,13,15,17,21,24,27,30}<[[1d10+@{weapon_attack_rating-1}+?{Modifiers|0}]] ]]+ @{weapon_damage_base-1})*@{weapon_damage_Multiplier-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-1" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Gun_Fu_rating}"
-                        disabled="true" /></th>
+                        disabled="true" ></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_base-1" /></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_Multiplier-1"
                         value="@{weapon_damage_type-1}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_PointBlank-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Short-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Medium-1" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Long-1" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Extreme-1" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_aim-1" value="@{base-Perception} + @{mod-Perception} + @{Gun_Fu_rating}"
-                    /></th>
-                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-1" />
+                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-1" >
                     <option value="2">Bullet</option>
                     <option value="1">Non-Bullet</option></select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-2}, rolling [[@{weapon_attack_rating-2} + @{weapon_aim-2} + d10]] to hit and [[(@{weapon_damage_base-2})*(@{weapon_damage_type-2})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{weapon_name-2} }} [[ ([[{9,11,13,15,17,21,24,27,30}<[[1d10+@{weapon_attack_rating-2}]] ]]+ @{weapon_damage_base-2})*@{weapon_damage_Multiplier-2} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button></th>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-2" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-2" value="@{base-Dexterity} + @{mod-Dexterity} + @{Gun_Fu_rating}"
-                        disabled="true" /></th>
+                        disabled="true" ></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_base-2" /></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_Multiplier-2"
                         value="@{weapon_damage_type-2}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_PointBlank-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Short-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Medium-2" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Long-2" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Extreme-2" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_aim-2" value="@{base-Perception} + @{mod-Perception} + @{Gun_Fu_rating}"
-                    /></th>
-                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-2" />
+                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-2" >
                     <option value="2">Bullet</option>
                     <option value="1">Non-Bullet</option></select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-3}, rolling [[@{weapon_attack_rating-3} + @{weapon_aim-3} + d10]] to hit and [[(@{weapon_damage_base-3})*(@{weapon_damage_type-3})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
+                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-3}, rolling [[@{weapon_attack_rating-3} + d10]] to hit and [[(@{weapon_damage_base-3})*(@{weapon_damage_type-3})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-3" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-3" value="@{base-Dexterity} + @{mod-Dexterity} + @{Gun_Fu_rating}"
-                        disabled="true" /></th>
+                        disabled="true" ></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_base-3" /></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_Multiplier-3"
                         value="@{weapon_damage_type-3}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_PointBlank-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Short-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Medium-3" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Long-3" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Extreme-3" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_aim-3" value="@{base-Perception} + @{mod-Perception} + @{Gun_Fu_rating}"
-                    /></th>
-                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-3" />
+                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-3" >
                     <option value="2">Bullet</option>
                     <option value="1">Non-Bullet</option></select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-4}, rolling [[@{weapon_attack_rating-4} + @{weapon_aim-4} + d10]] to hit and [[(@{weapon_damage_base-4})*(@{weapon_damage_type-4})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
+                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-4}, rolling [[@{weapon_attack_rating-4} + d10]] to hit and [[(@{weapon_damage_base-4})*(@{weapon_damage_type-4})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-4" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-4" value="@{base-Dexterity} + @{mod-Dexterity} + @{Gun_Fu_rating}"
-                        disabled="true" /></th>
+                        disabled="true" ></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_base-4" /></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_Multiplier-4"
                         value="@{weapon_damage_type-4}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_PointBlank-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Short-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Medium-4" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Long-4" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Extreme-4" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_aim-4" value="@{base-Perception} + @{mod-Perception} + @{Gun_Fu_rating}"
-                    /></th>
-                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-4" />
+                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-4" >
                     <option value="2">Bullet</option>
                     <option value="1">Non-Bullet</option></select></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-5}, rolling [[@{weapon_attack_rating-5} + @{weapon_aim-5} + d10]] to hit and [[(@{weapon_damage_base-5})*(@{weapon_damage_type-5})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
+                <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-5}, rolling [[@{weapon_attack_rating-5} + d10]] to hit and [[(@{weapon_damage_base-5})*(@{weapon_damage_type-5})]] damage (add Damage Modifier x Success Levels to damage)."></button></th>
                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-5" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-5" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-5" value="@{base-Dexterity} + @{mod-Dexterity} + @{Gun_Fu_rating}"
-                        disabled="true" /></th>
+                        disabled="true"></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_base-5" /></th>
                 <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_weapon_damage_Multiplier-5"
                         value="@{weapon_damage_type-5}" disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_PointBlank-5" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Short-5" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Medium-5" /></th>
                 <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Long-5" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_weapon_range_Extreme-5" /></th>
-                <th class="sheet-lb"><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_aim-5" value="@{base-Perception} + @{mod-Perception} + @{Gun_Fu_rating}"
-                    /></th>
-                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-5" />
+                <th><select class="sheet-skill_select" name="attr_weapon_damage_type-5" >
                     <option value="2">Bullet</option>
                     <option value="1">Non-Bullet</option></select></th>
             </tr>
@@ -1629,93 +1611,35 @@
         <br>
         <!-- Armor -->
         <h3>Armor</h3>
-        <table style="width:70%">
+        <table style="width:50%">
             <tr>
-                <th></th>
-                <th></th>
-                <th class="sheet-lb sheet-rb" colspan="3">Armor Value</th>
-                <th></th>
-                <th></th>
-            </tr>
-            <tr>
-                <th>Roll</th>
+               
                 <td>
                     <h5>Type</h5>
                 </td>
-                <th class="sheet-lb">Dice</th>
-                <th>Multiplier</th>
-                <th class="sheet-rb">Modifier</th>
-                <th>EV</th>
-                <th>Auto<br>Encumbered</th>
+                <th>Bash</th>
+                <th>Slash/Stab</th>
+                <th>Bullet</th>
+                    </tr>
+            <tr>
+                 <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_armor_name-1" /></td>
+                 <th><input type="number" class="sheet-numberbox" name="attr_armor_value_bash" value="0" /></th>
+                 <th><input type="number" class="sheet-numberbox" name="attr_armor_value_slash" value="0" /></th>
+               <th><input type="number" class="sheet-numberbox" name="attr_armor_value_bullet" value="0" /></th>
+        
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e 's armor (@{armor_name-1}) protects against [[(@{armor_value_Multiplier-1}d@{armor_value_dice-1}) + @{armor_value_modifier-1}]] points of damage."></button></th>
-                <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_armor_name-1" /></td>
-                <th class="sheet-lb"><select class="sheet-skill_select" name="attr_armor_value_dice-1" />
-                    <option value="1">1</option>
-                    <option value="4">d4</option>
-                    <option value="6">d6</option>
-                    <option value="8">d8</option>
-                    <option value="10">d10</option>
-                    <option value="12">d12</option></select>
-                </th>
-                <th><input type="number" class="sheet-numberbox" name="attr_armor_value_Multiplier-1" value="1" /></th>
-                <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_armor_value_modifier-1" value="0"
-                    /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_armor_EV-1" value="1" /></th>
-                <th><select class="sheet-skill_select" style="width:90px" name="attr_armor_Encumbered-1">
-                        <option value="0" selected>No</option>
-                        <option value="-1">Light</option>
-                        <option value="-2">Medium</option>
-                        <option value="-3">Heavy</option>
-                        <option value="-5">Extra Heavy</option></select>
-                </th>
+                         <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_armor_name-2" /></td>
+                 <th><input type="number" class="sheet-numberbox" name="attr_armor_value_bash" value="0" /></th>
+                 <th><input type="number" class="sheet-numberbox" name="attr_armor_value_slash" value="0" /></th>
+               <th><input type="number" class="sheet-numberbox" name="attr_armor_value_bullet" value="0" /></th>
             </tr>
             <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e 's armor (@{armor_name-2}) protects against [[(@{armor_value_Multiplier-2}d@{armor_value_dice-2}) + @{armor_value_modifier-2}]] points of damage."></button></th>
-                <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_armor_name-2" /></td>
-                <th class="sheet-lb"><select class="sheet-skill_select" name="attr_armor_value_dice-2" />
-                    <option value="1">1</option>
-                    <option value="4">d4</option>
-                    <option value="6">d6</option>
-                    <option value="8">d8</option>
-                    <option value="10">d10</option>
-                    <option value="12">d12</option></select>
-                </th>
-                <th><input type="number" class="sheet-numberbox" name="attr_armor_value_Multiplier-2" value="1" /></th>
-                <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_armor_value_modifier-2" value="0"
-                    /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_armor_EV-2" value="1" /></th>
-                <th><select class="sheet-skill_select" style="width:90px" name="attr_armor_Encumbered-2">
-                        <option value="0" selected>No</option>
-                        <option value="-1">Light</option>
-                        <option value="-2">Medium</option>
-                        <option value="-3">Heavy</option>
-                        <option value="-5">Extra Heavy</option></select>
-                </th>
-            </tr>
-            <tr>
-                <th><button type='roll' class="sheet-skillbutton" value="/e 's armor (@{armor_name-3}) protects against [[(@{armor_value_Multiplier-3}d@{armor_value_dice-3}) + @{armor_value_modifier-3}]] points of damage."></button></th>
-                <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_armor_name-3" /></td>
-                <th class="sheet-lb"><select class="sheet-skill_select" name="attr_armor_value_dice-3" />
-                    <option value="1">1</option>
-                    <option value="4">d4</option>
-                    <option value="6">d6</option>
-                    <option value="8">d8</option>
-                    <option value="10">d10</option>
-                    <option value="12">d12</option></select>
-                </th>
-                <th><input type="number" class="sheet-numberbox" name="attr_armor_value_Multiplier-3" value="1" /></th>
-                <th class="sheet-rb"><input type="number" class="sheet-numberbox" name="attr_armor_value_modifier-3" value="0"
-                    /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_armor_EV-3" value="1" /></th>
-                <th><select class="sheet-skill_select" style="width:90px" name="attr_armor_Encumbered-3">
-                        <option value="0" selected>No</option>
-                        <option value="-1">Light</option>
-                        <option value="-2">Medium</option>
-                        <option value="-3">Heavy</option>
-                        <option value="-5">Extra Heavy</option></select>
-                </th>
+                           <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_armor_name-3" /></td>
+                 <th><input type="number" class="sheet-numberbox" name="attr_armor_value_bash" value="0" /></th>
+                 <th><input type="number" class="sheet-numberbox" name="attr_armor_value_slash" value="0" /></th>
+               <th><input type="number" class="sheet-numberbox" name="attr_armor_value_bullet" value="0" /></th>
+  
             </tr>
         </table>
     </div>
@@ -1755,7 +1679,7 @@
                     <td>
                         <h3>Critter Type</h3>
                     </td>
-                    <td><input type="text" class="sheet-mediumname" name="att-NPC_critter" placeholder="NPC Critter Type"
+                    <td><input type="text" class="sheet-bigname" name="attr_NPC_type" placeholder="NPC Type"
                         /></td>
                 </tr>
             </table>
@@ -1857,7 +1781,7 @@
                     <td>
                         <h3>Wounds</h3>
                     </td>
-                    <td><input type="number" class="sheet-trait" name="attr_trait_NPC-Life_Points" value="0" /></td>
+                    <td><input type="number" class="sheet-trait" name="attr_trait_NPC-wounds" value="0" /></td>
                 </tr>
                 <tr>
                     <td><br></td>