diff --git a/Mongoose_Traveller2e/MongooseTraveller.html b/Mongoose_Traveller2e/MongooseTraveller.html
index ba13cec912..4651181b13 100644
--- a/Mongoose_Traveller2e/MongooseTraveller.html
+++ b/Mongoose_Traveller2e/MongooseTraveller.html
@@ -2163,7 +2163,7 @@
                         <th data-i18n="weaponmagazine-u">Magazine</th>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-1" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-1}}}  {{attack=[[(2d6 + @{weapon_DM-1}[DM] + @{weapon_skill-1}[Skill] + ?{Modifier|0}[Modifier])]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-1}]]}} {{range=@{weapon_range-1}}}" ></button></td>
+                        <td><button name="roll_weapon-1" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-1}}}  {{roll=[[(2d6 + @{weapon_DM-1}[DM] + @{weapon_skill-1}[Skill] + ?{Modifier|0}[Modifier])]]}} {{bb=[[1d6]]}} {{damage=[[@{weapon_damage-1}]]}} {{range=@{weapon_range-1}}}" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-1" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-1" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-1" value="0" style="width:85px" />
@@ -2181,7 +2181,7 @@
                         <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-1" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-2" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-2}}}  {{attack=[[(2d6 + @{weapon_DM-2}[DM] + @{weapon_skill-2}[Skill] + ?{Modifier|0}[Modifier])]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-2}]]}} {{range=@{weapon_range-2}}}" ></button></td>
+                        <td><button name="roll_weapon-2" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-2}}}  {{roll=[[(2d6 + @{weapon_DM-2}[DM] + @{weapon_skill-2}[Skill] + ?{Modifier|0}[Modifier])]]}} {{bb=[[1d6]]}} {{damage=[[@{weapon_damage-2}]]}} {{range=@{weapon_range-2}}}" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-2" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-2" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-2" value="0" style="width:85px" />
@@ -2199,7 +2199,7 @@
                         <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-2" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-3" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-3}}}  {{attack=[[(2d6 + @{weapon_DM-3}[DM] + @{weapon_skill-3}[Skill] + ?{Modifier|0}[Modifier])]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-3}]]}} {{range=@{weapon_range-3}}}" ></button></td>
+                        <td><button name="roll_weapon-3" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-3}}}  {{roll=[[(2d6 + @{weapon_DM-3}[DM] + @{weapon_skill-3}[Skill] + ?{Modifier|0}[Modifier])]]}} {{bb=[[1d6]]}} {{damage=[[@{weapon_damage-3}]]}} {{range=@{weapon_range-3}}}" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-3" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-3" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-3" value="0" style="width:85px" />
@@ -2217,7 +2217,7 @@
                         <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-3" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-4" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-4}}}  {{attack=[[(2d6 + @{weapon_DM-4}[DM] + @{weapon_skill-4}[Skill] + ?{Modifier|0}[Modifier])]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-4}]]}} {{range=@{weapon_range-4}}}" ></button></td>
+                        <td><button name="roll_weapon-4" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-4}}}  {{roll=[[(2d6 + @{weapon_DM-4}[DM] + @{weapon_skill-4}[Skill] + ?{Modifier|0}[Modifier])]]}} {{bb=[[1d6]]}} {{damage=[[@{weapon_damage-4}]]}} {{range=@{weapon_range-4}}}" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-4" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-4" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-4" value="0" style="width:85px" />
@@ -2235,7 +2235,7 @@
                         <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-4" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-5" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-5}}}  {{attack=[[(2d6 + @{weapon_DM-5}[DM] + @{weapon_skill-5}[Skill] + ?{Modifier|0}[Modifier])]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-5}]]}} {{range=@{weapon_range-5}}}" ></button></td>
+                        <td><button name="roll_weapon-5" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-5}}}  {{roll=[[(2d6 + @{weapon_DM-5}[DM] + @{weapon_skill-5}[Skill] + ?{Modifier|0}[Modifier])]]}} {{bb=[[1d6]]}} {{damage=[[@{weapon_damage-5}]]}} {{range=@{weapon_range-5}}}" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-5" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-5" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-5" value="0" style="width:85px" />
@@ -2253,7 +2253,7 @@
                         <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-5" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-6" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-6}}}  {{attack=[[(2d6 + @{weapon_DM-6}[DM] + @{weapon_skill-6}[Skill] + ?{Modifier|0}[Modifier])]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-6}]]}} {{range=@{weapon_range-6}}}" ></button></td>
+                        <td><button name="roll_weapon-6" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-6}}}  {{roll=[[(2d6 + @{weapon_DM-6}[DM] + @{weapon_skill-6}[Skill] + ?{Modifier|0}[Modifier])]]}} {{bb=[[1d6]]}} {{damage=[[@{weapon_damage-6}]]}} {{range=@{weapon_range-6}}}" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-6" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-6" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-6" value="0" style="width:85px" />
@@ -2366,36 +2366,6 @@
         </table>
     </rolltemplate>
 
-    <rolltemplate class="sheet-rolltemplate-melee">
-        <table class="sheet-melee">
-            <tr>
-                <th colspan="4">{{weapon}}</th>
-            </tr>
-            <tr>
-                <td colspan="4"><i><b>{{character}}</b></i></td>
-            </tr>
-            <tr>
-            	<td colspan="2"><span><b>Attack</b></span>
-            	<td colspan="2"><i>{{roll}}</i></td>
-            </tr>
-            {{#range1}}
-            <tr>
-                <td style="color:black;">Personal</td>
-                <td>{{range1}}</td>
-                <td style="color:black;">Close</td>
-                <td>{{range2}}</td>
-            </tr>
-            {{/range1}}
-            <tr>
-            	<td colspan="2"><span><b>Damage</b></span>
-            	<td colspan="2"><i>{{damage}}</i></td>
-            </tr>
-            <tr>
-                <td colspan="4">{{note}}</td>
-            </tr>
-        </table>
-    </rolltemplate>
-
     <rolltemplate class="sheet-rolltemplate-range">
         <table class="sheet-range">
             <tr>
@@ -2408,41 +2378,18 @@
             	<td colspan="2"><span><b>Attack</b></span>
             	<td colspan="2"><i>{{roll}}</i></td>
             </tr>
-                {{#range1}}
+            	<td colspan="2"><span><b>Boon/Bane</b></span>
+            	<td colspan="2"><i>{{bb}}</i></td>
             <tr>
-                <td style="color:black;">Personal</td>
-                <td>{{range1}}</td>
-                <td style="color:black;">Long</td>
-                <td>{{range5}}</td>
-            </tr>
-            <tr>
-                <td style="color:black;">Close</td>
-                <td>{{range2}}</td>
-                <td style="color:black;">Very Long</td>
-                <td>{{range6}}</td>
-            </tr>
-            <tr>
-                <td style="color:black;">Short</td>
-                <td>{{range3}}</td>
-                <td style="color:black;">Distant</td>
-                <td>{{range7}}</td>
-            </tr>
-            <tr>
-                <td style="color:black;">Medium</td>
-                <td>{{range4}}</td>
-                <td></td>
-                <td></td>
-            </tr>
-                {{/range1}}
-            <tr>
-            	<td colspan="2"><span><b>Damage</b></span>
-            	<td colspan="2"><i>{{damage}}</i></td>
+            	<td colspan="2"><span><b>Range</b></span>
+            	<td colspan="2"><i>{{range}}</i></td>
             </tr>
             <tr>
                 <td colspan="4">{{note}}</td>
             </tr>
         </table>
     </rolltemplate>
+    
     <rolltemplate class="sheet-rolltemplate-skill-attrib">
         <table class="sheet-skill-attrib">
             <tr>