diff --git a/Iron Kingdoms RPG/IKPRG.html b/Iron Kingdoms RPG/IKPRG.html
index 72a9369bff..cfb378dad7 100644
--- a/Iron Kingdoms RPG/IKPRG.html	
+++ b/Iron Kingdoms RPG/IKPRG.html	
@@ -23,7 +23,7 @@
                         <div class="sheet-stats-character-name">Character Name</div>
                         <div class="sheet-stats-character-name"><input class="sheet-stats-big" type="text" value="" name="attr_character_name" style="width:100%" placeholder="Character"/></div>                
                         <div class="sheet-stats-nickname">Nickname</div>
-                        <div class="sheet-stats-nickname"><input class="sheet-stats-base" type="text" value="" name="attr_nickname_name" placeholder="Nickname"/></div>    			
+                        <div class="sheet-stats-nickname"><input class="sheet-stats-base" type="text" value="" name="attr_nickname_name" placeholder="Nickname"/></div>        		
                         <table style="width:100%">
                             <tr>
                                 <td><div class="sheet-stats-height">Height</div></td>
@@ -2969,8 +2969,8 @@
                             <td><h5>Offensive?</h5></td>
                         </tr>
                         <tr>
-                            <td><button type='roll' name="attr_fellcall_attack_roll" class="sheet-skill_button" value='&{template:fellcall} {{character= @{character_name} }} {{fellcall= @{fellcall_name} }} {{range= @{fellcall_range}}} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{fellcalling_total}]] }} {{damage= [[2d6 + ?{Extra Effect Dice|0}d6 + @{fellcall_pow}]] }} {{notes= @{fellcall_details} }} {{location= [[ 1t[Hit-Location] ]]}' /></td>
-                            <td><button type='roll' name="attr_fellcall_attack_roll_tgt" class="sheet-skill_button" value='&{template:fellcall} {{character= @{character_name} }} {{target-token_name= at @{target|token_name} }} {{target-def= [[@{target|def}]] }} {{target-armor=  [[@{target|arm}]] }} {{fellcall= @{fellcall_name} }} {{range= @{fellcall_range}}} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{fellcalling_total}]] }} {{damage= [[2d6 + ?{Extra Effect Dice|0}d6 + @{fellcall_pow}]] }} {{notes= @{fellcall_details} }}  {{location= [[ 1t[Hit-Location] ]]}' /></td>
+                            <td><button type='roll' name="attr_fellcall_attack_roll" class="sheet-skill_button" value='&{template:fellcall} {{character= @{character_name} }} {{fellcall= @{fellcall_name} }} {{range= @{fellcall_range}}} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{fellcalling_total}]] }} {{damage= [[2d6 + ?{Extra Effect Dice|0}d6 + @{fellcall_pow}]] }} {{notes= @{fellcall_details} }} {{location= [[@{hit-loc} ]]}}' /></td>
+                            <td><button type='roll' name="attr_fellcall_attack_roll_tgt" class="sheet-skill_button" value='&{template:fellcall} {{character= @{character_name} }} {{target-token_name= at @{target|token_name} }} {{target-def= [[@{target|def}]] }} {{target-armor=  [[@{target|arm}]] }} {{fellcall= @{fellcall_name} }} {{range= @{fellcall_range}}} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{fellcalling_total}]] }} {{damage= [[2d6 + ?{Extra Effect Dice|0}d6 + @{fellcall_pow}]] }} {{notes= @{fellcall_details} }}  {{location= [[@{hit-loc} ]]}}' /></td>
                             <td><div class="sheet-spell_select_text"><input class="sheet-input-center-aligned" type="text" name="attr_fellcall_name" value="" /></div></td>
                             <td><select class="sheet-select sheet-input-center-aligned" name="attr_fellcall_range" style="width:120px">
                                 <option value="Base to Base">Base to Base</option>
@@ -3025,8 +3025,8 @@
                                     <td><h5>Weapon<br>POW</h5></td>
                                 </tr>
                                 <tr>
-                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot_weapon_name} }} {{range= @{runeshot_effectiverange} }} {{extreme-range= @{runeshot_extremerange} }} {{attack= [[ [[(2 + @{runeshot-Accuracy})]]d6 + ?{Extra Attack Dice|0}d6 + @{runeshot_RAT_total}]] }} {{damage= [[ [[(2 + @{runeshot-Brutal})]]d6 + ?{Extra Damage Dice|0}d6 + @{runeshot_damage_total}]] }}{{notes= @{note-runeshot} }}{{Black_Penny= @{runeshot-Black_Penny}}} {{Detonator= @{runeshot-Detonator}}}{{Earth_Shaker= @{runeshot-Earth_Shaker}}}{{Fire_Beacon= @{runeshot-Fire_Beacon}}}{{Freeze_Fire= @{runeshot-Freeze_Fire}}}{{Heart_Stopper= @{runeshot-Heart_Stopper}}}{{Iron_Rot= @{runeshot-Iron_Rot} }}{{Molten_Shot= @{runeshot-Molten_Shot} }}{{Momentum= @{runeshot-Momentum}}}{{Phantom_Seeker= @{runeshot-Phantom_Seeker} }}{{Shadow_Fire= @{runeshot-Shadow_Fire} }}{{Silencer= @{runeshot-Silencer}}}{{Spell_Cracker= @{runeshot-Spell_Cracker} }}{{Spontaneous_Combustion= @{runeshot-Spontaneous_Combustion}}}{{Thunderbolt= @{runeshot-Thunderbolt} }}{{Trick_Shot= @{runeshot-Trick_Shot} }}{{location= [[ 1t[Hit-Location] ]]}}' /></td>
-                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot_tgt" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{runeshot_effectiverange} }} {{extreme-range= @{runeshot_extremerange} }} {{attack= [[2d6 +  ?{Extra Attack Dice|0}d6 + @{runeshot_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[2d6 +  ?{Extra Damage Dice|0}d6 + @{runeshot_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-runeshot} @{runeshot-Black_Penny} <br> <br> @{runeshot-Detonator} <br> @{runeshot-Earth_Shaker} <br> @{runeshot-Fire_Beacon} }} {{location= [[ 1t[Hit-Location] ]]}}' /></td>
+                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot_weapon_name} }} {{range= @{runeshot_effectiverange} }} {{extreme-range= @{runeshot_extremerange} }} {{attack= [[ [[(2 + @{runeshot-Accuracy})]]d6 + ?{Extra Attack Dice|0}d6 + @{runeshot_RAT_total}]] }} {{damage= [[ [[(2 + @{runeshot-Brutal})]]d6 + ?{Extra Damage Dice|0}d6 + @{runeshot_damage_total}]] }}{{notes= @{note-runeshot} }}{{Black_Penny= @{runeshot-Black_Penny}}} {{Detonator= @{runeshot-Detonator}}}{{Earth_Shaker= @{runeshot-Earth_Shaker}}}{{Fire_Beacon= @{runeshot-Fire_Beacon}}}{{Freeze_Fire= @{runeshot-Freeze_Fire}}}{{Heart_Stopper= @{runeshot-Heart_Stopper}}}{{Iron_Rot= @{runeshot-Iron_Rot} }}{{Molten_Shot= @{runeshot-Molten_Shot} }}{{Momentum= @{runeshot-Momentum}}}{{Phantom_Seeker= @{runeshot-Phantom_Seeker} }}{{Shadow_Fire= @{runeshot-Shadow_Fire} }}{{Silencer= @{runeshot-Silencer}}}{{Spell_Cracker= @{runeshot-Spell_Cracker} }}{{Spontaneous_Combustion= @{runeshot-Spontaneous_Combustion}}}{{Thunderbolt= @{runeshot-Thunderbolt} }}{{Trick_Shot= @{runeshot-Trick_Shot} }}{{location= [[@{hit-loc} ]]}}' /></td>
+                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot_tgt" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{runeshot_effectiverange} }} {{extreme-range= @{runeshot_extremerange} }} {{attack= [[2d6 +  ?{Extra Attack Dice|0}d6 + @{runeshot_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[2d6 +  ?{Extra Damage Dice|0}d6 + @{runeshot_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-runeshot} }}{{Black_Penny= @{runeshot-Black_Penny}}} {{Detonator= @{runeshot-Detonator}}}{{Earth_Shaker= @{runeshot-Earth_Shaker}}}{{Fire_Beacon= @{runeshot-Fire_Beacon}}}{{Freeze_Fire= @{runeshot-Freeze_Fire}}}{{Heart_Stopper= @{runeshot-Heart_Stopper}}}{{Iron_Rot= @{runeshot-Iron_Rot} }}{{Molten_Shot= @{runeshot-Molten_Shot} }}{{Momentum= @{runeshot-Momentum}}}{{Phantom_Seeker= @{runeshot-Phantom_Seeker} }}{{Shadow_Fire= @{runeshot-Shadow_Fire} }}{{Silencer= @{runeshot-Silencer}}}{{Spell_Cracker= @{runeshot-Spell_Cracker} }}{{Spontaneous_Combustion= @{runeshot-Spontaneous_Combustion}}}{{Thunderbolt= @{runeshot-Thunderbolt} }}{{Trick_Shot= @{runeshot-Trick_Shot} }}{{location= [[@{hit-loc} ]]}}' /></td>
                                     <td><input class="sheet-input-center-aligned" type="text" name="attr_runeshot_weapon_name"/></td>
                                     <td><select class ="sheet-select sheet-clearbox" name="attr_runeshot_select" value="0" style="width:95px">
                                             <option class="sheet-blackfont" value="@{pistol_total}">Pistol</option>
@@ -3114,8 +3114,8 @@
                                     <td><h5>Weapon<br>POW</h5></td>
                                 </tr>
                                 <tr>
-                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot2" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot2_weapon_name} }} {{range= @{runeshot2_effectiverange} }} {{extreme-range= @{runeshot2_extremerange} }} {{attack= [[ [[(2 + @{runeshot2-Accuracy})]]d6 + ?{Extra Attack Dice|0}d6 + @{runeshot2_RAT_total}]] }} {{damage= [[ [[(2 + @{runeshot2-Brutal})]]d6 + ?{Extra Damage Dice|0}d6 + @{runeshot2_damage_total}]] }}{{notes= @{note-runeshot2} }}{{Black_Penny= @{runeshot2-Black_Penny}}} {{Detonator= @{runeshot2-Detonator}}}{{Earth_Shaker= @{runeshot2-Earth_Shaker}}}{{Fire_Beacon= @{runeshot2-Fire_Beacon}}}{{Freeze_Fire= @{runeshot2-Freeze_Fire}}}{{Heart_Stopper= @{runeshot2-Heart_Stopper}}}{{Iron_Rot= @{runeshot2-Iron_Rot} }}{{Molten_Shot= @{runeshot2-Molten_Shot} }}{{Momentum= @{runeshot2-Momentum}}}{{Phantom_Seeker= @{runeshot2-Phantom_Seeker} }}{{Shadow_Fire= @{runeshot2-Shadow_Fire} }}{{Silencer= @{runeshot2-Silencer}}}{{Spell_Cracker= @{runeshot2-Spell_Cracker} }}{{Spontaneous_Combustion= @{runeshot2-Spontaneous_Combustion}}}{{Thunderbolt= @{runeshot2-Thunderbolt} }}{{Trick_Shot= @{runeshot2-Trick_Shot} }}{{location= [[ 1t[Hit-Location] ]]}}' /></td>
-                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot2_tgt" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot2_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{runeshot2_effectiverange} }} {{extreme-range= @{runeshot2_extremerange} }} {{attack= [[2d6 +  ?{Extra Attack Dice|0}d6 + @{runeshot2_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[2d6 +  ?{Extra Damage Dice|0}d6 + @{runeshot2_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-runeshot2} @{runeshot2-Black_Penny} <br> <br> @{runeshot2-Detonator} <br> @{runeshot2-Earth_Shaker} <br> @{runeshot2-Fire_Beacon} }} {{location= [[ 1t[Hit-Location] ]]}}' /></td>
+                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot2" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot2_weapon_name} }} {{range= @{runeshot2_effectiverange} }} {{extreme-range= @{runeshot2_extremerange} }} {{attack= [[ [[(2 + @{runeshot2-Accuracy})]]d6 + ?{Extra Attack Dice|0}d6 + @{runeshot2_RAT_total}]] }} {{damage= [[ [[(2 + @{runeshot2-Brutal})]]d6 + ?{Extra Damage Dice|0}d6 + @{runeshot2_damage_total}]] }}{{notes= @{note-runeshot2} }}{{Black_Penny= @{runeshot2-Black_Penny}}} {{Detonator= @{runeshot2-Detonator}}}{{Earth_Shaker= @{runeshot2-Earth_Shaker}}}{{Fire_Beacon= @{runeshot2-Fire_Beacon}}}{{Freeze_Fire= @{runeshot2-Freeze_Fire}}}{{Heart_Stopper= @{runeshot2-Heart_Stopper}}}{{Iron_Rot= @{runeshot2-Iron_Rot} }}{{Molten_Shot= @{runeshot2-Molten_Shot} }}{{Momentum= @{runeshot2-Momentum}}}{{Phantom_Seeker= @{runeshot2-Phantom_Seeker} }}{{Shadow_Fire= @{runeshot2-Shadow_Fire} }}{{Silencer= @{runeshot2-Silencer}}}{{Spell_Cracker= @{runeshot2-Spell_Cracker} }}{{Spontaneous_Combustion= @{runeshot2-Spontaneous_Combustion}}}{{Thunderbolt= @{runeshot2-Thunderbolt} }}{{Trick_Shot= @{runeshot2-Trick_Shot} }}{{location= [[@{hit-loc}]]}}' /></td>
+                                    <td><button type='roll' class="sheet-skill_button" name="roll_runeshot2_tgt" value='&{template:runeshot}  {{character= @{character_name} }} {{weapon= @{runeshot2_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{runeshot2_effectiverange} }} {{extreme-range= @{runeshot2_extremerange} }} {{attack= [[2d6 +  ?{Extra Attack Dice|0}d6 + @{runeshot2_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[2d6 +  ?{Extra Damage Dice|0}d6 + @{runeshot2_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-runeshot2} }}{{Black_Penny= @{runeshot2-Black_Penny}}} {{Detonator= @{runeshot2-Detonator}}}{{Earth_Shaker= @{runeshot2-Earth_Shaker}}}{{Fire_Beacon= @{runeshot2-Fire_Beacon}}}{{Freeze_Fire= @{runeshot2-Freeze_Fire}}}{{Heart_Stopper= @{runeshot2-Heart_Stopper}}}{{Iron_Rot= @{runeshot2-Iron_Rot} }}{{Molten_Shot= @{runeshot2-Molten_Shot} }}{{Momentum= @{runeshot2-Momentum}}}{{Phantom_Seeker= @{runeshot2-Phantom_Seeker} }}{{Shadow_Fire= @{runeshot2-Shadow_Fire} }}{{Silencer= @{runeshot2-Silencer}}}{{Spell_Cracker= @{runeshot2-Spell_Cracker} }}{{Spontaneous_Combustion= @{runeshot2-Spontaneous_Combustion}}}{{Thunderbolt= @{runeshot2-Thunderbolt} }}{{Trick_Shot= @{runeshot2-Trick_Shot} }}{{location= [[@{hit-loc}]]}}' /></td>
                                     <td><input class="sheet-input-center-aligned" type="text" name="attr_runeshot2_weapon_name"/></td>
                                     <td><select class ="sheet-select sheet-clearbox" name="attr_runeshot2_select" value="0" style="width:95px">
                                             <option class="sheet-blackfont" value="@{pistol_total}">Pistol</option>
@@ -3275,8 +3275,8 @@
                             <td><div class="sheet-virtioso">Virtuoso</div></th>
                         </tr>
                         <tr>
-                            <td><button type='roll' class="sheet-skill_button" name="roll_ranged" value='&{template:weapon}  {{character= @{character_name} }} {{weapon= @{ranged_weapon_name} }} {{range= @{ranged_effectiverange} }} {{extreme-range= @{ranged_extremerange} }} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{ranged_RAT_total}]] }} {{damage= [[2d6 + ?{Extra Damage Dice|0}d6 + @{ranged_damage_total}]] }} {{notes= @{note-ranged}}} {{location= [[ 1t[Hit-Location] ]]}}' /></td>
-                            <td><button type='roll' class="sheet-skill_button" name="roll_ranged_tgt" value='&{template:weapon}  {{character= @{character_name} }} {{weapon= @{ranged_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{ranged_effectiverange} }} {{extreme-range= @{ranged_extremerange} }} {{attack= [[2d6 +  ?{Extra Attack Dice|0}d6 + @{ranged_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[2d6 +  ?{Extra Damage Dice|0}d6 + @{ranged_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-ranged}}} {{location= [[ 1t[Hit-Location] ]]}}' /></td>
+                            <td><button type='roll' class="sheet-skill_button" name="roll_ranged" value='&{template:weapon}  {{character= @{character_name} }} {{weapon= @{ranged_weapon_name} }} {{range= @{ranged_effectiverange} }} {{extreme-range= @{ranged_extremerange} }} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{ranged_RAT_total}]] }} {{damage= [[2d6 + ?{Extra Damage Dice|0}d6 + @{ranged_damage_total}]] }} {{notes= @{note-ranged}}} {{location= [[@{hit-loc} ]]}}' /></td>
+                            <td><button type='roll' class="sheet-skill_button" name="roll_ranged_tgt" value='&{template:weapon}  {{character= @{character_name} }} {{weapon= @{ranged_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{ranged_effectiverange} }} {{extreme-range= @{ranged_extremerange} }} {{attack= [[2d6 +  ?{Extra Attack Dice|0}d6 + @{ranged_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[2d6 +  ?{Extra Damage Dice|0}d6 + @{ranged_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-ranged}}} {{location= [[@{hit-loc} ]]}}' /></td>
                             <td><input class="sheet-input-center-aligned" type="text" value="" name="attr_ranged_weapon_name"/></td>
                             <td><select class ="sheet-select sheet-clearbox" name="attr_ranged_select" value="0" style="width:95px">
                                     <option class="sheet-blackfont" value="@{archery_total}">Archery</option>
@@ -3292,7 +3292,7 @@
                             <td><input type="number" class="sheet-stats-small" name="attr_ranged_damage_total" value="@{ranged_pow_mod} + @{ranged_pow}" disabled="true" /></td>
                             <td><input type="number" class="sheet-input-center-aligned" name="attr_ranged_pow" value="0" /></td>
                             <td><input type="number" class="sheet-input-center-aligned" name="attr_ranged_pow_mod" value="0" /></td>
-                            <td><button type='roll' class="sheet-virtioso_button" name="roll_ranged_virtuoso" value='&{template:weapon}  {{character= @{character_name} }} {{weapon= @{ranged_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{ranged_effectiverange} }} {{extreme-range= @{ranged_extremerange} }} {{attack= [[3d6k2 + ?{Extra Attack Dice|0}d6 + @{ranged_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[3d6k2 + ?{Extra Damage Dice|0}d6 + @{ranged_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-ranged}}} {{location= [[ 1t[Hit-Location] ]]}}' /></td>
+                            <td><button type='roll' class="sheet-virtioso_button" name="roll_ranged_virtuoso" value='&{template:weapon}  {{character= @{character_name} }} {{weapon= @{ranged_weapon_name} }} {{target-token_name= at @{target|token_name} }} {{range= @{ranged_effectiverange} }} {{extreme-range= @{ranged_extremerange} }} {{attack= [[3d6k2 + ?{Extra Attack Dice|0}d6 + @{ranged_RAT_total}]] }} {{target-def= [[@{target|def}]] }} {{damage= [[3d6k2 + ?{Extra Damage Dice|0}d6 + @{ranged_damage_total}]] }} {{target-armor=[[@{target|arm}]] }} {{notes= @{note-ranged}}} {{location= [[@{hit-loc} ]]}}' /></td>
                         </tr>
                         <tr>
                             <td colspan="12"><textarea class="sheet-input-center-aligned" wrap="soft" value="" name="attr_note-ranged" style="width:99%" placeholder="Misc Notes"></textarea></td>
@@ -3325,12 +3325,16 @@
                             <td><b><div class="sheet-virtioso">Virtuoso</div></b></td>
                         </tr>
                         <tr>
-                            <td><button type='roll' class="sheet-skill_button" name="roll_explosive" value='&{template:boom}  {{character= @{character_name} }} {{weapon= @{explosive_weapon_name} }} {{range= @{explosive_effectiverange} }} {{extreme-range= @{explosive_extremerange} }} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{explosive_RAT_total}]] }} {{damage= [[2d6 + ?{Extra Damage Dice|0}d6 + @{explosive_damage_total}]] }} {{notes= @{note-explosive} }} {{aoe= @{explosive_aoe} }} {{aoe-damage= [[2d6+ (@{explosive_damage_total}/2)]] }} {{location= [[ 1t[Hit-Location] ]]}' /></td>
-                            <td><button type='roll' class="sheet-skill_button" name="roll_explosive-tgt" value='&{template:boom}  {{character= @{character_name} }} {{weapon= @{explosive_weapon_name} }} {{range= @{explosive_effectiverange} }} {{extreme-range= @{explosive_extremerange} }} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{explosive_RAT_total}]] }} {{damage= [[2d6 + ?{Extra Damage Dice|0}d6 + @{explosive_damage_total}]] }} {{notes= @{note-explosive} }} {{aoe= @{explosive_aoe} }} {{aoe-damage= [[2d6+ (@{explosive_damage_total}/2)]] }}  {{target-token_name= at @{target|token_name} }} {{target-def= [[@{target|def}]] }} {{target-armor=[[@{target|arm}]] }}  {{location= [[ 1t[Hit-Location] ]]}' /></td>
+                            <td><button type='roll' class="sheet-skill_button" name="roll_explosive" value='&{template:boom}  {{character= @{character_name} }} {{weapon= @{explosive_weapon_name} }} {{range= @{explosive_effectiverange} }} {{extreme-range= @{explosive_extremerange} }} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{explosive_RAT_total}]] }} {{damage= [[2d6 + ?{Extra Damage Dice|0}d6 + @{explosive_damage_total}]] }} {{notes= @{note-explosive} }} {{aoe= @{explosive_aoe} }} {{aoe-damage= [[2d6+ (@{explosive_damage_total}/2)]] }} {{location= [[@{hit-loc} ]]}}' /></td>
+                            <td><button type='roll' class="sheet-skill_button" name="roll_explosive-tgt" value='&{template:boom}  {{character= @{character_name} }} {{weapon= @{explosive_weapon_name} }} {{range= @{explosive_effectiverange} }} {{extreme-range= @{explosive_extremerange} }} {{attack= [[2d6 + ?{Extra Attack Dice|0}d6 + @{explosive_RAT_total}]] }} {{damage= [[2d6 + ?{Extra Damage Dice|0}d6 + @{explosive_damage_total}]] }} {{notes= @{note-explosive} }} {{aoe= @{explosive_aoe} }} {{aoe-damage= [[2d6+ (@{explosive_damage_total}/2)]] }}  {{target-token_name= at @{target|token_name} }} {{target-def= [[@{target|def}]] }} {{target-armor=[[@{target|arm}]] }}  {{location= [[@{hit-loc} ]]}}' /></td>
                             <td><input class="sheet-input-center-aligned" type="text" value="" name="attr_explosive_weapon_name"/></td>
                             <td><select class ="sheet-select sheet-clearbox" name="attr_explosive_select" value="0" style="width:75px">
+                                    <option class="sheet-blackfont" value="@{archery_total}">Archery</option>
+                                    <option class="sheet-blackfont" value="@{crossbow_total}">Crossbow</option>
                                     <option class="sheet-blackfont" value="@{heavyartillery_total}">Heavy</option>
                                     <option class="sheet-blackfont" value="@{lightartillery_total}">Light</option>
+                                    <option class="sheet-blackfont" value="@{pistol_total}">Pistol</option>
+                                    <option class="sheet-blackfont" value="@{rifle_total}">Rifle</option>
                                     <option class="sheet-blackfont" value="@{thrownweapon_total}">Thrown</option></select></td>
                             <td><input type="number" class="sheet-input-center-aligned" name="attr_explosive_ammo" value="0" /></td>
                             <td><input type="number" class="sheet-input-center-aligned" name="attr_explosive_effectiverange" value="0" /></td>
@@ -3345,7 +3349,7 @@
                                 <option value="3 (18ft) [[2d6 + (@{explosive_pow})/2]] damage">3 (18ft)</option>
                                 <option value="4 (24ft) [[2d6 + (@{explosive_pow})/2]] damage">4 (24ft)</option>
                                 <option value="5 (30ft) [[2d6 + (@{explosive_pow})/2]] damage">5 (30ft)</option></select></td>
-                            <td><button type='roll' class="sheet-virtioso_button" name="roll_explosive-virtuoso"  value='&{template:boom}  {{character= @{character_name} }} {{weapon= @{explosive_weapon_name} }} {{range= @{explosive_effectiverange} }} {{extreme-range= @{explosive_extremerange} }} {{attack= [[3d6k2 + ?{Extra Attack Dice|0}d6 + @{explosive_RAT_total}]] }} {{damage= [[3d6k2 + ?{Extra Damage Dice|0}d6 + @{explosive_damage_total}]] }} {{notes= @{note-explosive} }} {{aoe= @{explosive_aoe} }} {{aoe-damage= [[2d6+ (@{explosive_damage_total}/2)]] }}  {{target-token_name= at @{target|token_name} }} {{target-def= [[@{target|def}]] }} {{target-armor=[[@{target|arm}]] }} {{location= [[ 1t[Hit-Location] ]]}' /></td>
+                            <td><button type='roll' class="sheet-virtioso_button" name="roll_explosive-virtuoso"  value='&{template:boom}  {{character= @{character_name} }} {{weapon= @{explosive_weapon_name} }} {{range= @{explosive_effectiverange} }} {{extreme-range= @{explosive_extremerange} }} {{attack= [[3d6k2 + ?{Extra Attack Dice|0}d6 + @{explosive_RAT_total}]] }} {{damage= [[3d6k2 + ?{Extra Damage Dice|0}d6 + @{explosive_damage_total}]] }} {{notes= @{note-explosive} }} {{aoe= @{explosive_aoe} }} {{aoe-damage= [[2d6+ (@{explosive_damage_total}/2)]] }}  {{target-token_name= at @{target|token_name} }} {{target-def= [[@{target|def}]] }} {{target-armor=[[@{target|arm}]] }} {{location= [[@{hit-loc} ]]}}' /></td>
                         </tr>
                         <tr>
                             <td colspan="12"><textarea class="sheet-input-center-aligned" wrap="soft" value="" name="attr_note-explosive" style="width:99%" placeholder="Misc Notes"></textarea></td>