diff --git a/Alternity-RPG/Alternity_RPG.html b/Alternity-RPG/Alternity_RPG.html
index 140f2c4a61..19f6e0b6b5 100644
--- a/Alternity-RPG/Alternity_RPG.html
+++ b/Alternity-RPG/Alternity_RPG.html
@@ -338,6 +338,51 @@ on('change:repeating_equipment:ItemMass change:repeating_equipment:ItemQty chang
 			<TD><input type="text" name="attr_form5range" class="sheet-range"></TD>
 			<TD><input type="text" name="attr_form5damageordinary" class="sheet-dicetype"><input type="text" name="attr_form5damageordinarytype" class="sheet-dmgtype">/<input type="text" name="attr_form5damagegood" class="sheet-dicetype"><input type="text" name="attr_form5damagegoodtype" class="sheet-dmgtype">/<input type="text" name="attr_form5damageamazing" class="sheet-dicetype"><input type="text" name="attr_form5damageamazingtype" class="sheet-dmgtype"></TD>
 		</TR>
+		<TR>
+			<TD><button type="roll" name="roll_weapon_6" value="&{template:default} {{name= @{character_name} - @{form6}}} {{score= [[@{form6score}]]/[[@{form6scoregood}]]/[[@{form6scoreamazing}]]}} {{type= @{form6type}}} {{range= @{form6range}}} {{damage= [[@{form6damageordinary}]]@{form6damageordinarytype}/[[@{form6damagegood}]]@{form6damagegoodtype}/[[@{form6damageamazing}]]@{form6damageamazingtype}}} {{results= [[?{Situation Modifier|None, 1d20cs<1cf>20|-6 Steps (-d20), 1d20cs<1cf>20-1d20cs<0cf<0|-4 Steps (-d12), 1d20cs<1cf>20-1d12cs<0cf<0|-3 Steps (-d8), 1d20cs<1cf>20-1d8cs<0cf<0|-2 Steps (-d6), 1d20cs<1cf>20-1d6cs<0cf<0|-1 Steps (-d4), 1d20cs<1cf>20-1d4cs<0cf<0|+1 Steps (+d4), 1d20cs<1cf>20+1d4cs<0cf<0|+2 Steps (+d6), 1d20cs<1cf>20+1d6cs<0cf<0|+3 Steps (+d8), 1d20cs<1cf>20+1d8cs<0cf<0|+4 Steps (+d12), 1d20cs<1cf>20+1d12cs<0cf<0|+6 Steps (+d20), 1d20cs<1cf>20+1d20cs<0cf<0|+6 Steps (+2d20), 1d20cs<1cf>20+2d20cs<0cf<0|+7 Steps (+3d20), 1d20cs<1cf>20+3d20cs<0cf<0}]]}}"></button><input type="text" name="attr_form6" placeholder="Enter Weapon Name"></TD>
+			<TD><input type="number" name="attr_form6score" class="sheet-score" value="0">/<input type="text" name="attr_form6scoregood" class="sheet-scoredisabled" disabled="true" value="(floor(@{form6score}/2))">/<input type="text" name="attr_form6scoreamazing" class="sheet-scoredisabled" disabled="true" value="(floor(@{form6score}/4))"></TD>
+			<TD><input type="text" name="attr_form6die" class="sheet-dicetype" value="+d4"></TD>
+			<TD><input type="text" name="attr_form6accuracy" class="sheet-dicetype" value="0"></TD>
+			<TD><input type="text" name="attr_form6type" class="sheet-dicetype"></TD>
+			<TD><input type="text" name="attr_form6range" class="sheet-range"></TD>
+			<TD><input type="text" name="attr_form6damageordinary" class="sheet-dicetype"><input type="text" name="attr_form6damageordinarytype" class="sheet-dmgtype">/<input type="text" name="attr_form6damagegood" class="sheet-dicetype"><input type="text" name="attr_form6damagegoodtype" class="sheet-dmgtype">/<input type="text" name="attr_form6damageamazing" class="sheet-dicetype"><input type="text" name="attr_form6damageamazingtype" class="sheet-dmgtype"></TD>
+		</TR>
+		<TR>
+			<TD><button type="roll" name="roll_weapon_7" value="&{template:default} {{name= @{character_name} - @{form7}}} {{score= [[@{form7score}]]/[[@{form7scoregood}]]/[[@{form7scoreamazing}]]}} {{type= @{form7type}}} {{range= @{form7range}}} {{damage= [[@{form7damageordinary}]]@{form7damageordinarytype}/[[@{form7damagegood}]]@{form7damagegoodtype}/[[@{form7damageamazing}]]@{form7damageamazingtype}}} {{results= [[?{Situation Modifier|None, 1d20cs<1cf>20|-7 Steps (-d20), 1d20cs<1cf>20-1d20cs<0cf<0|-4 Steps (-d12), 1d20cs<1cf>20-1d12cs<0cf<0|-3 Steps (-d8), 1d20cs<1cf>20-1d8cs<0cf<0|-2 Steps (-d6), 1d20cs<1cf>20-1d6cs<0cf<0|-1 Steps (-d4), 1d20cs<1cf>20-1d4cs<0cf<0|+1 Steps (+d4), 1d20cs<1cf>20+1d4cs<0cf<0|+2 Steps (+d6), 1d20cs<1cf>20+1d6cs<0cf<0|+3 Steps (+d8), 1d20cs<1cf>20+1d8cs<0cf<0|+4 Steps (+d12), 1d20cs<1cf>20+1d12cs<0cf<0|+7 Steps (+d20), 1d20cs<1cf>20+1d20cs<0cf<0|+6 Steps (+2d20), 1d20cs<1cf>20+2d20cs<0cf<0|+7 Steps (+3d20), 1d20cs<1cf>20+3d20cs<0cf<0}]]}}"></button><input type="text" name="attr_form7" placeholder="Enter Weapon Name"></TD>
+			<TD><input type="number" name="attr_form7score" class="sheet-score" value="0">/<input type="text" name="attr_form7scoregood" class="sheet-scoredisabled" disabled="true" value="(floor(@{form7score}/2))">/<input type="text" name="attr_form7scoreamazing" class="sheet-scoredisabled" disabled="true" value="(floor(@{form7score}/4))"></TD>
+			<TD><input type="text" name="attr_form7die" class="sheet-dicetype" value="+d4"></TD>
+			<TD><input type="text" name="attr_form7accuracy" class="sheet-dicetype" value="0"></TD>
+			<TD><input type="text" name="attr_form7type" class="sheet-dicetype"></TD>
+			<TD><input type="text" name="attr_form7range" class="sheet-range"></TD>
+			<TD><input type="text" name="attr_form7damageordinary" class="sheet-dicetype"><input type="text" name="attr_form7damageordinarytype" class="sheet-dmgtype">/<input type="text" name="attr_form7damagegood" class="sheet-dicetype"><input type="text" name="attr_form7damagegoodtype" class="sheet-dmgtype">/<input type="text" name="attr_form7damageamazing" class="sheet-dicetype"><input type="text" name="attr_form7damageamazingtype" class="sheet-dmgtype"></TD>
+		</TR>
+		<TR>
+			<TD><button type="roll" name="roll_weapon_8" value="&{template:default} {{name= @{character_name} - @{form8}}} {{score= [[@{form8score}]]/[[@{form8scoregood}]]/[[@{form8scoreamazing}]]}} {{type= @{form8type}}} {{range= @{form8range}}} {{damage= [[@{form8damageordinary}]]@{form8damageordinarytype}/[[@{form8damagegood}]]@{form8damagegoodtype}/[[@{form8damageamazing}]]@{form8damageamazingtype}}} {{results= [[?{Situation Modifier|None, 1d20cs<1cf>20|-8 Steps (-d20), 1d20cs<1cf>20-1d20cs<0cf<0|-4 Steps (-d12), 1d20cs<1cf>20-1d12cs<0cf<0|-3 Steps (-d8), 1d20cs<1cf>20-1d8cs<0cf<0|-2 Steps (-d6), 1d20cs<1cf>20-1d6cs<0cf<0|-1 Steps (-d4), 1d20cs<1cf>20-1d4cs<0cf<0|+1 Steps (+d4), 1d20cs<1cf>20+1d4cs<0cf<0|+2 Steps (+d6), 1d20cs<1cf>20+1d6cs<0cf<0|+3 Steps (+d8), 1d20cs<1cf>20+1d8cs<0cf<0|+4 Steps (+d12), 1d20cs<1cf>20+1d12cs<0cf<0|+8 Steps (+d20), 1d20cs<1cf>20+1d20cs<0cf<0|+6 Steps (+2d20), 1d20cs<1cf>20+2d20cs<0cf<0|+7 Steps (+3d20), 1d20cs<1cf>20+3d20cs<0cf<0}]]}}"></button><input type="text" name="attr_form8" placeholder="Enter Weapon Name"></TD>
+			<TD><input type="number" name="attr_form8score" class="sheet-score" value="0">/<input type="text" name="attr_form8scoregood" class="sheet-scoredisabled" disabled="true" value="(floor(@{form8score}/2))">/<input type="text" name="attr_form8scoreamazing" class="sheet-scoredisabled" disabled="true" value="(floor(@{form8score}/4))"></TD>
+			<TD><input type="text" name="attr_form8die" class="sheet-dicetype" value="+d4"></TD>
+			<TD><input type="text" name="attr_form8accuracy" class="sheet-dicetype" value="0"></TD>
+			<TD><input type="text" name="attr_form8type" class="sheet-dicetype"></TD>
+			<TD><input type="text" name="attr_form8range" class="sheet-range"></TD>
+			<TD><input type="text" name="attr_form8damageordinary" class="sheet-dicetype"><input type="text" name="attr_form8damageordinarytype" class="sheet-dmgtype">/<input type="text" name="attr_form8damagegood" class="sheet-dicetype"><input type="text" name="attr_form8damagegoodtype" class="sheet-dmgtype">/<input type="text" name="attr_form8damageamazing" class="sheet-dicetype"><input type="text" name="attr_form8damageamazingtype" class="sheet-dmgtype"></TD>
+		</TR>
+		<TR>
+			<TD><button type="roll" name="roll_weapon_9" value="&{template:default} {{name= @{character_name} - @{form9}}} {{score= [[@{form9score}]]/[[@{form9scoregood}]]/[[@{form9scoreamazing}]]}} {{type= @{form9type}}} {{range= @{form9range}}} {{damage= [[@{form9damageordinary}]]@{form9damageordinarytype}/[[@{form9damagegood}]]@{form9damagegoodtype}/[[@{form9damageamazing}]]@{form9damageamazingtype}}} {{results= [[?{Situation Modifier|None, 1d20cs<1cf>20|-9 Steps (-d20), 1d20cs<1cf>20-1d20cs<0cf<0|-4 Steps (-d12), 1d20cs<1cf>20-1d12cs<0cf<0|-3 Steps (-d8), 1d20cs<1cf>20-1d8cs<0cf<0|-2 Steps (-d6), 1d20cs<1cf>20-1d6cs<0cf<0|-1 Steps (-d4), 1d20cs<1cf>20-1d4cs<0cf<0|+1 Steps (+d4), 1d20cs<1cf>20+1d4cs<0cf<0|+2 Steps (+d6), 1d20cs<1cf>20+1d6cs<0cf<0|+3 Steps (+d8), 1d20cs<1cf>20+1d8cs<0cf<0|+4 Steps (+d12), 1d20cs<1cf>20+1d12cs<0cf<0|+9 Steps (+d20), 1d20cs<1cf>20+1d20cs<0cf<0|+6 Steps (+2d20), 1d20cs<1cf>20+2d20cs<0cf<0|+7 Steps (+3d20), 1d20cs<1cf>20+3d20cs<0cf<0}]]}}"></button><input type="text" name="attr_form9" placeholder="Enter Weapon Name"></TD>
+			<TD><input type="number" name="attr_form9score" class="sheet-score" value="0">/<input type="text" name="attr_form9scoregood" class="sheet-scoredisabled" disabled="true" value="(floor(@{form9score}/2))">/<input type="text" name="attr_form9scoreamazing" class="sheet-scoredisabled" disabled="true" value="(floor(@{form9score}/4))"></TD>
+			<TD><input type="text" name="attr_form9die" class="sheet-dicetype" value="+d4"></TD>
+			<TD><input type="text" name="attr_form9accuracy" class="sheet-dicetype" value="0"></TD>
+			<TD><input type="text" name="attr_form9type" class="sheet-dicetype"></TD>
+			<TD><input type="text" name="attr_form9range" class="sheet-range"></TD>
+			<TD><input type="text" name="attr_form9damageordinary" class="sheet-dicetype"><input type="text" name="attr_form9damageordinarytype" class="sheet-dmgtype">/<input type="text" name="attr_form9damagegood" class="sheet-dicetype"><input type="text" name="attr_form9damagegoodtype" class="sheet-dmgtype">/<input type="text" name="attr_form9damageamazing" class="sheet-dicetype"><input type="text" name="attr_form9damageamazingtype" class="sheet-dmgtype"></TD>
+		</TR>
+		<TR>
+			<TD><button type="roll" name="roll_weapon_10" value="&{template:default} {{name= @{character_name} - @{form10}}} {{score= [[@{form10score}]]/[[@{form10scoregood}]]/[[@{form10scoreamazing}]]}} {{type= @{form10type}}} {{range= @{form10range}}} {{damage= [[@{form10damageordinary}]]@{form10damageordinarytype}/[[@{form10damagegood}]]@{form10damagegoodtype}/[[@{form10damageamazing}]]@{form10damageamazingtype}}} {{results= [[?{Situation Modifier|None, 1d20cs<1cf>20|-10 Steps (-d20), 1d20cs<1cf>20-1d20cs<0cf<0|-4 Steps (-d12), 1d20cs<1cf>20-1d12cs<0cf<0|-3 Steps (-d8), 1d20cs<1cf>20-1d8cs<0cf<0|-2 Steps (-d6), 1d20cs<1cf>20-1d6cs<0cf<0|-1 Steps (-d4), 1d20cs<1cf>20-1d4cs<0cf<0|+1 Steps (+d4), 1d20cs<1cf>20+1d4cs<0cf<0|+2 Steps (+d6), 1d20cs<1cf>20+1d6cs<0cf<0|+3 Steps (+d8), 1d20cs<1cf>20+1d8cs<0cf<0|+4 Steps (+d12), 1d20cs<1cf>20+1d12cs<0cf<0|+10 Steps (+d20), 1d20cs<1cf>20+1d20cs<0cf<0|+6 Steps (+2d20), 1d20cs<1cf>20+2d20cs<0cf<0|+7 Steps (+3d20), 1d20cs<1cf>20+3d20cs<0cf<0}]]}}"></button><input type="text" name="attr_form10" placeholder="Enter Weapon Name"></TD>
+			<TD><input type="number" name="attr_form10score" class="sheet-score" value="0">/<input type="text" name="attr_form10scoregood" class="sheet-scoredisabled" disabled="true" value="(floor(@{form10score}/2))">/<input type="text" name="attr_form10scoreamazing" class="sheet-scoredisabled" disabled="true" value="(floor(@{form10score}/4))"></TD>
+			<TD><input type="text" name="attr_form10die" class="sheet-dicetype" value="+d4"></TD>
+			<TD><input type="text" name="attr_form10accuracy" class="sheet-dicetype" value="0"></TD>
+			<TD><input type="text" name="attr_form10type" class="sheet-dicetype"></TD>
+			<TD><input type="text" name="attr_form10range" class="sheet-range"></TD>
+			<TD><input type="text" name="attr_form10damageordinary" class="sheet-dicetype"><input type="text" name="attr_form10damageordinarytype" class="sheet-dmgtype">/<input type="text" name="attr_form10damagegood" class="sheet-dicetype"><input type="text" name="attr_form10damagegoodtype" class="sheet-dmgtype">/<input type="text" name="attr_form10damageamazing" class="sheet-dicetype"><input type="text" name="attr_form10damageamazingtype" class="sheet-dmgtype"></TD>
+		</TR>
 		</TABLE>
 
 		<table>