diff --git a/Unisystem-All Flesh Must Be Eaten/All Flesh Must Be Eaten.html b/Unisystem-All Flesh Must Be Eaten/All Flesh Must Be Eaten.html
index 2417d55da6..ce0693fcf2 100644
--- a/Unisystem-All Flesh Must Be Eaten/All Flesh Must Be Eaten.html	
+++ b/Unisystem-All Flesh Must Be Eaten/All Flesh Must Be Eaten.html	
@@ -587,7 +587,7 @@
             <th>Two<br>Handed?</th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-1}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-1} + d10]] to hit and [[(@{weapon_damage_Multiplier-1} + @{weapon_melee-1})d@{weapon_damage_dice-1}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-1}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-1} + d10]] to hit and [[(1d@{weapon_damage_dice-1})*(@{weapon_damage_Multiplier-1} + @{weapon_melee-1})]] damage."></button></th>
             <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"/></th>
@@ -609,7 +609,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-1" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-2}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-2} + d10]] to hit and [[(@{weapon_damage_Multiplier-2} + @{weapon_melee-2})d@{weapon_damage_dice-2}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-2}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-3} + d10]] to hit and [[(1d@{weapon_damage_dice-2})*(@{weapon_damage_Multiplier-2} + @{weapon_melee-2})]] damage."></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"/></th>
@@ -631,7 +631,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-2" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-3}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-3} + d10]] to hit and [[(@{weapon_damage_Multiplier-3} + @{weapon_melee-3})d@{weapon_damage_dice-3}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-3}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-3} + d10]] to hit and [[(1d@{weapon_damage_dice-3})*(@{weapon_damage_Multiplier-3} + @{weapon_melee-3})]] 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"/></th>
@@ -653,7 +653,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-3" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-4}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-4} + d10]] to hit and [[(@{weapon_damage_Multiplier-4} + @{weapon_melee-4})d@{weapon_damage_dice-4}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-4}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-4} + d10]] to hit and [[(1d@{weapon_damage_dice-4})*(@{weapon_damage_Multiplier-4} + @{weapon_melee-4})]] 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"/></th>
@@ -675,7 +675,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-4" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-5}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-5} + d10]] to hit and [[(@{weapon_damage_Multiplier-5} + @{weapon_melee-5})d@{weapon_damage_dice-5}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-5}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-5} + d10]] to hit and [[(1d@{weapon_damage_dice-5})*(@{weapon_damage_Multiplier-5} + @{weapon_melee-5})]] 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"/></th>
@@ -697,7 +697,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-5" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-6}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-6} + d10]] to hit and [[(@{weapon_damage_Multiplier-6} + @{weapon_melee-6})d@{weapon_damage_dice-6}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-6}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-6} + d10]] to hit and [[(1d@{weapon_damage_dice-6})*(@{weapon_damage_Multiplier-6} + @{weapon_melee-6})]] damage."></button></th>
             <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-6"/></td>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-6"/></th>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-6"/></th>
@@ -719,7 +719,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-6" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-7}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-7} + d10]] to hit and [[(@{weapon_damage_Multiplier-7} + @{weapon_melee-7})d@{weapon_damage_dice-7}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-7}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-7} + d10]] to hit and [[(1d@{weapon_damage_dice-7})*(@{weapon_damage_Multiplier-7} + @{weapon_melee-7})]] damage."></button></th>
             <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-7"/></td>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-7"/></th>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-7"/></th>
@@ -741,7 +741,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-7" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-8}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-8} + d10]] to hit and [[(@{weapon_damage_Multiplier-8} + @{weapon_melee-8})d@{weapon_damage_dice-8}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-8}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-8} + d10]] to hit and [[(1d@{weapon_damage_dice-8})*(@{weapon_damage_Multiplier-8} + @{weapon_melee-8})]] damage."></button></th>
             <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-8"/></td>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-8"/></th>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-8"/></th>
@@ -763,7 +763,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-8" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-9}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-9} + d10]] to hit and [[(@{weapon_damage_Multiplier-9} + @{weapon_melee-9})d@{weapon_damage_dice-9}]] damage."></button></th>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-9}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-9} + d10]] to hit and [[(1d@{weapon_damage_dice-9})*(@{weapon_damage_Multiplier-9} + @{weapon_melee-9})]] damage."></button></th>
             <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-9"/></td>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-9"/></th>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-9"/></th>
@@ -785,8 +785,7 @@
             <th><input type="checkbox" class="sheet-melee_toggle" name="attr_weapon_twohanded-9" value="1"/></th>
         </tr>
         <tr>
-            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-10}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-10} + d10]] to hit and [[(@{weapon_damage_Multiplier-10} + @{weapon_melee-10})d@{weapon_damage_dice-10}]] damage."></button></th>
-            <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-10"/></td>
+            <th><button type='roll' class="sheet-skillbutton" value="/e attacks with @{weapon_name-10}, rolling [[@{base-Dexterity} + @{mod-Dexterity} + @{weapon_attack_rating-10} + d10]] to hit and [[(1d@{weapon_damage_dice-10})*(@{weapon_damage_Multiplier-10} + @{weapon_melee-10})]] damage."></button></th>            <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_weapon_name-10"/></td>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_RoF-10"/></th>
             <th><input type="number" class="sheet-numberbox" name="attr_weapon_attack_rating-10"/></th>
             <th class="sheet-lb"><select class="sheet-skill_select" name="attr_weapon_damage_dice-10"/>