diff --git a/Cyberpunk 2020/Cyberpunk2020.html b/Cyberpunk 2020/Cyberpunk2020.html
index d6c8e1fa2c..0171d8eb9d 100644
--- a/Cyberpunk 2020/Cyberpunk2020.html	
+++ b/Cyberpunk 2020/Cyberpunk2020.html	
@@ -198,7 +198,7 @@
         <div class='sheet-col'>
             <h4 align=center>Life Events</h4>
                 <textarea name="attr_LifeEvents" style="height:200px; width:375px;"></textarea>
-            <h4 align=center>Style and Motovations</h4>
+            <h4 align=center>Style and Motivations</h4>
                 <textarea name="attr_Style" style="height:200px; width:375px;"></textarea>
         </div>
         <div class='sheet-col'>
@@ -441,61 +441,61 @@
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_AikidoChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Aikido}}{{character= @{handle} }}{{total= [[1d10!+@{Aikido_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Aikido (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Aikido}}{{character= @{handle} }}{{total= [[1d10!+@{Aikido_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Aikido (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Aikido_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Aikido_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_AnimalKungFuChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Animal Kung Fu}}{{character= @{handle} }}{{total= [[1d10!+@{Animal_Kung_Fu_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Animal Kung Fu (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Animal Kung Fu}}{{character= @{handle} }}{{total= [[1d10!+@{Animal_Kung_Fu_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Animal Kung Fu (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Animal_Kung_Fu_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Animal_Kung_Fu_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_BoxingChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Boxing}}{{character= @{handle} }}{{total= [[1d10!+@{Boxing_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Boxing (1)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Boxing}}{{character= @{handle} }}{{total= [[1d10!+@{Boxing_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Boxing (1)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Boxing_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Boxing_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_CapoeriaChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Capoeria}}{{character= @{handle} }}{{total= [[1d10!+@{Capoeria_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Capoeria (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Capoeria}}{{character= @{handle} }}{{total= [[1d10!+@{Capoeria_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Capoeria (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Capoeria_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Capoeria_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_ChoiLiFutChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Choi Li Fut}}{{character= @{handle} }}{{total= [[1d10!+@{Choi_Li_Fut_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Choi Li Fut (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Choi Li Fut}}{{character= @{handle} }}{{total= [[1d10!+@{Choi_Li_Fut_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Choi Li Fut (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Choi_Li_Fut_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Choi_Li_Fut_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_JudoChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Judo}}{{character= @{handle} }}{{total= [[1d10!+@{Judo_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Judo (1)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Judo}}{{character= @{handle} }}{{total= [[1d10!+@{Judo_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Judo (1)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Judo_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Judo_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_KarateChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Karate}}{{character= @{handle} }}{{total= [[1d10!+@{Karate_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Karate (2)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Karate}}{{character= @{handle} }}{{total= [[1d10!+@{Karate_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Karate (2)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Karate_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Karate_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_TaeKwonDoChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Tae Kwon Do}}{{character= @{handle} }}{{total= [[1d10!+@{Tae_Kwon_Do_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Tae Kwon Do (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Tae Kwon Do}}{{character= @{handle} }}{{total= [[1d10!+@{Tae_Kwon_Do_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Tae Kwon Do (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Tae_Kwon_Do_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Tae_Kwon_Do_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_ThaiKickBoxingChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Thai Kick Boxing}}{{character= @{handle} }}{{total= [[1d10!+@{Thai_Kick_Boxing_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label> Thai Kick Boxing (4)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Thai Kick Boxing}}{{character= @{handle} }}{{total= [[1d10!+@{Thai_Kick_Boxing_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label> Thai Kick Boxing (4)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Thai_Kick_Boxing_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Thai_Kick_Boxing_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_Wrestling' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Wrestling}}{{character= @{handle} }}{{total= [[1d10!+@{Wrestling_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Wrestling (1)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Wrestling}}{{character= @{handle} }}{{total= [[1d10!+@{Wrestling_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-combat}]] }} '><label>Wrestling (1)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Wrestling_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Wrestling_IP" /></td>
                             </tr>
@@ -525,25 +525,25 @@
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_PilotGyroChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Pilot Gyro}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Gyro_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Gyro (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Pilot Gyro}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Gyro_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Gyro (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Gyro_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Gyro_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_PilotFixedWingChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Pilot Fixed Wing}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Fixed_Wing_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Fixed Wing (2)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Pilot Fixed Wing}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Fixed_Wing_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Fixed Wing (2)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Fixed_Wing_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Fixed_Wing_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_PilotDirigibleChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Pilot Dirigible}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Dirigible_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Dirigible (2)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Pilot Dirigible}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Dirigible_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Dirigible (2)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Dirigible_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Dirigible_IP" /></td>
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_PilotVectoredThrustVehicleChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Pilot Vectored Thrust Vehicle}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Vectored_Thrust_Vehicle_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Vectored Thrust Vehicle (3)</label></button></td>
+                                <td style="text-align:right;"><button type='roll' class="sheet-sub_skill" value='&{template:skill-general}{{skill= Pilot Vectored Thrust Vehicle}}{{character= @{handle} }}{{total= [[1d10!+@{Pilot_Vectored_Thrust_Vehicle_Skill}+[[@{Ref}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-drive}]] }} '><label>Vectored Thrust Vehicle (3)</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Vectored_Thrust_Vehicle_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Pilot_Vectored_Thrust_Vehicle_IP" /></td>
                             </tr>
@@ -606,7 +606,7 @@
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_PersonalGroomingChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Personal Grooming}}{{character= @{handle} }}{{total= [[1d10!+@{Personal_Grooming_Skill}+[[@{Attr}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-social}]] }} '><label>Personal Groominge</label></button></td>
+                                <td><button type='roll' value='&{template:skill-general}{{skill= Personal Grooming}}{{character= @{handle} }}{{total= [[1d10!+@{Personal_Grooming_Skill}+[[@{Attr}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-social}]] }} '><label>Personal Grooming</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Personal_Grooming_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Personal_Grooming_IP" /></td>
                             </tr>
@@ -718,7 +718,7 @@
                             </tr>
                             <tr>
                                 <td><input type='checkbox' name='attr_ResistTortureChip' value='1'><span></span></td>
-                                <td><button type='roll' value='&{template:skill-general}{{skill= Resist Tortue/Drugs}}{{character= @{handle} }}{{total= [[1d10!+@{Resist_Skill}+[[@{Cool}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-general}]] }} '><label>Resist Tortue/Drugs</label></button></td>
+                                <td><button type='roll' value='&{template:skill-general}{{skill= Resist Torture/Drugs}}{{character= @{handle} }}{{total= [[1d10!+@{Resist_Skill}+[[@{Cool}]]+?{Modifier|0}]] }} {{fumble= [[@{fumble-general}]] }} '><label>Resist Torture/Drugs</label></button></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Resist_Skill" Value="0" /></td>
                                 <td><input type="text" style="width: 45px;" name="attr_Resist_IP" /></td>
                             </tr>
@@ -1220,9 +1220,15 @@
     <div class='sheet-2colrow'>
         <div class="sheet-wrapper sheet-col">
             <table>
+                <tr>
+                    <td></td>
+                    <td style="text-align:center">Base</td>
+                    <td>Modifier</td>
+                </tr>
                 <tr>
                     <td><button type='roll' style="width:120px" value='&{template:save} {{character= @{Handle} }}{{roll= [[1d10]] }}{{stun_target= [[@{Body}+@{save_mod}-[[@{SeriouslyWounded}+@{CriticallyWounded}+@{Mortal0Wounded}+@{Mortal1Wounded}+@{Mortal2Wounded}+@{Mortal3Wounded}+@{Mortal4Wounded}+@{Mortal5Wounded}+@{Mortal6Wounded}]] ]]}}{{death_target= [[@{save_mod}+@{Body}-[[@{Mortal0Wounded}+@{Mortal1Wounded}+@{Mortal2Wounded}+@{Mortal3Wounded}+@{Mortal4Wounded}+@{Mortal5Wounded}+@{Mortal6Wounded}]] ]]}}'><h3 class="sheet-front">Save</h3></button></td>
-                    <td><input type="number" class="sheet-stat" name="attr_Save" value="@{Body}+@{save_mod}-@{SeriouslyWounded}-@{CriticallyWounded}-@{Mortal0Wounded}-@{Mortal1Wounded}-@{Mortal2Wounded}-@{Mortal3Wounded}-@{Mortal4Wounded}-@{Mortal5Wounded}-@{Mortal6Wounded}" disabled="true" /> &nbsp;<input type="text" style="width: 45px;" name="attr_save_mod" Value="0" /></td>
+                    <td><input type="number" class="sheet-stat" name="attr_Save" value="@{Body}+@{save_mod}-@{SeriouslyWounded}-@{CriticallyWounded}-@{Mortal0Wounded}-@{Mortal1Wounded}-@{Mortal2Wounded}-@{Mortal3Wounded}-@{Mortal4Wounded}-@{Mortal5Wounded}-@{Mortal6Wounded}" disabled="true" /></td>
+                    <td><input type="text" style="width: 45px;" name="attr_save_mod" Value="0" /></td>
                     <td><div class="sheet-hidden"><input type="number" name="attr_DeathSave" value="@{save_mod}+@{Body}-@{Mortal0Wounded}-@{Mortal1Wounded}-@{Mortal2Wounded}-@{Mortal3Wounded}-@{Mortal4Wounded}-@{Mortal5Wounded}-@{Mortal6Wounded}" disabled="true" /></div></td>
                 </tr>
                 <tr>
@@ -1230,11 +1236,17 @@
                 </tr>
             </table>
         </div>
-        <div class="sheet-wrapper  sheet-col" style="width:300px">
+        <div class="sheet-wrapper sheet-col" style="width:300px">
             <table>
                 <tr>
-                    <td><button type='roll' value='&{template:initiative} {{character= @{Handle} }}{{init= [[1d10!+[[@{initiative}]] &{tracker}]]}}'><h3 class="sheet-front">Initiative</h3></button></td>
-                    <td><input type="number" class="sheet-stat" name="attr_initiative" value="(@{Ref}) + @{Combat_Sense_Skill} + @{initiative_mod}" disabled="true" />&nbsp;<input type="text" style="width: 45px;" name="attr_initiative_mod" Value="0" /></td>
+                    <td></td>
+                    <td style="text-align:center">Base </td>
+                    <td>Modifier</td>
+                </tr>
+                <tr>
+                    <td><button type='roll' style="width:120px" value='&{template:initiative} {{character= @{Handle} }}{{init= [[1d10!+[[@{initiative}]] &{tracker}]]}}'><h3 class="sheet-front">Initiative</h3></button></td>
+                    <td><input type="number" class="sheet-stat" name="attr_initiative" value="(@{Ref}) + @{Combat_Sense_Skill} + @{initiative_mod}" disabled="true" /></td>
+                    <td><input type="text" style="width: 45px;" name="attr_initiative_mod" Value="0" /></td>
                 </tr>
             </table>
         </div>
@@ -1322,7 +1334,7 @@
                 </th>
                 <th><input type="text" name="attr_WeaponName" /></th>
                 <th>
-                    <button type="roll" class="sheet-autofire-b" name="attr_weaponAutofire"  value="&{template:autofire-b} {{weapon= @{WeaponName} }} {{character= @{Handle}}} @{autofire_round}"></button>
+                    <button type="roll" class="sheet-autofire" name="attr_weaponAutofire"  value="&{template:autofire} {{weapon= @{WeaponName} }} {{character= @{Handle}}} @{autofire_round}"></button>
                 </th>
                 <th>
                     <select name="attr_autofire_round" style="width:44px">
@@ -1916,48 +1928,6 @@
     </table>
     </rolltemplate>
     
-    <rolltemplate class="sheet-rolltemplate-stun_save">
-    <table>
-        <tr>
-            <th colspan="3">Save</th> 
-        </tr>
-        <tr>
-            <td colspan="3"><i><b>{{character}}</b> tries to stay in the fight! </i></td>
-        </tr>
-        <tr>
-            <td><b>Roll:</b></td>
-            <td></td>
-            <td>{{roll}}</td>
-        </tr>
-        <tr>
-            <td><div class="sheet-stun"></div></td>
-            <td style="font-sze:0.8em">Roll less than</td>
-            <td>{{stun_target}}</td>
-        </tr>
-    </table>
-    </rolltemplate>
-    
-    <rolltemplate class="sheet-rolltemplate-death_save">
-    <table>
-        <tr>
-            <th colspan="3">Save</th> 
-        </tr>
-        <tr>
-            <td colspan="3"><i><b>{{character}}</b> tries to stay in the fight! </i></td>
-        </tr>
-        <tr>
-            <td><b>Roll:</b></td>
-            <td></td>
-            <td>{{roll}}</td>
-        </tr>
-        <tr>
-            <td><span class="sheet-tcat"><div class="sheet-death"></div></span></td>
-            <td style="font-sze:0.8em">Roll less than</td>
-            <td>{{death_target}}</td>
-        </tr>
-    </table>
-    </rolltemplate>
-    
     <rolltemplate class="sheet-rolltemplate-initiative">
     <table class="sheet-initiative">
         <tr>
@@ -2038,8 +2008,8 @@
     </table>
     </rolltemplate>
     
-    <rolltemplate class="sheet-rolltemplate-autofire-b">
-    <table class="sheet-skill-autofire-b">
+    <rolltemplate class="sheet-rolltemplate-autofire">
+    <table class="sheet-skill-autofire">
         <tr>
             <th colspan="2">Auto-fire:{{weapon}}</th>
         </tr>