diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index a6c0fa2991..918c8e14c7 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -437,6 +437,7 @@ input.technomancycheckbox:checked ~ div label.labeltechnomancer{
 .hiddenmelee:checked ~ div.weaponmodewrapper select,
 .weaponmodewrapper input,
 .hiddenmelee:checked ~ div.weaponrangerollwrapper,
+.hide-rep:checked ~ div.hide-rep,
 .hide1:checked ~ div.hide1,
 .hide2:checked ~ div.hide2,
 .hide3:checked ~ div.hide3,
@@ -1147,18 +1148,21 @@ input[disabled="true"]{
 
 
 .knowledgeskillattributewrapper,
-.ammodmgtypewrapper,
 .skillnoteswrapper,
 .armorratingwrapper,
-.mskillratingwrapper,
-.ammonamewrapper{
+.mskillratingwrapper{
     width:12%;
 }
 
+.ammonamewrapper{
+    width:24%;
+}
+
 
 .charplayerwrapper,
 .equipmentnumberwrapper,
 .weapondmgtypewrapper,
+.ammodmgtypewrapper,
 .equipmentnoteslabel,
 .charsexwrapper,
 .charagewrapper,
@@ -1180,8 +1184,7 @@ input[disabled="true"]{
 
 .skilllimitbonuswrapper,
 .spellsourcewrapper,
-.spiriterollwrapper,
-.ammoaccwrapper{
+.spiriterollwrapper{
     width:8%;
 }
 
@@ -1196,10 +1199,8 @@ input[disabled="true"]{
 .spiriteserviceswrapper,
 .spiriteforcewrapper,
 .spriterollwrapper,
-.ammodvwrapper,
-.ammoapwrapper,
-.ammorollwrapper,
 .ammonumberwrapper,
+.ammorollwrapper,
 .ammomaxwrapper{
     width:6.5%;
 }
@@ -1231,9 +1232,12 @@ input[disabled="true"]{
 .vehicleskillwrapper,
 .vehicletestwrapper,
 .weaponaccuracywrapper,
+.ammoaccwrapper,
 .weapondvwrapper,
+.ammodvwrapper,
 .weapondicewrapper,
 .weaponapwrapper,
+.ammoapwrapper,
 .weaponrcwrapper,
 .weaponaccuracywrapper,
 .weaponspecwrapper,
@@ -1441,17 +1445,17 @@ input[disabled="true"]{
 .vehicleskillrow,
 .vehicleweaponrow,
 .ammorow{
-    width:90%;
+    width:95%;
     display:inline-block;
-    margin-left:7%;
+    margin-left:5%;
     margin-top:0.3em;
 }
 
 
 .ammolabels{
-    width:90%;
+    width:95%;
     display:inline-block;
-    margin-left:7%;
+    margin-left:5%;
 }
 
 .vehicleammorow,
@@ -1580,7 +1584,9 @@ input.weaponcheckbox:checked ~ div.weaponnoteswrapper{
     margin-right: 10px;
 }
 
-
+div.spacer {
+    padding-right: 20px;
+}
 
 
 
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 22e5f258ba..354207205b 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -554,6 +554,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -563,9 +566,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -588,6 +588,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber1" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv1" value="0" title="DV change from the Ammunition">
                             </div>
@@ -603,17 +606,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap1" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription1" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll1" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=Simple: @{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{ammoname1} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -709,6 +706,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -718,9 +718,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -743,6 +740,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber2" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc2" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv2" value="0" title="DV change from the Ammunition">
                             </div>
@@ -758,17 +758,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap2" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc2" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription2" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll2" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=Simple: @{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{after3=Complex: @{ammoname2} Rounds}}{{after3_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -864,6 +858,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -873,9 +870,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -898,6 +892,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber3" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc3" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv3" value="0" title="DV change from the Ammunition">
                             </div>
@@ -913,17 +910,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap3" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc3" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription3" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll3" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=Simple: @{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{after3=Complex: @{ammoname3} Rounds}}{{after3_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1019,6 +1010,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -1028,9 +1022,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -1053,6 +1044,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber4" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc4" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv4" value="0" title="DV change from the Ammunition">
                             </div>
@@ -1068,17 +1062,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap4" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc4" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription4" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll4" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=Simple: @{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{after3=Complex: @{ammoname4} Rounds}}{{after3_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1174,6 +1162,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -1183,9 +1174,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -1208,6 +1196,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber5" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc5" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv5" value="0" title="DV change from the Ammunition">
                             </div>
@@ -1223,17 +1214,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap5" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc5" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription5" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll5" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=Simpel: @{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{after3=Complex: @{ammoname5} Rounds}}{{after3_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1329,6 +1314,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -1338,9 +1326,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -1363,6 +1348,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber6" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc6" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv6" value="0" title="DV change from the Ammunition">
                             </div>
@@ -1378,17 +1366,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap6" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc6" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription6" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll6" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=Simple: @{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{after3=Complex: @{ammoname6} Rounds}}{{after3_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1484,6 +1466,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -1493,9 +1478,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -1518,6 +1500,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber7" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc7" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv7" value="0" title="DV change from the Ammunition">
                             </div>
@@ -1533,17 +1518,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap7" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc7" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription7" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll7" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=Simple: @{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{after3=Complex: @{ammoname7} Rounds}}{{after3_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1639,6 +1618,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammomaxwrapper">
                         <label class="ammolabel">Max</label>
                     </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Acc Mod</label>
+                    </div>
                     <div class="ammodvwrapper">
                         <label class="ammolabel">DV Mod</label>
                     </div>
@@ -1648,9 +1630,6 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <div class="ammoapwrapper">
                         <label class="ammolabel">AP Mod</label>
                     </div>
-                    <div class="ammoaccwrapper">
-                        <label class="ammolabel">Acc Mod</label>
-                    </div>
                     <div class="ammodescriptionwrapper">
                         <label class="ammolabel">Description</label>
                     </div>
@@ -1673,6 +1652,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammomaxwrapper">
                                 <input type="number" name="attr_ammomaxnumber8" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
+                            <div class="ammoaccwrapper">
+                                <input type="text" name="attr_ammoacc8" value="0" title="Accuracy change from the Ammunition">
+                            </div>
                             <div class="ammodvwrapper">
                                 <input type="text" name="attr_ammodv8" value="0" title="DV change from the Ammunition">
                             </div>
@@ -1688,17 +1670,11 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <div class="ammoapwrapper">
                                 <input type="text" name="attr_ammoap8" value="0" title="AP change from the Ammunition">
                             </div>
-                            <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc8" value="0" title="Accuracy change from the Ammunition">
-                            </div>
                             <div class="ammodescriptionwrapper">
                                 <input type="text" name="attr_ammodescription8" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll8" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=Simple: @{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{after3=Complex: @{ammoname8} Rounds}}{{after3_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1787,39 +1763,39 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                             <textarea name="attr_weaponnotes" title="Have more Space!"></textarea>
                         </div>
                     </div>
-                    <div class="ammo">
-                        <div class="ammolabels hide">
-                            <div class="ammonamewrapper">
-                                <label class="ammolabel">Ammo Name</label>
-                            </div>
-                            <div class="ammonumberwrapper">
-                                <label class="ammolabel">Rounds</label>
-                            </div>
-                            <div class="ammomaxwrapper">
-                                <label class="ammolabel">Max</label>
-                            </div>
-                            <div class="ammodvwrapper">
-                                <label class="ammolabel">DV Mod</label>
-                            </div>
-                            <div class="ammodmgtypewrapper">
-                                <label class="ammolabel">Damage Type</label>
-                            </div>
-                            <div class="ammoapwrapper">
-                                <label class="ammolabel">AP Mod</label>
-                            </div>
-                            <div class="ammoaccwrapper">
-                                <label class="ammolabel">Acc Mod</label>
-                            </div>
-                            <div class="ammodescriptionwrapper">
-                                <label class="ammolabel">Description</label>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <label class="ammolabel">Simple</label>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <label class="ammolabel">Complex</label>
-                            </div>
+                    <div class="ammolabels hide">
+                        <div class="ammonamewrapper">
+                            <label class="ammolabel">Ammo Name</label>
                         </div>
+                        <div class="ammonumberwrapper">
+                            <label class="ammolabel">Rounds</label>
+                        </div>
+                        <div class="ammomaxwrapper">
+                            <label class="ammolabel">Max</label>
+                        </div>
+                        <div class="ammodvwrapper">
+                            <label class="ammolabel">DV Mod</label>
+                        </div>
+                        <div class="ammodmgtypewrapper">
+                            <label class="ammolabel">Damage Type</label>
+                        </div>
+                        <div class="ammoapwrapper">
+                            <label class="ammolabel">AP Mod</label>
+                        </div>
+                        <div class="ammoaccwrapper">
+                            <label class="ammolabel">Acc Mod</label>
+                        </div>
+                        <div class="ammodescriptionwrapper">
+                            <label class="ammolabel">Description</label>
+                        </div>
+                        <div class="ammorollwrapper">
+                            <label class="ammolabel">Simple</label>
+                        </div>
+                        <div class="ammorollwrapper">
+                            <label class="ammolabel">Complex</label>
+                        </div>
+                    </div>
+                    <div class="ammofieldset hide">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
                                 <input type="text" name="attr_ammoname0" title="Name of the Ammunition">
@@ -1852,10 +1828,7 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription0" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple0" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc0})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc0})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap0})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv0})]]}}{{after1dmg=@{ammodmgtype0}}}{{after2=@{ammoname0} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{description=@{ammodescription0}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex0" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc0})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc0})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap0})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv0})]]}}{{after1dmg=@{ammodmgtype0}}}{{after2=@{ammoname0} Rounds}}{{after2=@{ammoname0} Rounds}}{{after2_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription0}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll0" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc0})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc0})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap0})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv0})]]}}{{after1dmg=@{ammodmgtype0}}}{{after2=Simple: @{ammoname0} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{after3=Complex: @{ammoname0} Rounds}}{{after3_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription0}}}"></button>
                             </div>
                         </div>
                         <div class="ammorow">
@@ -1890,10 +1863,7 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription1" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc1})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
-                            </div>
-                            <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc1})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription1}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll1" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=Simple: @{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{ammoname1} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
                             </div>
                         </div>
                     </div>
@@ -8190,27 +8160,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide1">
                 <fieldset class="repeating_equipment1">
@@ -8224,6 +8188,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber1" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv1" value="0" title="DV change from the Ammunition">
                         </div>
@@ -8239,17 +8206,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap1" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription1" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll1" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=Simple: @{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{ammoname1} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8345,27 +8306,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide2">
                 <fieldset class="repeating_equipment2">
@@ -8379,6 +8334,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber2" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc2" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv2" value="0" title="DV change from the Ammunition">
                         </div>
@@ -8394,17 +8352,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap2" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc2" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription2" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll2" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=Simple: @{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{after3=Complex: @{ammoname2} Rounds}}{{after3_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8500,27 +8452,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide3">
                 <fieldset class="repeating_equipment3">
@@ -8534,6 +8480,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber3" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc3" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv3" value="0" title="DV change from the Ammunition">
                         </div>
@@ -8549,17 +8498,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap3" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc3" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription3" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll3" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=Simple: @{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{after3=Complex: @{ammoname3} Rounds}}{{after3_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8655,27 +8598,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide4">
                 <fieldset class="repeating_equipment4">
@@ -8689,6 +8626,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber4" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc4" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv4" value="0" title="DV change from the Ammunition">
                         </div>
@@ -8704,17 +8644,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap4" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc4" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription4" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll4" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=Simple: @{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{after3=Complex: @{ammoname4} Rounds}}{{after3_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8810,27 +8744,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide5">
                 <fieldset class="repeating_equipment5">
@@ -8844,6 +8772,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber5" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc5" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv5" value="0" title="DV change from the Ammunition">
                         </div>
@@ -8859,17 +8790,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap5" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc5" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription5" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll5" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=Simpel: @{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{after3=Complex: @{ammoname5} Rounds}}{{after3_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8965,27 +8890,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide6">
                 <fieldset class="repeating_equipment6">
@@ -8999,6 +8918,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber6" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc6" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv6" value="0" title="DV change from the Ammunition">
                         </div>
@@ -9014,17 +8936,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap6" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc6" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription6" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll6" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=Simple: @{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{after3=Complex: @{ammoname6} Rounds}}{{after3_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9120,27 +9036,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide7">
                 <fieldset class="repeating_equipment7">
@@ -9154,6 +9064,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber7" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc7" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv7" value="0" title="DV change from the Ammunition">
                         </div>
@@ -9169,17 +9082,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap7" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc7" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription7" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll7" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=Simple: @{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{after3=Complex: @{ammoname7} Rounds}}{{after3_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9275,27 +9182,21 @@ Click again to switch to Manual and Remote">
                 <div class="ammomaxwrapper">
                     <label class="ammolabel">Max</label>
                 </div>
+                <div class="ammoaccwrapper">
+                    <label class="ammolabel">Mod</label>
+                </div>
                 <div class="ammodvwrapper">
-                    <label class="ammolabel">DV Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodmgtypewrapper">
                     <label class="ammolabel">Damage Type</label>
                 </div>
                 <div class="ammoapwrapper">
-                    <label class="ammolabel">AP Mod</label>
-                </div>
-                <div class="ammoaccwrapper">
-                    <label class="ammolabel">Acc Mod</label>
+                    <label class="ammolabel">Mod</label>
                 </div>
                 <div class="ammodescriptionwrapper">
                     <label class="ammolabel">Description</label>
                 </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Simple</label>
-                </div>
-                <div class="ammorollwrapper">
-                    <label class="ammolabel">Complex</label>
-                </div>
             </div>
             <div class="ammofieldset hide8">
                 <fieldset class="repeating_equipment8">
@@ -9309,6 +9210,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber8" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc8" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv8" value="0" title="DV change from the Ammunition">
                         </div>
@@ -9324,17 +9228,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap8" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc8" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription8" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll8" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=Simple: @{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{after3=Complex: @{ammoname8} Rounds}}{{after3_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9342,7 +9240,7 @@ Click again to switch to Manual and Remote">
         </div>
         <div class="weapon">
             <fieldset class="repeating_weapons">
-                <input class="meleecheckbox hiddenmelee hide" type="checkbox" name="attr_weaponismelee" title="Melee Weapon?" checked>
+                <input class="meleecheckbox hiddenmelee hide-rep" type="checkbox" name="attr_weaponismelee" title="Melee Weapon?" checked>
                 <div class="weaponrow">
                     <input class="meleecheckbox hiddenmelee" type="checkbox" name="attr_weaponismelee" title="Melee Weapon?" checked>
                     <div class="weaponmeleewrapper">
@@ -9423,39 +9321,33 @@ Click again to switch to Manual and Remote">
                         <textarea name="attr_weaponnotes" title="Have more Space!"></textarea>
                     </div>
                 </div>
-                <div class="ammo">
-                    <div class="ammolabels hide">
-                        <div class="ammonamewrapper">
-                            <label class="ammolabel">Ammo Name</label>
-                        </div>
-                        <div class="ammonumberwrapper">
-                            <label class="ammolabel">Rounds</label>
-                        </div>
-                        <div class="ammomaxwrapper">
-                            <label class="ammolabel">Max</label>
-                        </div>
-                        <div class="ammodvwrapper">
-                            <label class="ammolabel">DV Mod</label>
-                        </div>
-                        <div class="ammodmgtypewrapper">
-                            <label class="ammolabel">Damage Type</label>
-                        </div>
-                        <div class="ammoapwrapper">
-                            <label class="ammolabel">AP Mod</label>
-                        </div>
-                        <div class="ammoaccwrapper">
-                            <label class="ammolabel">Acc Mod</label>
-                        </div>
-                        <div class="ammodescriptionwrapper">
-                            <label class="ammolabel">Description</label>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <label class="ammolabel">Simple</label>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <label class="ammolabel">Complex</label>
-                        </div>
+                <div class="ammolabels hide-rep">
+                    <div class="ammonamewrapper">
+                        <label class="ammolabel">Ammo Name</label>
                     </div>
+                    <div class="ammonumberwrapper">
+                        <label class="ammolabel">Rounds</label>
+                    </div>
+                    <div class="ammomaxwrapper">
+                        <label class="ammolabel">Max</label>
+                    </div>
+                    <div class="ammoaccwrapper">
+                        <label class="ammolabel">Mod</label>
+                    </div>
+                    <div class="ammodvwrapper">
+                        <label class="ammolabel">Mod</label>
+                    </div>
+                    <div class="ammodmgtypewrapper">
+                        <label class="ammolabel">Damage Type</label>
+                    </div>
+                    <div class="ammoapwrapper">
+                        <label class="ammolabel">Mod</label>
+                    </div>
+                    <div class="ammodescriptionwrapper">
+                        <label class="ammolabel">Description</label>
+                    </div>
+                </div>
+                <div class="ammofieldset hide-rep">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
                             <input type="text" name="attr_ammoname0" title="Name of the Ammunition">
@@ -9466,11 +9358,14 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber0" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc0" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv0" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype">
+                            <select name="attr_ammodmgtype0">
                                 <option value="@{weapondmgtype}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -9481,17 +9376,11 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap0" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc0" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription0" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple0" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc0})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc0})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap0})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv0})]]}}{{after1dmg=@{ammodmgtype0}}}{{after2=@{ammoname0} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{description=@{ammodescription0}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex0" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc0})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc0})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap0})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv0})]]}}{{after1dmg=@{ammodmgtype0}}}{{after2=@{ammoname0} Rounds}}{{after2=@{ammoname0} Rounds}}{{after2_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription0}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll0" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc0})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc0})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap0})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv0})]]}}{{after1dmg=@{ammodmgtype0}}}{{after2=Simple: @{ammoname0} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{after3=Complex: @{ammoname0} Rounds}}{{after3_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription0}}}"></button>
                         </div>
                     </div>
                     <div class="ammorow">
@@ -9504,6 +9393,9 @@ Click again to switch to Manual and Remote">
                         <div class="ammomaxwrapper">
                             <input type="number" name="attr_ammomaxnumber1" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
+                        <div class="ammoaccwrapper">
+                            <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
+                        </div>
                         <div class="ammodvwrapper">
                             <input type="text" name="attr_ammodv1" value="0" title="DV change from the Ammunition">
                         </div>
@@ -9519,21 +9411,14 @@ Click again to switch to Manual and Remote">
                         <div class="ammoapwrapper">
                             <input type="text" name="attr_ammoap1" value="0" title="AP change from the Ammunition">
                         </div>
-                        <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
-                        </div>
                         <div class="ammodescriptionwrapper">
                             <input type="text" name="attr_ammodescription1" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc1})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
-                        </div>
-                        <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc1})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription1}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll1" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname}}}{{val2_num=[[@{weaponcategory}+@{weaponbonus}+@{weaponspec}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy}+(@{ammoacc1})]]}}{{result=[[(@{weapondice}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=Simple:@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode}-floor(@{weaponmode}/10)*10]]}}{{after3=Complex:@{ammoname1} Rounds}}{{after3_num=[[floor(@{weaponmode}/10)]]}}{{description=@{ammodescription1}}}"></button>
                         </div>
                     </div>
                 </div>
-
             </fieldset>
         </div>
     </div>