diff --git a/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html b/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
index 6c6bb03161..6f85098baf 100644
--- a/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
+++ b/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
@@ -496,7 +496,7 @@
                             <option value="4">4</option>
                             <option value="5">5</option>
                             <option value="6">6</option>
-			    <option value="7">7</option>
+                            <option value="7">7</option>
                             <option value="8">8</option>
                             </select>
                         </div>
@@ -641,7 +641,8 @@
                         <option value="@{engineer}">Engineer</option>
                         <option value="@{gambling}">Gambling</option>
                         </select>
-                    <input type="text" class="sheet-number" name="attr_weapon_damage-1" placeholder="Damage" style="width:25%"/>
+                    <input type="text" class="sheet-number" name="attr_dice_damage-1" placeholder="Dice Damage" style="width:12%"/>
+                    <input type="text" class="sheet-number" name="attr_flat_damage-1" placeholder="Flat Damage" style="width:12%"/>
                     <select class ="sheet-select" name="attr_weapon_damage_type-1" value="0" style="width: 15%">
                         <option value="None">Damage Type</option>
                         <option value="Normal">Normal</option>
@@ -654,8 +655,7 @@
                         </select>
                 </div>
                 <div>
-                    <button type='roll' class="sheet-damage_button" name="attr_weapon_roll-1" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} {{Attack Roll=[[[[@{weapon_select-1}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]]}} {{Damage=[[@{weapon_damage-1}]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}"></button>
-                    <input type="text" class="sheet-entry" value="S" readonly style="width:3%"/>
+                    <button type='roll' class="sheet-damage_button" name="attr_weapon_roll-1" style="width:5%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} {{Attack Roll=[[[[@{weapon_select-1}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]]}} {{Damage=[[[[@{dice_damage-1} + @{flat_damage-1}]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">S</button>
                     <input type="number" class="sheet-number" name="attr_weapon_ap_single-1" style="width:3%"/>
                     <input type="text" class="sheet-entry" value="T" readonly style="width:3%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_targeted-1" style="width:3%"/>
@@ -675,8 +675,22 @@
                     <input type="text" class="sheet-entry" value="Notes" disabled="true" style="width:7%"/>
                     <input type="checkbox" class="sheet-toggle-show"/><span></span>
                     <div class="sheet-body">
+                         <div>
+                            <input type="text" class="sheet-entry" value="Burst" disabled="true" style="width:7%"/>
+                            <button type='roll' class="sheet-damage_button" name="attr_duo_burst_roll-1" style="width: 7%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Duo</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_spray_burst_roll-1" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Spray</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_shower_burst_roll-1" style="width: 10%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Shower</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_storm_burst_roll-1" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Storm Burst=$[[8]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Storm</button>
+                            <input type="text" class="sheet-entry" value="Set-Up" disabled="true" style="width:7%"/>
+                            <button type='roll' class="sheet-damage_button" name="attr_duo_burst_setup_roll-1" style="width: 7%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Duo</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_spray_burst_setup_roll-1" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Spray</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_shower_burst_setup_roll-1" style="width: 10%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Shower</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_storm_burst_setup_roll-1" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-1}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-1} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Storm Burst=$[[8]]}} {{Damage=[[[[ceil(@{dice_damage-1} + (@{flat_damage-1}/2))]]]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Damage Type=@{weapon_damage_type-1}}} {{desc=@{weapon_notes-1}}}">Storm</button>
+                            </div>
+                            <div>
                         <textarea style="width:45%" name="attr_weapon_notes-1" placeholder="Display Notes"></textarea>
                         <textarea style="width:45%" name="attr_weapon_display-1" placeholder="Concealed Notes"></textarea>
+                        </div>
                     </div>
                 </div>
                 <div>
@@ -688,7 +702,7 @@
         <div class='sheet-col'>
             <div class="sheet-center">
                 <div>
-                    <input type="text" class="sheet-number" name="attr_weapon_name-2" placeholder="Weapon Name"  style="width:30%"/>
+                    <input type="text" class="sheet-number" name="attr_weapon_name-2" placeholder="Weapon Name" style="width:30%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_range-2" placeholder="Rng" style="width:6%"/><input type="text" class="sheet-entry" value="ft" disabled="true" style="width:3%"/>
                     <select class ="sheet-select" name="attr_weapon_select-2" style="width: 18%" value="0">
                         <option value="0">Skill</option>
@@ -704,7 +718,8 @@
                         <option value="@{engineer}">Engineer</option>
                         <option value="@{gambling}">Gambling</option>
                         </select>
-                    <input type="text" class="sheet-number" name="attr_weapon_damage-2" placeholder="Damage" style="width:25%"/>
+                    <input type="text" class="sheet-number" name="attr_dice_damage-2" placeholder="Dice Damage" style="width:12%"/>
+                    <input type="text" class="sheet-number" name="attr_flat_damage-2" placeholder="Flat Damage" style="width:12%"/>
                     <select class ="sheet-select" name="attr_weapon_damage_type-2" value="0" style="width: 15%">
                         <option value="None">Damage Type</option>
                         <option value="Normal">Normal</option>
@@ -717,8 +732,7 @@
                         </select>
                 </div>
                 <div>
-                    <button type='roll' class="sheet-damage_button" name="attr_weapon_roll-2" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} {{Attack Roll=[[[[@{weapon_select-2}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]]}} {{Damage=[[@{weapon_damage-2}]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}"></button>
-                    <input type="text" class="sheet-entry" value="S" readonly style="width:3%"/>
+                    <button type='roll' class="sheet-damage_button" name="attr_weapon_roll-2" style="width:5%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} {{Attack Roll=[[[[@{weapon_select-2}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]]}} {{Damage=[[[[@{dice_damage-2} + @{flat_damage-2}]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">S</button>
                     <input type="number" class="sheet-number" name="attr_weapon_ap_single-2" style="width:3%"/>
                     <input type="text" class="sheet-entry" value="T" readonly style="width:3%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_targeted-2" style="width:3%"/>
@@ -738,9 +752,26 @@
                     <input type="text" class="sheet-entry" value="Notes" disabled="true" style="width:7%"/>
                     <input type="checkbox" class="sheet-toggle-show"/><span></span>
                     <div class="sheet-body">
+                         <div>
+                            <input type="text" class="sheet-entry" value="Burst" disabled="true" style="width:7%"/>
+                            <button type='roll' class="sheet-damage_button" name="attr_duo_burst_roll-2" style="width: 7%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Duo</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_spray_burst_roll-2" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Spray</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_shower_burst_roll-2" style="width: 10%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Shower</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_storm_burst_roll-2" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 20 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 20]] - 20]] -20]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Storm Burst=$[[8]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Storm</button>
+                            <input type="text" class="sheet-entry" value="Set-Up" disabled="true" style="width:7%"/>
+                            <button type='roll' class="sheet-damage_button" name="attr_duo_burst_setup_roll-2" style="width: 7%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Duo</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_spray_burst_setup_roll-2" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Spray</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_shower_burst_setup_roll-2" style="width: 10%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Shower</button>
+                            <button type='roll' class="sheet-damage_button" name="attr_storm_burst_setup_roll-2" style="width: 8%" value="&{template:custom} {{title=@{weapon_name-2}}} {{subtitle=@{character_name}}} [[[[[[[[[[[[@{weapon_select-2} + [[?{Hit Chance|0}]] - 10 - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]] - 10]] - 10]] -10]]]] {{Duo Burst=$[[5]]}} {{Spray Burst=$[[6]]}} {{Shower Burst=$[[7]]}} {{Storm Burst=$[[8]]}} {{Damage=[[[[ceil(@{dice_damage-2} + (@{flat_damage-2}/2))]]]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Damage Type=@{weapon_damage_type-2}}} {{desc=@{weapon_notes-2}}}">Storm</button>
+                            </div>
+                            <div>
                         <textarea style="width:45%" name="attr_weapon_notes-2" placeholder="Display Notes"></textarea>
                         <textarea style="width:45%" name="attr_weapon_display-2" placeholder="Concealed Notes"></textarea>
+                        </div>
                     </div>
+                </div>
+                <div>
+                
             </div>
         </div>
 </fieldset>