diff --git a/Outbreak/outbreak.html b/Outbreak/outbreak.html
index 4969d4afd8..0acc68d5e9 100644
--- a/Outbreak/outbreak.html
+++ b/Outbreak/outbreak.html
@@ -1,5 +1,5 @@
 
-<input name="attr_version" type="hidden" value="1"/>
+<input name="attr_version" type="hidden" value="1.001"/>
 <div class="container">
   <input name="attr_tab" type="hidden" value="main"/>
   <div class="main tab">
@@ -15,7 +15,7 @@
       <div class="spewbox box">
         <h1 class="green-header" data-i18n="S.P.E.W Attributes">S.P.E.W Attributes</h1>
         <div class="grid dicetypes">
-          <div class="grid attributes"><img alt="Strength" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Attributes_Strength_40x40.png"/>
+          <div class="grid attributes"><img alt="Strength" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Attributes_Strength_40x40.png"/>
             <h3 data-i18n="Strength">Strength</h3>
             <div class="grid">
               <input name="attr_strength" type="hidden" value="[[(@{strength_bonus}*10)+@{strength_base}]]"/>
@@ -27,7 +27,7 @@
               </label>
             </div>
           </div>
-          <div class="grid attributes"><img alt="Perception" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Attributes_Perception_40x40.png"/>
+          <div class="grid attributes"><img alt="Perception" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Attributes_Perception_40x40.png"/>
             <h3 data-i18n="Perception">Perception</h3>
             <div class="grid">
               <input name="attr_perception" type="hidden" value="[[(@{perception_bonus}*10)+@{perception_base}]]"/>
@@ -39,7 +39,7 @@
               </label>
             </div>
           </div>
-          <div class="grid attributes"><img alt="Empathy" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Attributes_Empathy_40x40.png"/>
+          <div class="grid attributes"><img alt="Empathy" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Attributes_Empathy_40x40.png"/>
             <h3 data-i18n="Empathy">Empathy</h3>
             <div class="grid">
               <input name="attr_empathy" type="hidden" value="[[(@{empathy_bonus}*10)+@{empathy_base}]]"/>
@@ -51,7 +51,7 @@
               </label>
             </div>
           </div>
-          <div class="grid attributes"><img alt="Willpower" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Attributes_Willpower_40x40.png"/>
+          <div class="grid attributes"><img alt="Willpower" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Attributes_Willpower_40x40.png"/>
             <h3 data-i18n="Willpower">Willpower</h3>
             <div class="grid">
               <input name="attr_willpower" type="hidden" value="[[(@{willpower_bonus}*10)+@{willpower_base}]]"/>
@@ -88,7 +88,7 @@
               <h3 data-i18n="Tot"></h3>
             </div>
             <div class="skill">
-              <input name="attr_balance_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_balance_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_balance_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_balance_total" type="hidden" value="(@{balance} [Skill]+@{balance_button_base} [Kit])"/>
               <button name="roll_Balance" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Balance}}} {{attr=Balance}} {{Target1=[[@{balance_total}]]}} {{Target2=[[@{balance_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{balance_total}-19]]}} {{dos2a=[[@{balance_total}-20]]}} {{dos2b=[[@{balance_total}-29]]}} {{dos3a=[[@{balance_total}-30]]}} {{dos3b=[[@{balance_total}-39]]}} {{dos4a=[[@{balance_total}-40]]}} {{dos4b=[[@{balance_total}-49]]}} {{dof1=[[@{balance_total}+19]]}} {{dof2a=[[@{balance_total}+20]]}} {{dof2b=[[@{balance_total}+29]]}} {{dof3a=[[@{balance_total}+30]]}} {{dof3b=[[@{balance_total}+39]]}} {{dof4a=[[@{balance_total}+40]]}} {{dof4b=[[@{balance_total}+49]]}}"> <span data-i18n="Balance">Balance</span></button>
@@ -100,7 +100,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_brawl_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_brawl_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_brawl_attributes" type="hidden" value="(@{strength}+@{perception_bonus})"/>
               <input name="attr_brawl_total" type="hidden" value="(@{brawl} [Skill]+@{brawl_button_base} [Kit])"/>
               <button name="roll_Brawl" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Brawl}}} {{attr=Brawl}} {{Target1=[[@{brawl_total}]]}} {{Target2=[[@{brawl_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{brawl_total}-19]]}} {{dos2a=[[@{brawl_total}-20]]}} {{dos2b=[[@{brawl_total}-29]]}} {{dos3a=[[@{brawl_total}-30]]}} {{dos3b=[[@{brawl_total}-39]]}} {{dos4a=[[@{brawl_total}-40]]}} {{dos4b=[[@{brawl_total}-49]]}} {{dof1=[[@{brawl_total}+19]]}} {{dof2a=[[@{brawl_total}+20]]}} {{dof2b=[[@{brawl_total}+29]]}} {{dof3a=[[@{brawl_total}+30]]}} {{dof3b=[[@{brawl_total}+39]]}} {{dof4a=[[@{brawl_total}+40]]}} {{dof4b=[[@{brawl_total}+49]]}}"> <span data-i18n="Brawl">Brawl</span></button>
@@ -112,7 +112,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_climb_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_climb_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_climb_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_climb_total" type="hidden" value="(@{climb} [Skill]+@{climb_button_base} [Kit])"/>
               <button name="roll_Climb" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Climb}}} {{attr=Climb}} {{Target1=[[@{climb_total}]]}} {{Target2=[[@{climb_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{climb_total}-19]]}} {{dos2a=[[@{climb_total}-20]]}} {{dos2b=[[@{climb_total}-29]]}} {{dos3a=[[@{climb_total}-30]]}} {{dos3b=[[@{climb_total}-39]]}} {{dos4a=[[@{climb_total}-40]]}} {{dos4b=[[@{climb_total}-49]]}} {{dof1=[[@{climb_total}+19]]}} {{dof2a=[[@{climb_total}+20]]}} {{dof2b=[[@{climb_total}+29]]}} {{dof3a=[[@{climb_total}+30]]}} {{dof3b=[[@{climb_total}+39]]}} {{dof4a=[[@{climb_total}+40]]}} {{dof4b=[[@{climb_total}+49]]}}"> <span data-i18n="Climb">Climb</span></button>
@@ -124,7 +124,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_composure_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{willpower_bonus}|Athletic Gear, @{athletic_gear}+@{willpower_bonus}|Bludgeon, @{bludgeoning}+@{willpower_bonus}|Climbing Gear, @{climbing_gear}+@{willpower_bonus}|Command Apparatus, @{command_app}+@{willpower_bonus}|Firefighting, @{firefighting}+@{willpower_bonus}|First Aid Kit, @{first_aid_kits}+@{willpower_bonus}|Long Gun, @{long_gun}+@{willpower_bonus}|Martial Arts, @{martial_arts}+@{willpower_bonus}|Medical Gear, @{medical_gear}+@{willpower_bonus}|Piercing, @{piercing}+@{willpower_bonus}|Pistol, @{pistol}+@{willpower_bonus}|Recon Gear, @{recon_gear}+@{willpower_bonus}|Slashing, @{slashing}+@{willpower_bonus}|Survival Kit, @{survival_kit}+@{willpower_bonus}|Swimming/Diving, @{swimming_diving}+@{willpower_bonus}|Throwing, @{throwing}+@{willpower_bonus}|Tools, @{tools}+@{willpower_bonus}|Value, @{value}+@{willpower_bonus}|Vehicles, @{vehicles}+@{willpower_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_composure_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_composure_attributes" type="hidden" value="(@{willpower}+@{empathy_bonus})"/>
               <input name="attr_composure_total" type="hidden" value="(@{composure} [Skill]+@{composure_button_base} [Kit])"/>
               <button name="roll_Composure" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Composure}}} {{attr=Composure}} {{Target1=[[@{composure_total}]]}} {{Target2=[[@{composure_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{composure_total}-19]]}} {{dos2a=[[@{composure_total}-20]]}} {{dos2b=[[@{composure_total}-29]]}} {{dos3a=[[@{composure_total}-30]]}} {{dos3b=[[@{composure_total}-39]]}} {{dos4a=[[@{composure_total}-40]]}} {{dos4b=[[@{composure_total}-49]]}} {{dof1=[[@{composure_total}+19]]}} {{dof2a=[[@{composure_total}+20]]}} {{dof2b=[[@{composure_total}+29]]}} {{dof3a=[[@{composure_total}+30]]}} {{dof3b=[[@{composure_total}+39]]}} {{dof4a=[[@{composure_total}+40]]}} {{dof4b=[[@{composure_total}+49]]}}"> <span data-i18n="Composure">Composure</span></button>
@@ -136,7 +136,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_dodge_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_dodge_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_dodge_attributes" type="hidden" value="(@{perception}+@{strength_bonus})"/>
               <input name="attr_dodge_total" type="hidden" value="(@{dodge} [Skill]+@{dodge_button_base} [Kit])"/>
               <button name="roll_Dodge" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Dodge}}} {{attr=Dodge}} {{Target1=[[@{dodge_total}]]}} {{Target2=[[@{dodge_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{dodge_total}-19]]}} {{dos2a=[[@{dodge_total}-20]]}} {{dos2b=[[@{dodge_total}-29]]}} {{dos3a=[[@{dodge_total}-30]]}} {{dos3b=[[@{dodge_total}-39]]}} {{dos4a=[[@{dodge_total}-40]]}} {{dos4b=[[@{dodge_total}-49]]}} {{dof1=[[@{dodge_total}+19]]}} {{dof2a=[[@{dodge_total}+20]]}} {{dof2b=[[@{dodge_total}+29]]}} {{dof3a=[[@{dodge_total}+30]]}} {{dof3b=[[@{dodge_total}+39]]}} {{dof4a=[[@{dodge_total}+40]]}} {{dof4b=[[@{dodge_total}+49]]}}"> <span data-i18n="Dodge">Dodge</span></button>
@@ -148,7 +148,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_endurance_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_endurance_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_endurance_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_endurance_total" type="hidden" value="(@{endurance} [Skill]+@{endurance_button_base} [Kit])"/>
               <button name="roll_Endurance" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Endurance}}} {{attr=Endurance}} {{Target1=[[@{endurance_total}]]}} {{Target2=[[@{endurance_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{endurance_total}-19]]}} {{dos2a=[[@{endurance_total}-20]]}} {{dos2b=[[@{endurance_total}-29]]}} {{dos3a=[[@{endurance_total}-30]]}} {{dos3b=[[@{endurance_total}-39]]}} {{dos4a=[[@{endurance_total}-40]]}} {{dos4b=[[@{endurance_total}-49]]}} {{dof1=[[@{endurance_total}+19]]}} {{dof2a=[[@{endurance_total}+20]]}} {{dof2b=[[@{endurance_total}+29]]}} {{dof3a=[[@{endurance_total}+30]]}} {{dof3b=[[@{endurance_total}+39]]}} {{dof4a=[[@{endurance_total}+40]]}} {{dof4b=[[@{endurance_total}+49]]}}"> <span data-i18n="Endurance">Endurance</span></button>
@@ -160,7 +160,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_expression_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_expression_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_expression_attributes" type="hidden" value="(@{empathy}+@{perception_bonus})"/>
               <input name="attr_expression_total" type="hidden" value="(@{expression} [Skill]+@{expression_button_base} [Kit])"/>
               <button name="roll_Expression" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Expression}}} {{attr=Expression}} {{Target1=[[@{expression_total}]]}} {{Target2=[[@{expression_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{expression_total}-19]]}} {{dos2a=[[@{expression_total}-20]]}} {{dos2b=[[@{expression_total}-29]]}} {{dos3a=[[@{expression_total}-30]]}} {{dos3b=[[@{expression_total}-39]]}} {{dos4a=[[@{expression_total}-40]]}} {{dos4b=[[@{expression_total}-49]]}} {{dof1=[[@{expression_total}+19]]}} {{dof2a=[[@{expression_total}+20]]}} {{dof2b=[[@{expression_total}+29]]}} {{dof3a=[[@{expression_total}+30]]}} {{dof3b=[[@{expression_total}+39]]}} {{dof4a=[[@{expression_total}+40]]}} {{dof4b=[[@{expression_total}+49]]}}"> <span data-i18n="Expression">Expression</span></button>
@@ -172,7 +172,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_grapple_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_grapple_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_grapple_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_grapple_total" type="hidden" value="(@{grapple} [Skill]+@{grapple_button_base} [Kit])"/>
               <button name="roll_Grapple" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Grapple}}} {{attr=Grapple}} {{Target1=[[@{grapple_total}]]}} {{Target2=[[@{grapple_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{grapple_total}-19]]}} {{dos2a=[[@{grapple_total}-20]]}} {{dos2b=[[@{grapple_total}-29]]}} {{dos3a=[[@{grapple_total}-30]]}} {{dos3b=[[@{grapple_total}-39]]}} {{dos4a=[[@{grapple_total}-40]]}} {{dos4b=[[@{grapple_total}-49]]}} {{dof1=[[@{grapple_total}+19]]}} {{dof2a=[[@{grapple_total}+20]]}} {{dof2b=[[@{grapple_total}+29]]}} {{dof3a=[[@{grapple_total}+30]]}} {{dof3b=[[@{grapple_total}+39]]}} {{dof4a=[[@{grapple_total}+40]]}} {{dof4b=[[@{grapple_total}+49]]}}"> <span data-i18n="Grapple">Grapple</span></button>
@@ -190,7 +190,7 @@
               <h3 data-i18n="Tot"></h3>
             </div>
             <div class="skill">
-              <input name="attr_hold_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{willpower_bonus}|Athletic Gear, @{athletic_gear}+@{willpower_bonus}|Bludgeon, @{bludgeoning}+@{willpower_bonus}|Climbing Gear, @{climbing_gear}+@{willpower_bonus}|Command Apparatus, @{command_app}+@{willpower_bonus}|Firefighting, @{firefighting}+@{willpower_bonus}|First Aid Kit, @{first_aid_kits}+@{willpower_bonus}|Long Gun, @{long_gun}+@{willpower_bonus}|Martial Arts, @{martial_arts}+@{willpower_bonus}|Medical Gear, @{medical_gear}+@{willpower_bonus}|Piercing, @{piercing}+@{willpower_bonus}|Pistol, @{pistol}+@{willpower_bonus}|Recon Gear, @{recon_gear}+@{willpower_bonus}|Slashing, @{slashing}+@{willpower_bonus}|Survival Kit, @{survival_kit}+@{willpower_bonus}|Swimming/Diving, @{swimming_diving}+@{willpower_bonus}|Throwing, @{throwing}+@{willpower_bonus}|Tools, @{tools}+@{willpower_bonus}|Value, @{value}+@{willpower_bonus}|Vehicles, @{vehicles}+@{willpower_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_hold_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_hold_attributes" type="hidden" value="(@{willpower}+@{perception_bonus})"/>
               <input name="attr_hold_total" type="hidden" value="(@{hold} [Skill]+@{hold_button_base} [Kit])"/>
               <button name="roll_Hold" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Hold}}} {{attr=Hold}} {{Target1=[[@{hold_total}]]}} {{Target2=[[@{hold_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{hold_total}-19]]}} {{dos2a=[[@{hold_total}-20]]}} {{dos2b=[[@{hold_total}-29]]}} {{dos3a=[[@{hold_total}-30]]}} {{dos3b=[[@{hold_total}-39]]}} {{dos4a=[[@{hold_total}-40]]}} {{dos4b=[[@{hold_total}-49]]}} {{dof1=[[@{hold_total}+19]]}} {{dof2a=[[@{hold_total}+20]]}} {{dof2b=[[@{hold_total}+29]]}} {{dof3a=[[@{hold_total}+30]]}} {{dof3b=[[@{hold_total}+39]]}} {{dof4a=[[@{hold_total}+40]]}} {{dof4b=[[@{hold_total}+49]]}}"> <span data-i18n="Hold">Hold</span></button>
@@ -202,7 +202,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_jump_leap_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_jump_leap_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_jump_leap_attributes" type="hidden" value="(@{strength}+@{perception_bonus})"/>
               <input name="attr_jump_leap_total" type="hidden" value="(@{jump_leap} [Skill]+@{jump_leap_button_base} [Kit])"/>
               <button name="roll_Jump/Leap" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Jump/Leap}}} {{attr=Jump/Leap}} {{Target1=[[@{jump_leap_total}]]}} {{Target2=[[@{jump_leap_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{jump_leap_total}-19]]}} {{dos2a=[[@{jump_leap_total}-20]]}} {{dos2b=[[@{jump_leap_total}-29]]}} {{dos3a=[[@{jump_leap_total}-30]]}} {{dos3b=[[@{jump_leap_total}-39]]}} {{dos4a=[[@{jump_leap_total}-40]]}} {{dos4b=[[@{jump_leap_total}-49]]}} {{dof1=[[@{jump_leap_total}+19]]}} {{dof2a=[[@{jump_leap_total}+20]]}} {{dof2b=[[@{jump_leap_total}+29]]}} {{dof3a=[[@{jump_leap_total}+30]]}} {{dof3b=[[@{jump_leap_total}+39]]}} {{dof4a=[[@{jump_leap_total}+40]]}} {{dof4b=[[@{jump_leap_total}+49]]}}"> <span data-i18n="Jump/Leap">Jump/Leap</span></button>
@@ -214,7 +214,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_lift_pull_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strenght_bonus}|Athletic Gear, @{athletic_gear}+@{strenght_bonus}|Bludgeon, @{bludgeoning}+@{strenght_bonus}|Climbing Gear, @{climbing_gear}+@{strenght_bonus}|Command Apparatus, @{command_app}+@{strenght_bonus}|Firefighting, @{firefighting}+@{strenght_bonus}|First Aid Kit, @{first_aid_kits}+@{strenght_bonus}|Long Gun, @{long_gun}+@{strenght_bonus}|Martial Arts, @{martial_arts}+@{strenght_bonus}|Medical Gear, @{medical_gear}+@{strenght_bonus}|Piercing, @{piercing}+@{strenght_bonus}|Pistol, @{pistol}+@{strenght_bonus}|Recon Gear, @{recon_gear}+@{strenght_bonus}|Slashing, @{slashing}+@{strenght_bonus}|Survival Kit, @{survival_kit}+@{strenght_bonus}|Swimming/Diving, @{swimming_diving}+@{strenght_bonus}|Throwing, @{throwing}+@{strenght_bonus}|Tools, @{tools}+@{strenght_bonus}|Value, @{value}+@{strenght_bonus}|Vehicles, @{vehicles}+@{strenght_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_lift_pull_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_lift_pull_attributes" type="hidden" value="(@{strenght}+@{willpower_bonus})"/>
               <input name="attr_lift_pull_total" type="hidden" value="(@{lift_pull} [Skill]+@{lift_pull_button_base} [Kit])"/>
               <button name="roll_Lift/Pull" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Lift/Pull}}} {{attr=Lift/Pull}} {{Target1=[[@{lift_pull_total}]]}} {{Target2=[[@{lift_pull_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{lift_pull_total}-19]]}} {{dos2a=[[@{lift_pull_total}-20]]}} {{dos2b=[[@{lift_pull_total}-29]]}} {{dos3a=[[@{lift_pull_total}-30]]}} {{dos3b=[[@{lift_pull_total}-39]]}} {{dos4a=[[@{lift_pull_total}-40]]}} {{dos4b=[[@{lift_pull_total}-49]]}} {{dof1=[[@{lift_pull_total}+19]]}} {{dof2a=[[@{lift_pull_total}+20]]}} {{dof2b=[[@{lift_pull_total}+29]]}} {{dof3a=[[@{lift_pull_total}+30]]}} {{dof3b=[[@{lift_pull_total}+39]]}} {{dof4a=[[@{lift_pull_total}+40]]}} {{dof4b=[[@{lift_pull_total}+49]]}}"> <span data-i18n="Lift/Pull">Lift/Pull</span></button>
@@ -226,7 +226,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_resist_pain_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{willpower_bonus}|Athletic Gear, @{athletic_gear}+@{willpower_bonus}|Bludgeon, @{bludgeoning}+@{willpower_bonus}|Climbing Gear, @{climbing_gear}+@{willpower_bonus}|Command Apparatus, @{command_app}+@{willpower_bonus}|Firefighting, @{firefighting}+@{willpower_bonus}|First Aid Kit, @{first_aid_kits}+@{willpower_bonus}|Long Gun, @{long_gun}+@{willpower_bonus}|Martial Arts, @{martial_arts}+@{willpower_bonus}|Medical Gear, @{medical_gear}+@{willpower_bonus}|Piercing, @{piercing}+@{willpower_bonus}|Pistol, @{pistol}+@{willpower_bonus}|Recon Gear, @{recon_gear}+@{willpower_bonus}|Slashing, @{slashing}+@{willpower_bonus}|Survival Kit, @{survival_kit}+@{willpower_bonus}|Swimming/Diving, @{swimming_diving}+@{willpower_bonus}|Throwing, @{throwing}+@{willpower_bonus}|Tools, @{tools}+@{willpower_bonus}|Value, @{value}+@{willpower_bonus}|Vehicles, @{vehicles}+@{willpower_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_resist_pain_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_resist_pain_attributes" type="hidden" value="(@{willpower}+@{strength_bonus})"/>
               <input name="attr_resist_pain_total" type="hidden" value="(@{resist_pain} [Skill]+@{resist_pain_button_base} [Kit])"/>
               <button name="roll_Resist Pain" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Resist Pain}}} {{attr=Resist Pain}} {{Target1=[[@{resist_pain_total}]]}} {{Target2=[[@{resist_pain_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{resist_pain_total}-19]]}} {{dos2a=[[@{resist_pain_total}-20]]}} {{dos2b=[[@{resist_pain_total}-29]]}} {{dos3a=[[@{resist_pain_total}-30]]}} {{dos3b=[[@{resist_pain_total}-39]]}} {{dos4a=[[@{resist_pain_total}-40]]}} {{dos4b=[[@{resist_pain_total}-49]]}} {{dof1=[[@{resist_pain_total}+19]]}} {{dof2a=[[@{resist_pain_total}+20]]}} {{dof2b=[[@{resist_pain_total}+29]]}} {{dof3a=[[@{resist_pain_total}+30]]}} {{dof3b=[[@{resist_pain_total}+39]]}} {{dof4a=[[@{resist_pain_total}+40]]}} {{dof4b=[[@{resist_pain_total}+49]]}}"> <span data-i18n="Resist Pain">Resist Pain</span></button>
@@ -238,7 +238,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_search_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_search_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_search_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_search_total" type="hidden" value="(@{search} [Skill]+@{search_button_base} [Kit])"/>
               <button name="roll_Search" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Search}}} {{attr=Search}} {{Target1=[[@{search_total}]]}} {{Target2=[[@{search_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{search_total}-19]]}} {{dos2a=[[@{search_total}-20]]}} {{dos2b=[[@{search_total}-29]]}} {{dos3a=[[@{search_total}-30]]}} {{dos3b=[[@{search_total}-39]]}} {{dos4a=[[@{search_total}-40]]}} {{dos4b=[[@{search_total}-49]]}} {{dof1=[[@{search_total}+19]]}} {{dof2a=[[@{search_total}+20]]}} {{dof2b=[[@{search_total}+29]]}} {{dof3a=[[@{search_total}+30]]}} {{dof3b=[[@{search_total}+39]]}} {{dof4a=[[@{search_total}+40]]}} {{dof4b=[[@{search_total}+49]]}}"> <span data-i18n="Search">Search</span></button>
@@ -250,7 +250,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_spot_listen_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_spot_listen_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_spot_listen_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_spot_listen_total" type="hidden" value="(@{spot_listen} [Skill]+@{spot_listen_button_base} [Kit])"/>
               <button name="roll_Spot/Listen" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Spot/Listen}}} {{attr=Spot/Listen}} {{Target1=[[@{spot_listen_total}]]}} {{Target2=[[@{spot_listen_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{spot_listen_total}-19]]}} {{dos2a=[[@{spot_listen_total}-20]]}} {{dos2b=[[@{spot_listen_total}-29]]}} {{dos3a=[[@{spot_listen_total}-30]]}} {{dos3b=[[@{spot_listen_total}-39]]}} {{dos4a=[[@{spot_listen_total}-40]]}} {{dos4b=[[@{spot_listen_total}-49]]}} {{dof1=[[@{spot_listen_total}+19]]}} {{dof2a=[[@{spot_listen_total}+20]]}} {{dof2b=[[@{spot_listen_total}+29]]}} {{dof3a=[[@{spot_listen_total}+30]]}} {{dof3b=[[@{spot_listen_total}+39]]}} {{dof4a=[[@{spot_listen_total}+40]]}} {{dof4b=[[@{spot_listen_total}+49]]}}"> <span data-i18n="Spot/Listen">Spot/Listen</span></button>
@@ -262,7 +262,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_stealth_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_stealth_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_stealth_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_stealth_total" type="hidden" value="(@{stealth} [Skill]+@{stealth_button_base} [Kit])"/>
               <button name="roll_Stealth" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Stealth}}} {{attr=Stealth}} {{Target1=[[@{stealth_total}]]}} {{Target2=[[@{stealth_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{stealth_total}-19]]}} {{dos2a=[[@{stealth_total}-20]]}} {{dos2b=[[@{stealth_total}-29]]}} {{dos3a=[[@{stealth_total}-30]]}} {{dos3b=[[@{stealth_total}-39]]}} {{dos4a=[[@{stealth_total}-40]]}} {{dos4b=[[@{stealth_total}-49]]}} {{dof1=[[@{stealth_total}+19]]}} {{dof2a=[[@{stealth_total}+20]]}} {{dof2b=[[@{stealth_total}+29]]}} {{dof3a=[[@{stealth_total}+30]]}} {{dof3b=[[@{stealth_total}+39]]}} {{dof4a=[[@{stealth_total}+40]]}} {{dof4b=[[@{stealth_total}+49]]}}"> <span data-i18n="Stealth">Stealth</span></button>
@@ -277,8 +277,8 @@
           <h2 data-i18n="Trained Skills">Trained Skills</h2>
           <div class="skill-column">
             <div class="skill">
-              <input name="attr_bow_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
-              <input name="attr_bow_attributes" type="hidden" value="(@{perception}+@{strenght_bonus})"/>
+              <input name="attr_bow_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_bow_attributes" type="hidden" value="(@{perception}+@{strength_bonus})"/>
               <input name="attr_bow_total" type="hidden" value="(@{bow} [Skill]+@{bow_button_base} [Kit])"/>
               <button name="roll_Bow" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Bow}}} {{attr=Bow}} {{Target1=[[@{bow_total}]]}} {{Target2=[[@{bow_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{bow_total}-19]]}} {{dos2a=[[@{bow_total}-20]]}} {{dos2b=[[@{bow_total}-29]]}} {{dos3a=[[@{bow_total}-30]]}} {{dos3b=[[@{bow_total}-39]]}} {{dos4a=[[@{bow_total}-40]]}} {{dos4b=[[@{bow_total}-49]]}} {{dof1=[[@{bow_total}+19]]}} {{dof2a=[[@{bow_total}+20]]}} {{dof2b=[[@{bow_total}+29]]}} {{dof3a=[[@{bow_total}+30]]}} {{dof3b=[[@{bow_total}+39]]}} {{dof4a=[[@{bow_total}+40]]}} {{dof4b=[[@{bow_total}+49]]}}"> <span data-i18n="Bow">Bow</span></button>
               <label>
@@ -289,7 +289,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_calm_other_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_calm_other_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_calm_other_attributes" type="hidden" value="(@{empathy}+@{willpower_bonus})"/>
               <input name="attr_calm_other_total" type="hidden" value="(@{calm_other} [Skill]+@{calm_other_button_base} [Kit])"/>
               <button name="roll_Calm Other" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Calm Other}}} {{attr=Calm Other}} {{Target1=[[@{calm_other_total}]]}} {{Target2=[[@{calm_other_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{calm_other_total}-19]]}} {{dos2a=[[@{calm_other_total}-20]]}} {{dos2b=[[@{calm_other_total}-29]]}} {{dos3a=[[@{calm_other_total}-30]]}} {{dos3b=[[@{calm_other_total}-39]]}} {{dos4a=[[@{calm_other_total}-40]]}} {{dos4b=[[@{calm_other_total}-49]]}} {{dof1=[[@{calm_other_total}+19]]}} {{dof2a=[[@{calm_other_total}+20]]}} {{dof2b=[[@{calm_other_total}+29]]}} {{dof3a=[[@{calm_other_total}+30]]}} {{dof3b=[[@{calm_other_total}+39]]}} {{dof4a=[[@{calm_other_total}+40]]}} {{dof4b=[[@{calm_other_total}+49]]}}"> <span data-i18n="Calm Other">Calm Other</span></button>
@@ -301,7 +301,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_persuade_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_persuade_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_persuade_attributes" type="hidden" value="(@{empathy}+@{willpower_bonus})"/>
               <input name="attr_persuade_total" type="hidden" value="(@{persuade} [Skill]+@{persuade_button_base} [Kit])"/>
               <button name="roll_Persuade" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Persuade}}} {{attr=Persuade}} {{Target1=[[@{persuade_total}]]}} {{Target2=[[@{persuade_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{persuade_total}-19]]}} {{dos2a=[[@{persuade_total}-20]]}} {{dos2b=[[@{persuade_total}-29]]}} {{dos3a=[[@{persuade_total}-30]]}} {{dos3b=[[@{persuade_total}-39]]}} {{dos4a=[[@{persuade_total}-40]]}} {{dos4b=[[@{persuade_total}-49]]}} {{dof1=[[@{persuade_total}+19]]}} {{dof2a=[[@{persuade_total}+20]]}} {{dof2b=[[@{persuade_total}+29]]}} {{dof3a=[[@{persuade_total}+30]]}} {{dof3b=[[@{persuade_total}+39]]}} {{dof4a=[[@{persuade_total}+40]]}} {{dof4b=[[@{persuade_total}+49]]}}"> <span data-i18n="Persuade">Persuade</span></button>
@@ -313,7 +313,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_barter_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_barter_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_barter_attributes" type="hidden" value="(@{empathy}+@{willpower_bonus})"/>
               <input name="attr_barter_total" type="hidden" value="(@{barter} [Skill]+@{barter_button_base} [Kit])"/>
               <button name="roll_Barter" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Barter}}} {{attr=Barter}} {{Target1=[[@{barter_total}]]}} {{Target2=[[@{barter_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{barter_total}-19]]}} {{dos2a=[[@{barter_total}-20]]}} {{dos2b=[[@{barter_total}-29]]}} {{dos3a=[[@{barter_total}-30]]}} {{dos3b=[[@{barter_total}-39]]}} {{dos4a=[[@{barter_total}-40]]}} {{dos4b=[[@{barter_total}-49]]}} {{dof1=[[@{barter_total}+19]]}} {{dof2a=[[@{barter_total}+20]]}} {{dof2b=[[@{barter_total}+29]]}} {{dof3a=[[@{barter_total}+30]]}} {{dof3b=[[@{barter_total}+39]]}} {{dof4a=[[@{barter_total}+40]]}} {{dof4b=[[@{barter_total}+49]]}}"> <span data-i18n="Barter">Barter</span></button>
@@ -325,7 +325,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_command_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_command_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_command_attributes" type="hidden" value="(@{empathy}+@{willpower_bonus})"/>
               <input name="attr_command_total" type="hidden" value="(@{command} [Skill]+@{command_button_base} [Kit])"/>
               <button name="roll_Command" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Command}}} {{attr=Command}} {{Target1=[[@{command_total}]]}} {{Target2=[[@{command_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{command_total}-19]]}} {{dos2a=[[@{command_total}-20]]}} {{dos2b=[[@{command_total}-29]]}} {{dos3a=[[@{command_total}-30]]}} {{dos3b=[[@{command_total}-39]]}} {{dos4a=[[@{command_total}-40]]}} {{dos4b=[[@{command_total}-49]]}} {{dof1=[[@{command_total}+19]]}} {{dof2a=[[@{command_total}+20]]}} {{dof2b=[[@{command_total}+29]]}} {{dof3a=[[@{command_total}+30]]}} {{dof3b=[[@{command_total}+39]]}} {{dof4a=[[@{command_total}+40]]}} {{dof4b=[[@{command_total}+49]]}}"> <span data-i18n="Command">Command</span></button>
@@ -337,7 +337,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_detect_motives_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_detect_motives_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_detect_motives_attributes" type="hidden" value="(@{empathy}+@{willpower_bonus})"/>
               <input name="attr_detect_motives_total" type="hidden" value="(@{detect_motives} [Skill]+@{detect_motives_button_base} [Kit])"/>
               <button name="roll_Detect Motives" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Detect Motives}}} {{attr=Detect Motives}} {{Target1=[[@{detect_motives_total}]]}} {{Target2=[[@{detect_motives_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{detect_motives_total}-19]]}} {{dos2a=[[@{detect_motives_total}-20]]}} {{dos2b=[[@{detect_motives_total}-29]]}} {{dos3a=[[@{detect_motives_total}-30]]}} {{dos3b=[[@{detect_motives_total}-39]]}} {{dos4a=[[@{detect_motives_total}-40]]}} {{dos4b=[[@{detect_motives_total}-49]]}} {{dof1=[[@{detect_motives_total}+19]]}} {{dof2a=[[@{detect_motives_total}+20]]}} {{dof2b=[[@{detect_motives_total}+29]]}} {{dof3a=[[@{detect_motives_total}+30]]}} {{dof3b=[[@{detect_motives_total}+39]]}} {{dof4a=[[@{detect_motives_total}+40]]}} {{dof4b=[[@{detect_motives_total}+49]]}}"> <span data-i18n="Detect Motives">Detect Motives</span></button>
@@ -349,7 +349,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_intimidate_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_intimidate_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_intimidate_attributes" type="hidden" value="(@{empathy}+@{willpower_bonus})"/>
               <input name="attr_intimidate_total" type="hidden" value="(@{intimidate} [Skill]+@{intimidate_button_base} [Kit])"/>
               <button name="roll_Intimidate" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Intimidate}}} {{attr=Intimidate}} {{Target1=[[@{intimidate_total}]]}} {{Target2=[[@{intimidate_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{intimidate_total}-19]]}} {{dos2a=[[@{intimidate_total}-20]]}} {{dos2b=[[@{intimidate_total}-29]]}} {{dos3a=[[@{intimidate_total}-30]]}} {{dos3b=[[@{intimidate_total}-39]]}} {{dos4a=[[@{intimidate_total}-40]]}} {{dos4b=[[@{intimidate_total}-49]]}} {{dof1=[[@{intimidate_total}+19]]}} {{dof2a=[[@{intimidate_total}+20]]}} {{dof2b=[[@{intimidate_total}+29]]}} {{dof3a=[[@{intimidate_total}+30]]}} {{dof3b=[[@{intimidate_total}+39]]}} {{dof4a=[[@{intimidate_total}+40]]}} {{dof4b=[[@{intimidate_total}+49]]}}"> <span data-i18n="Intimidate">Intimidate</span></button>
@@ -361,7 +361,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_digital_systems_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_digital_systems_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_digital_systems_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_digital_systems_total" type="hidden" value="(@{digital_systems} [Skill]+@{digital_systems_button_base} [Kit])"/>
               <button name="roll_Digital Systems" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Digital Systems}}} {{attr=Digital Systems}} {{Target1=[[@{digital_systems_total}]]}} {{Target2=[[@{digital_systems_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{digital_systems_total}-19]]}} {{dos2a=[[@{digital_systems_total}-20]]}} {{dos2b=[[@{digital_systems_total}-29]]}} {{dos3a=[[@{digital_systems_total}-30]]}} {{dos3b=[[@{digital_systems_total}-39]]}} {{dos4a=[[@{digital_systems_total}-40]]}} {{dos4b=[[@{digital_systems_total}-49]]}} {{dof1=[[@{digital_systems_total}+19]]}} {{dof2a=[[@{digital_systems_total}+20]]}} {{dof2b=[[@{digital_systems_total}+29]]}} {{dof3a=[[@{digital_systems_total}+30]]}} {{dof3b=[[@{digital_systems_total}+39]]}} {{dof4a=[[@{digital_systems_total}+40]]}} {{dof4b=[[@{digital_systems_total}+49]]}}"> <span data-i18n="Digital Systems">Digital Systems</span></button>
@@ -375,7 +375,7 @@
           </div>
           <div class="skill-column">
             <div class="skill">
-              <input name="attr_pistol_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_pistol_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_pistol_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_pistol_total" type="hidden" value="(@{pistol} [Skill]+@{pistol_button_base} [Kit])"/>
               <button name="roll_Pistol" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Pistol}}} {{attr=Pistol}} {{Target1=[[@{pistol_total}]]}} {{Target2=[[@{pistol_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{pistol_total}-19]]}} {{dos2a=[[@{pistol_total}-20]]}} {{dos2b=[[@{pistol_total}-29]]}} {{dos3a=[[@{pistol_total}-30]]}} {{dos3b=[[@{pistol_total}-39]]}} {{dos4a=[[@{pistol_total}-40]]}} {{dos4b=[[@{pistol_total}-49]]}} {{dof1=[[@{pistol_total}+19]]}} {{dof2a=[[@{pistol_total}+20]]}} {{dof2b=[[@{pistol_total}+29]]}} {{dof3a=[[@{pistol_total}+30]]}} {{dof3b=[[@{pistol_total}+39]]}} {{dof4a=[[@{pistol_total}+40]]}} {{dof4b=[[@{pistol_total}+49]]}}"> <span data-i18n="Pistol">Pistol</span></button>
@@ -387,7 +387,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_long_gun_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_long_gun_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_long_gun_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_long_gun_total" type="hidden" value="(@{long_gun} [Skill]+@{long_gun_button_base} [Kit])"/>
               <button name="roll_Long Gun" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Long Gun}}} {{attr=Long Gun}} {{Target1=[[@{long_gun_total}]]}} {{Target2=[[@{long_gun_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{long_gun_total}-19]]}} {{dos2a=[[@{long_gun_total}-20]]}} {{dos2b=[[@{long_gun_total}-29]]}} {{dos3a=[[@{long_gun_total}-30]]}} {{dos3b=[[@{long_gun_total}-39]]}} {{dos4a=[[@{long_gun_total}-40]]}} {{dos4b=[[@{long_gun_total}-49]]}} {{dof1=[[@{long_gun_total}+19]]}} {{dof2a=[[@{long_gun_total}+20]]}} {{dof2b=[[@{long_gun_total}+29]]}} {{dof3a=[[@{long_gun_total}+30]]}} {{dof3b=[[@{long_gun_total}+39]]}} {{dof4a=[[@{long_gun_total}+40]]}} {{dof4b=[[@{long_gun_total}+49]]}}"> <span data-i18n="Long Gun">Long Gun</span></button>
@@ -399,7 +399,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_first_aid_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_first_aid_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_first_aid_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_first_aid_total" type="hidden" value="(@{first_aid} [Skill]+@{first_aid_button_base} [Kit])"/>
               <button name="roll_First Aid" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{First Aid}}} {{attr=First Aid}} {{Target1=[[@{first_aid_total}]]}} {{Target2=[[@{first_aid_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{first_aid_total}-19]]}} {{dos2a=[[@{first_aid_total}-20]]}} {{dos2b=[[@{first_aid_total}-29]]}} {{dos3a=[[@{first_aid_total}-30]]}} {{dos3b=[[@{first_aid_total}-39]]}} {{dos4a=[[@{first_aid_total}-40]]}} {{dos4b=[[@{first_aid_total}-49]]}} {{dof1=[[@{first_aid_total}+19]]}} {{dof2a=[[@{first_aid_total}+20]]}} {{dof2b=[[@{first_aid_total}+29]]}} {{dof3a=[[@{first_aid_total}+30]]}} {{dof3b=[[@{first_aid_total}+39]]}} {{dof4a=[[@{first_aid_total}+40]]}} {{dof4b=[[@{first_aid_total}+49]]}}"> <span data-i18n="First Aid">First Aid</span></button>
@@ -411,7 +411,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_blunt_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_blunt_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_blunt_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_blunt_total" type="hidden" value="(@{blunt} [Skill]+@{blunt_button_base} [Kit])"/>
               <button name="roll_Blunt" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Blunt}}} {{attr=Blunt}} {{Target1=[[@{blunt_total}]]}} {{Target2=[[@{blunt_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{blunt_total}-19]]}} {{dos2a=[[@{blunt_total}-20]]}} {{dos2b=[[@{blunt_total}-29]]}} {{dos3a=[[@{blunt_total}-30]]}} {{dos3b=[[@{blunt_total}-39]]}} {{dos4a=[[@{blunt_total}-40]]}} {{dos4b=[[@{blunt_total}-49]]}} {{dof1=[[@{blunt_total}+19]]}} {{dof2a=[[@{blunt_total}+20]]}} {{dof2b=[[@{blunt_total}+29]]}} {{dof3a=[[@{blunt_total}+30]]}} {{dof3b=[[@{blunt_total}+39]]}} {{dof4a=[[@{blunt_total}+40]]}} {{dof4b=[[@{blunt_total}+49]]}}"> <span data-i18n="Blunt">Blunt</span></button>
@@ -423,7 +423,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_pierce_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_pierce_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_pierce_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_pierce_total" type="hidden" value="(@{pierce} [Skill]+@{pierce_button_base} [Kit])"/>
               <button name="roll_Pierce" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Pierce}}} {{attr=Pierce}} {{Target1=[[@{pierce_total}]]}} {{Target2=[[@{pierce_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{pierce_total}-19]]}} {{dos2a=[[@{pierce_total}-20]]}} {{dos2b=[[@{pierce_total}-29]]}} {{dos3a=[[@{pierce_total}-30]]}} {{dos3b=[[@{pierce_total}-39]]}} {{dos4a=[[@{pierce_total}-40]]}} {{dos4b=[[@{pierce_total}-49]]}} {{dof1=[[@{pierce_total}+19]]}} {{dof2a=[[@{pierce_total}+20]]}} {{dof2b=[[@{pierce_total}+29]]}} {{dof3a=[[@{pierce_total}+30]]}} {{dof3b=[[@{pierce_total}+39]]}} {{dof4a=[[@{pierce_total}+40]]}} {{dof4b=[[@{pierce_total}+49]]}}"> <span data-i18n="Pierce">Pierce</span></button>
@@ -435,7 +435,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_slash_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_slash_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_slash_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_slash_total" type="hidden" value="(@{slash} [Skill]+@{slash_button_base} [Kit])"/>
               <button name="roll_Slash" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Slash}}} {{attr=Slash}} {{Target1=[[@{slash_total}]]}} {{Target2=[[@{slash_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{slash_total}-19]]}} {{dos2a=[[@{slash_total}-20]]}} {{dos2b=[[@{slash_total}-29]]}} {{dos3a=[[@{slash_total}-30]]}} {{dos3b=[[@{slash_total}-39]]}} {{dos4a=[[@{slash_total}-40]]}} {{dos4b=[[@{slash_total}-49]]}} {{dof1=[[@{slash_total}+19]]}} {{dof2a=[[@{slash_total}+20]]}} {{dof2b=[[@{slash_total}+29]]}} {{dof3a=[[@{slash_total}+30]]}} {{dof3b=[[@{slash_total}+39]]}} {{dof4a=[[@{slash_total}+40]]}} {{dof4b=[[@{slash_total}+49]]}}"> <span data-i18n="Slash">Slash</span></button>
@@ -447,7 +447,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_navigation_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_navigation_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_navigation_attributes" type="hidden" value="(@{perception}+@{willpower_bonus})"/>
               <input name="attr_navigation_total" type="hidden" value="(@{navigation} [Skill]+@{navigation_button_base} [Kit])"/>
               <button name="roll_Navigation" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Navigation}}} {{attr=Navigation}} {{Target1=[[@{navigation_total}]]}} {{Target2=[[@{navigation_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{navigation_total}-19]]}} {{dos2a=[[@{navigation_total}-20]]}} {{dos2b=[[@{navigation_total}-29]]}} {{dos3a=[[@{navigation_total}-30]]}} {{dos3b=[[@{navigation_total}-39]]}} {{dos4a=[[@{navigation_total}-40]]}} {{dos4b=[[@{navigation_total}-49]]}} {{dof1=[[@{navigation_total}+19]]}} {{dof2a=[[@{navigation_total}+20]]}} {{dof2b=[[@{navigation_total}+29]]}} {{dof3a=[[@{navigation_total}+30]]}} {{dof3b=[[@{navigation_total}+39]]}} {{dof4a=[[@{navigation_total}+40]]}} {{dof4b=[[@{navigation_total}+49]]}}"> <span data-i18n="Navigation">Navigation</span></button>
@@ -459,7 +459,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_swim_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_swim_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_swim_attributes" type="hidden" value="(@{strength}+@{willpower_bonus})"/>
               <input name="attr_swim_total" type="hidden" value="(@{swim} [Skill]+@{swim_button_base} [Kit])"/>
               <button name="roll_Swim" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Swim}}} {{attr=Swim}} {{Target1=[[@{swim_total}]]}} {{Target2=[[@{swim_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{swim_total}-19]]}} {{dos2a=[[@{swim_total}-20]]}} {{dos2b=[[@{swim_total}-29]]}} {{dos3a=[[@{swim_total}-30]]}} {{dos3b=[[@{swim_total}-39]]}} {{dos4a=[[@{swim_total}-40]]}} {{dos4b=[[@{swim_total}-49]]}} {{dof1=[[@{swim_total}+19]]}} {{dof2a=[[@{swim_total}+20]]}} {{dof2b=[[@{swim_total}+29]]}} {{dof3a=[[@{swim_total}+30]]}} {{dof3b=[[@{swim_total}+39]]}} {{dof4a=[[@{swim_total}+40]]}} {{dof4b=[[@{swim_total}+49]]}}"> <span data-i18n="Swim">Swim</span></button>
@@ -471,7 +471,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_throw_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_throw_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_throw_attributes" type="hidden" value="(@{perception}+@{strength_bonus})"/>
               <input name="attr_throw_total" type="hidden" value="(@{throw} [Skill]+@{throw_button_base} [Kit])"/>
               <button name="roll_Throw" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Throw}}} {{attr=Throw}} {{Target1=[[@{throw_total}]]}} {{Target2=[[@{throw_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{throw_total}-19]]}} {{dos2a=[[@{throw_total}-20]]}} {{dos2b=[[@{throw_total}-29]]}} {{dos3a=[[@{throw_total}-30]]}} {{dos3b=[[@{throw_total}-39]]}} {{dos4a=[[@{throw_total}-40]]}} {{dos4b=[[@{throw_total}-49]]}} {{dof1=[[@{throw_total}+19]]}} {{dof2a=[[@{throw_total}+20]]}} {{dof2b=[[@{throw_total}+29]]}} {{dof3a=[[@{throw_total}+30]]}} {{dof3b=[[@{throw_total}+39]]}} {{dof4a=[[@{throw_total}+40]]}} {{dof4b=[[@{throw_total}+49]]}}"> <span data-i18n="Throw">Throw</span></button>
@@ -486,7 +486,7 @@
           <h2 data-i18n="Expert Skills">Expert Skills</h2>
           <div class="skill-column">
             <div class="skill">
-              <input name="attr_adv_medicine_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_adv_medicine_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_adv_medicine_attributes" type="hidden" value="(@{perception_bonus}+@{willpower_bonus})"/>
               <input name="attr_adv_medicine_total" type="hidden" value="(@{adv_medicine} [Skill]+@{adv_medicine_button_base} [Kit])"/>
               <button name="roll_Adv Medicine" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Adv Medicine}}} {{attr=Adv Medicine}} {{Target1=[[@{adv_medicine_total}]]}} {{Target2=[[@{adv_medicine_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{adv_medicine_total}-19]]}} {{dos2a=[[@{adv_medicine_total}-20]]}} {{dos2b=[[@{adv_medicine_total}-29]]}} {{dos3a=[[@{adv_medicine_total}-30]]}} {{dos3b=[[@{adv_medicine_total}-39]]}} {{dos4a=[[@{adv_medicine_total}-40]]}} {{dos4b=[[@{adv_medicine_total}-49]]}} {{dof1=[[@{adv_medicine_total}+19]]}} {{dof2a=[[@{adv_medicine_total}+20]]}} {{dof2b=[[@{adv_medicine_total}+29]]}} {{dof3a=[[@{adv_medicine_total}+30]]}} {{dof3b=[[@{adv_medicine_total}+39]]}} {{dof4a=[[@{adv_medicine_total}+40]]}} {{dof4b=[[@{adv_medicine_total}+49]]}}"> <span data-i18n="Adv Medicine">Adv Medicine</span></button>
@@ -498,7 +498,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_construct_engineer_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_construct_engineer_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_construct_engineer_attributes" type="hidden" value="(@{perception_bonus}+@{willpower_bonus})"/>
               <input name="attr_construct_engineer_total" type="hidden" value="(@{construct_engineer} [Skill]+@{construct_engineer_button_base} [Kit])"/>
               <button name="roll_Construct Engineer" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Construct Engineer}}} {{attr=Construct Engineer}} {{Target1=[[@{construct_engineer_total}]]}} {{Target2=[[@{construct_engineer_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{construct_engineer_total}-19]]}} {{dos2a=[[@{construct_engineer_total}-20]]}} {{dos2b=[[@{construct_engineer_total}-29]]}} {{dos3a=[[@{construct_engineer_total}-30]]}} {{dos3b=[[@{construct_engineer_total}-39]]}} {{dos4a=[[@{construct_engineer_total}-40]]}} {{dos4b=[[@{construct_engineer_total}-49]]}} {{dof1=[[@{construct_engineer_total}+19]]}} {{dof2a=[[@{construct_engineer_total}+20]]}} {{dof2b=[[@{construct_engineer_total}+29]]}} {{dof3a=[[@{construct_engineer_total}+30]]}} {{dof3b=[[@{construct_engineer_total}+39]]}} {{dof4a=[[@{construct_engineer_total}+40]]}} {{dof4b=[[@{construct_engineer_total}+49]]}}"> <span data-i18n="Construct Engineer">Construct Engineer</span></button>
@@ -510,7 +510,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_martial_arts_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_martial_arts_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_martial_arts_attributes" type="hidden" value="(@{strength_bonus}+@{perception_bonus})"/>
               <input name="attr_martial_arts_total" type="hidden" value="(@{martial_arts} [Skill]+@{martial_arts_button_base} [Kit])"/>
               <button name="roll_Martial Arts" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Martial Arts}}} {{attr=Martial Arts}} {{Target1=[[@{martial_arts_total}]]}} {{Target2=[[@{martial_arts_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{martial_arts_total}-19]]}} {{dos2a=[[@{martial_arts_total}-20]]}} {{dos2b=[[@{martial_arts_total}-29]]}} {{dos3a=[[@{martial_arts_total}-30]]}} {{dos3b=[[@{martial_arts_total}-39]]}} {{dos4a=[[@{martial_arts_total}-40]]}} {{dos4b=[[@{martial_arts_total}-49]]}} {{dof1=[[@{martial_arts_total}+19]]}} {{dof2a=[[@{martial_arts_total}+20]]}} {{dof2b=[[@{martial_arts_total}+29]]}} {{dof3a=[[@{martial_arts_total}+30]]}} {{dof3b=[[@{martial_arts_total}+39]]}} {{dof4a=[[@{martial_arts_total}+40]]}} {{dof4b=[[@{martial_arts_total}+49]]}}"> <span data-i18n="Martial Arts">Martial Arts</span></button>
@@ -522,7 +522,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_pilot_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_pilot_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_pilot_attributes" type="hidden" value="(@{perception_bonus}+@{willpower_bonus})"/>
               <input name="attr_pilot_total" type="hidden" value="(@{pilot} [Skill]+@{pilot_button_base} [Kit])"/>
               <button name="roll_Pilot" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Pilot}}} {{attr=Pilot}} {{Target1=[[@{pilot_total}]]}} {{Target2=[[@{pilot_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{pilot_total}-19]]}} {{dos2a=[[@{pilot_total}-20]]}} {{dos2b=[[@{pilot_total}-29]]}} {{dos3a=[[@{pilot_total}-30]]}} {{dos3b=[[@{pilot_total}-39]]}} {{dos4a=[[@{pilot_total}-40]]}} {{dos4b=[[@{pilot_total}-49]]}} {{dof1=[[@{pilot_total}+19]]}} {{dof2a=[[@{pilot_total}+20]]}} {{dof2b=[[@{pilot_total}+29]]}} {{dof3a=[[@{pilot_total}+30]]}} {{dof3b=[[@{pilot_total}+39]]}} {{dof4a=[[@{pilot_total}+40]]}} {{dof4b=[[@{pilot_total}+49]]}}"> <span data-i18n="Pilot">Pilot</span></button>
@@ -536,7 +536,7 @@
           </div>
           <div class="skill-column">
             <div class="skill">
-              <input name="attr_ride_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{empathy_bonus}|Athletic Gear, @{athletic_gear}+@{empathy_bonus}|Bludgeon, @{bludgeoning}+@{empathy_bonus}|Climbing Gear, @{climbing_gear}+@{empathy_bonus}|Command Apparatus, @{command_app}+@{empathy_bonus}|Firefighting, @{firefighting}+@{empathy_bonus}|First Aid Kit, @{first_aid_kits}+@{empathy_bonus}|Long Gun, @{long_gun}+@{empathy_bonus}|Martial Arts, @{martial_arts}+@{empathy_bonus}|Medical Gear, @{medical_gear}+@{empathy_bonus}|Piercing, @{piercing}+@{empathy_bonus}|Pistol, @{pistol}+@{empathy_bonus}|Recon Gear, @{recon_gear}+@{empathy_bonus}|Slashing, @{slashing}+@{empathy_bonus}|Survival Kit, @{survival_kit}+@{empathy_bonus}|Swimming/Diving, @{swimming_diving}+@{empathy_bonus}|Throwing, @{throwing}+@{empathy_bonus}|Tools, @{tools}+@{empathy_bonus}|Value, @{value}+@{empathy_bonus}|Vehicles, @{vehicles}+@{empathy_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_ride_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_ride_attributes" type="hidden" value="(@{empathy_bonus}+@{willpower_bonus})"/>
               <input name="attr_ride_total" type="hidden" value="(@{ride} [Skill]+@{ride_button_base} [Kit])"/>
               <button name="roll_Ride" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Ride}}} {{attr=Ride}} {{Target1=[[@{ride_total}]]}} {{Target2=[[@{ride_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{ride_total}-19]]}} {{dos2a=[[@{ride_total}-20]]}} {{dos2b=[[@{ride_total}-29]]}} {{dos3a=[[@{ride_total}-30]]}} {{dos3b=[[@{ride_total}-39]]}} {{dos4a=[[@{ride_total}-40]]}} {{dos4b=[[@{ride_total}-49]]}} {{dof1=[[@{ride_total}+19]]}} {{dof2a=[[@{ride_total}+20]]}} {{dof2b=[[@{ride_total}+29]]}} {{dof3a=[[@{ride_total}+30]]}} {{dof3b=[[@{ride_total}+39]]}} {{dof4a=[[@{ride_total}+40]]}} {{dof4b=[[@{ride_total}+49]]}}"> <span data-i18n="Ride">Ride</span></button>
@@ -548,7 +548,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_science_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_science_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_science_attributes" type="hidden" value="(@{perception_bonus}+@{willpower_bonus})"/>
               <input name="attr_science_total" type="hidden" value="(@{science} [Skill]+@{science_button_base} [Kit])"/>
               <button name="roll_Science" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Science}}} {{attr=Science}} {{Target1=[[@{science_total}]]}} {{Target2=[[@{science_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{science_total}-19]]}} {{dos2a=[[@{science_total}-20]]}} {{dos2b=[[@{science_total}-29]]}} {{dos3a=[[@{science_total}-30]]}} {{dos3b=[[@{science_total}-39]]}} {{dos4a=[[@{science_total}-40]]}} {{dos4b=[[@{science_total}-49]]}} {{dof1=[[@{science_total}+19]]}} {{dof2a=[[@{science_total}+20]]}} {{dof2b=[[@{science_total}+29]]}} {{dof3a=[[@{science_total}+30]]}} {{dof3b=[[@{science_total}+39]]}} {{dof4a=[[@{science_total}+40]]}} {{dof4b=[[@{science_total}+49]]}}"> <span data-i18n="Science">Science</span></button>
@@ -560,7 +560,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_survival_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{perception_bonus}|Athletic Gear, @{athletic_gear}+@{perception_bonus}|Bludgeon, @{bludgeoning}+@{perception_bonus}|Climbing Gear, @{climbing_gear}+@{perception_bonus}|Command Apparatus, @{command_app}+@{perception_bonus}|Firefighting, @{firefighting}+@{perception_bonus}|First Aid Kit, @{first_aid_kits}+@{perception_bonus}|Long Gun, @{long_gun}+@{perception_bonus}|Martial Arts, @{martial_arts}+@{perception_bonus}|Medical Gear, @{medical_gear}+@{perception_bonus}|Piercing, @{piercing}+@{perception_bonus}|Pistol, @{pistol}+@{perception_bonus}|Recon Gear, @{recon_gear}+@{perception_bonus}|Slashing, @{slashing}+@{perception_bonus}|Survival Kit, @{survival_kit}+@{perception_bonus}|Swimming/Diving, @{swimming_diving}+@{perception_bonus}|Throwing, @{throwing}+@{perception_bonus}|Tools, @{tools}+@{perception_bonus}|Value, @{value}+@{perception_bonus}|Vehicles, @{vehicles}+@{perception_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_survival_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_survival_attributes" type="hidden" value="(@{perception_bonus}+@{willpower_bonus})"/>
               <input name="attr_survival_total" type="hidden" value="(@{survival} [Skill]+@{survival_button_base} [Kit])"/>
               <button name="roll_Survival" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Survival}}} {{attr=Survival}} {{Target1=[[@{survival_total}]]}} {{Target2=[[@{survival_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{survival_total}-19]]}} {{dos2a=[[@{survival_total}-20]]}} {{dos2b=[[@{survival_total}-29]]}} {{dos3a=[[@{survival_total}-30]]}} {{dos3b=[[@{survival_total}-39]]}} {{dos4a=[[@{survival_total}-40]]}} {{dos4b=[[@{survival_total}-49]]}} {{dof1=[[@{survival_total}+19]]}} {{dof2a=[[@{survival_total}+20]]}} {{dof2b=[[@{survival_total}+29]]}} {{dof3a=[[@{survival_total}+30]]}} {{dof3b=[[@{survival_total}+39]]}} {{dof4a=[[@{survival_total}+40]]}} {{dof4b=[[@{survival_total}+49]]}}"> <span data-i18n="Survival">Survival</span></button>
@@ -572,7 +572,7 @@
               </label>
             </div>
             <div class="skill">
-              <input name="attr_toughness_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{strength_bonus}|Athletic Gear, @{athletic_gear}+@{strength_bonus}|Bludgeon, @{bludgeoning}+@{strength_bonus}|Climbing Gear, @{climbing_gear}+@{strength_bonus}|Command Apparatus, @{command_app}+@{strength_bonus}|Firefighting, @{firefighting}+@{strength_bonus}|First Aid Kit, @{first_aid_kits}+@{strength_bonus}|Long Gun, @{long_gun}+@{strength_bonus}|Martial Arts, @{martial_arts}+@{strength_bonus}|Medical Gear, @{medical_gear}+@{strength_bonus}|Piercing, @{piercing}+@{strength_bonus}|Pistol, @{pistol}+@{strength_bonus}|Recon Gear, @{recon_gear}+@{strength_bonus}|Slashing, @{slashing}+@{strength_bonus}|Survival Kit, @{survival_kit}+@{strength_bonus}|Swimming/Diving, @{swimming_diving}+@{strength_bonus}|Throwing, @{throwing}+@{strength_bonus}|Tools, @{tools}+@{strength_bonus}|Value, @{value}+@{strength_bonus}|Vehicles, @{vehicles}+@{strength_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_toughness_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_toughness_attributes" type="hidden" value="(@{strength_bonus}+@{willpower_bonus})"/>
               <input name="attr_toughness_total" type="hidden" value="(@{toughness} [Skill]+@{toughness_button_base} [Kit])"/>
               <button name="roll_Toughness" type="roll" value="&{template:ou} {{name=@{character_name}}} {{roll_name=^{Toughness}}} {{attr=Toughness}} {{Target1=[[@{toughness_total}]]}} {{Target2=[[@{toughness_total}+1]]}} {{skill=VS.}} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}} {{result=[[1d100+@{difficulty_dice} [Diff]]]}} {{dos1=[[@{toughness_total}-19]]}} {{dos2a=[[@{toughness_total}-20]]}} {{dos2b=[[@{toughness_total}-29]]}} {{dos3a=[[@{toughness_total}-30]]}} {{dos3b=[[@{toughness_total}-39]]}} {{dos4a=[[@{toughness_total}-40]]}} {{dos4b=[[@{toughness_total}-49]]}} {{dof1=[[@{toughness_total}+19]]}} {{dof2a=[[@{toughness_total}+20]]}} {{dof2b=[[@{toughness_total}+29]]}} {{dof3a=[[@{toughness_total}+30]]}} {{dof3b=[[@{toughness_total}+39]]}} {{dof4a=[[@{toughness_total}+40]]}} {{dof4b=[[@{toughness_total}+49]]}}"> <span data-i18n="Toughness">Toughness</span></button>
@@ -592,7 +592,7 @@
             <h3 data-i18n="Skill">Skill</h3>
             <h3 data-i18n="Roll">Roll</h3>
             <fieldset class="repeating_skills">
-              <input name="attr_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{attribute_bonus}|Athletic Gear, @{athletic_gear}+@{attribute_bonus}|Bludgeon, @{bludgeoning}+@{attribute_bonus}|Climbing Gear, @{climbing_gear}+@{attribute_bonus}|Command Apparatus, @{command_app}+@{attribute_bonus}|Firefighting, @{firefighting}+@{attribute_bonus}|First Aid Kit, @{first_aid_kits}+@{attribute_bonus}|Long Gun, @{long_gun}+@{attribute_bonus}|Martial Arts, @{martial_arts}+@{attribute_bonus}|Medical Gear, @{medical_gear}+@{attribute_bonus}|Piercing, @{piercing}+@{attribute_bonus}|Pistol, @{pistol}+@{attribute_bonus}|Recon Gear, @{recon_gear}+@{attribute_bonus}|Slashing, @{slashing}+@{attribute_bonus}|Survival Kit, @{survival_kit}+@{attribute_bonus}|Swimming/Diving, @{swimming_diving}+@{attribute_bonus}|Throwing, @{throwing}+@{attribute_bonus}|Tools, @{tools}+@{attribute_bonus}|Value, @{value}+@{attribute_bonus}|Vehicles, @{vehicles}+@{attribute_bonus}})*?{Multiplier|1|2|3|4|5}]]"/>
+              <input name="attr_button_base" type="hidden" value="[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]"/>
               <input name="attr_total" type="hidden" value="(@{skill} [Skill]+@{button_base} [Kit])"/>
               <input name="attr_skill_name" type="text" value=""/>
               <select name="attr_attribute_base" value="@{perception_bonus}">
@@ -624,10 +624,10 @@
       </div>
     </div>
     <div class="column">
-      <div class="grid box logo"><img alt="Outbreak Character Sheet" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Logo_340pxWx90pxH.png"/></div>
+      <div class="grid box logo"><img alt="Outbreak Character Sheet" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Logo_340pxWx90pxH.png"/></div>
       <div class="grid box dice-box">
         <button data-i18n="Dice Pool" name="roll_Pool" type="roll" value="&amp;{template:ou-small} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}}"></button>
-        <div class="die"><img alt="difficulty dice" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/HuntersIcon_difficulty_16pxW_x16pxH.jpg" title="Difficult Dice"/>
+        <div class="die"><img alt="difficulty dice" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/HuntersIcon_difficulty_16pxW_x16pxH.jpg" title="Difficult Dice"/>
           <select name="attr_difficulty_dice">
             <option data-i18n="0" value="[[0d6!p]]">0</option>
             <option data-i18n="1" value="[[1d6!p]]">1</option>
@@ -637,7 +637,7 @@
             <option data-i18n="5" value="[[5d6!p]]">5</option>
           </select>
         </div>
-        <div class="die"><img alt="speed dice" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/HuntersIcon_speed_16pxW_x16pxH.jpg"/>
+        <div class="die"><img alt="speed dice" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/HuntersIcon_speed_16pxW_x16pxH.jpg"/>
           <select name="attr_speed_dice">
             <option data-i18n="0" value="[[0d6]]"></option>
             <option data-i18n="1" value="[[1d6]]"></option>
@@ -647,7 +647,7 @@
             <option data-i18n="5" value="[[1d6]] [[1d6]] [[1d6]] [[1d6]] [[1d6]]"></option>
           </select>
         </div>
-        <div class="die"><img alt="damage dice" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/HuntersIcon_damage_16pxW_x16pxH.jpg"/>
+        <div class="die"><img alt="damage dice" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/HuntersIcon_damage_16pxW_x16pxH.jpg"/>
           <select name="attr_damage_dice">
             <option data-i18n="0" value="[[0d6]]"></option>
             <option data-i18n="1" value="[[1d6]]"></option>
@@ -657,7 +657,7 @@
             <option data-i18n="5" value="[[1d6]] [[1d6]] [[1d6]] [[1d6]] [[1d6]]"></option>
           </select>
         </div>
-        <div class="die"><img alt="depletion dice" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/HuntersIcon_depletion_16pxW_x16pxH.jpg"/>
+        <div class="die"><img alt="depletion dice" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/HuntersIcon_depletion_16pxW_x16pxH.jpg"/>
           <select name="attr_depletion_dice">
             <option data-i18n="0" value="[[0d6]]"></option>
             <option data-i18n="1" value="[[1d6]]"></option>
@@ -755,85 +755,85 @@
         <h1 class="green-header" data-i18n="Training Value Bonus">Training Value Bonus</h1>
         <div class="grid red-kits">
           <div class="kits">
-            <h2 data-i18n="Archery Gear">Archery Gear</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_ArcheryGear_30x30.png"/>
+            <h2 data-i18n="Archery Gear">Archery Gear</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_ArcheryGear_30x30.png"/>
             <input name="attr_archery_gear" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Long Gun">Long Gun</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_LongGun_30x30.png"/>
+            <h2 data-i18n="Long Gun">Long Gun</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_LongGun_30x30.png"/>
             <input name="attr_long_gun" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Bludgeoning">Bludgeoning</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Bludgeoning_30x30.png"/>
+            <h2 data-i18n="Bludgeoning">Bludgeoning</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Bludgeoning_30x30.png"/>
             <input name="attr_bludgeoning" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Pistol">Pistol</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Pistol_30x30.png"/>
+            <h2 data-i18n="Pistol">Pistol</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Pistol_30x30.png"/>
             <input name="attr_pistol" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Piercing">Piercing</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Piercing_30x30.png"/>
+            <h2 data-i18n="Piercing">Piercing</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Piercing_30x30.png"/>
             <input name="attr_piercing" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Throwing">Throwing</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Throwing_30x30.png"/>
+            <h2 data-i18n="Throwing">Throwing</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Throwing_30x30.png"/>
             <input name="attr_throwing" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Slashing">Slashing</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Slashing_30x30.png"/>
+            <h2 data-i18n="Slashing">Slashing</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Slashing_30x30.png"/>
             <input name="attr_slashing" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Martial Arts">Martial Arts</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_MartialArts_30x30.png"/>
+            <h2 data-i18n="Martial Arts">Martial Arts</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_MartialArts_30x30.png"/>
             <input name="attr_martial_arts" type="number" value=""/>
           </div>
         </div>
         <div class="grid green-kits">
           <div class="kits">
-            <h2 data-i18n="Athletic Gear">Athletic Gear</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_AthleticGear_30x30.png"/>
+            <h2 data-i18n="Athletic Gear">Athletic Gear</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_AthleticGear_30x30.png"/>
             <input name="attr_athletic_gear" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="First Aid Kits">First Aid Kits</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_FirstAidKits_30x30.png"/>
+            <h2 data-i18n="First Aid Kits">First Aid Kits</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_FirstAidKits_30x30.png"/>
             <input name="attr_first_aid_kits" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Swimming/Diving">Swimming/Diving</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_SwimmingDiving_30x30.png"/>
+            <h2 data-i18n="Swimming/Diving">Swimming/Diving</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_SwimmingDiving_30x30.png"/>
             <input name="attr_swimming_diving" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Climbing Gear">Climbing Gear</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_ClimbingGear_30x30.png"/>
+            <h2 data-i18n="Climbing Gear">Climbing Gear</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_ClimbingGear_30x30.png"/>
             <input name="attr_climbing_gear" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Medical Gear">Medical Gear</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_MedicalGear_30x30.png"/>
+            <h2 data-i18n="Medical Gear">Medical Gear</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_MedicalGear_30x30.png"/>
             <input name="attr_medical_gear" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Tools">Tools</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Tools_30x30.png"/>
+            <h2 data-i18n="Tools">Tools</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Tools_30x30.png"/>
             <input name="attr_tools" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Command App">Command App</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_CommandApp_30x30.png"/>
+            <h2 data-i18n="Command App">Command App</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_CommandApp_30x30.png"/>
             <input name="attr_command_app" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Recon Gear">Recon Gear</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_ReconGear_30x30.png"/>
+            <h2 data-i18n="Recon Gear">Recon Gear</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_ReconGear_30x30.png"/>
             <input name="attr_recon_gear" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Value">Value</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Value_30x30.png"/>
+            <h2 data-i18n="Value">Value</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Value_30x30.png"/>
             <input name="attr_value" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Firefighting">Firefighting</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Firefighting_30x30.png"/>
+            <h2 data-i18n="Firefighting">Firefighting</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Firefighting_30x30.png"/>
             <input name="attr_firefighting" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Survival Kit">Survival Kit</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_SurvivalKit_30x30.png"/>
+            <h2 data-i18n="Survival Kit">Survival Kit</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_SurvivalKit_30x30.png"/>
             <input name="attr_survival_kit" type="number" value=""/>
           </div>
           <div class="kits">
-            <h2 data-i18n="Vehicles">Vehicles</h2><img alt="" src="https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_Vehicles_30x30.png"/>
+            <h2 data-i18n="Vehicles">Vehicles</h2><img alt="" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_Vehicles_30x30.png"/>
             <input name="attr_vehicles" type="number" value=""/>
           </div>
         </div>
diff --git a/Outbreak/outbreak.pug b/Outbreak/outbreak.pug
index 2b1404a12f..783fea8a5d 100644
--- a/Outbreak/outbreak.pug
+++ b/Outbreak/outbreak.pug
@@ -1,7 +1,7 @@
 
 //- VERSION
 //- =============================
-input(name='attr_version' type='hidden' value='1')
+input(name='attr_version' type='hidden' value='1.001')
 
 //- MIXINS
 include src/pug/_mixins.pug
@@ -22,7 +22,7 @@ include src/pug/_mixins.pug
 					each val in ['Strength', 'Perception', 'Empathy', 'Willpower']
 						-const name = val.toLowerCase();
 						.grid.attributes
-							img(alt=`${val}` src=`https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Attributes_${val}_40x40.png`)
+							img(alt=`${val}` src=`https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Attributes_${val}_40x40.png`)
 							h3(data-i18n=val) #{val}
 							.grid
 								input(name=`attr_${name}` type='hidden' value=`[[(@{${name}_bonus}*10)+@{${name}_base}]]`)
@@ -60,7 +60,7 @@ include src/pug/_mixins.pug
 
 					h2(data-i18n='Trained Skills') Trained Skills
 					.skill-column
-						each val,key in {'Bow':['perception', 'strenght'], 'Calm Other':['empathy', 'willpower'], 'Persuade':['empathy', 'willpower'], 'Barter':['empathy', 'willpower'], 'Command':['empathy', 'willpower'], 'Detect Motives':['empathy', 'willpower'], 'Intimidate':['empathy', 'willpower'], 'Digital Systems':['perception', 'willpower']}
+						each val,key in {'Bow':['perception', 'strength'], 'Calm Other':['empathy', 'willpower'], 'Persuade':['empathy', 'willpower'], 'Barter':['empathy', 'willpower'], 'Command':['empathy', 'willpower'], 'Detect Motives':['empathy', 'willpower'], 'Intimidate':['empathy', 'willpower'], 'Digital Systems':['perception', 'willpower']}
 							+skillList(key, val[0], val[1])
 					.skill-column
 						each val,key in {'Pistol':['perception', 'willpower'], 'Long Gun':['perception', 'willpower'], 'First Aid':['perception', 'willpower'], 'Blunt':['strength', 'willpower'], 'Pierce':['strength', 'willpower'], 'Slash':['strength', 'willpower'], 'Navigation':['perception', 'willpower'], 'Swim':['strength', 'willpower'], 'Throw':['perception', 'strength']}
@@ -77,7 +77,7 @@ include src/pug/_mixins.pug
 						each val in ['Specalizations', 'Attr', 'Bonus', 'Adv', 'Skill', 'Roll',]
 							h3(data-i18n=val) #{val}
 						fieldset(class='repeating_skills')
-							input(name=`attr_button_base` type='hidden' value=`[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{attribute_bonus}|Athletic Gear, @{athletic_gear}+@{attribute_bonus}|Bludgeon, @{bludgeoning}+@{attribute_bonus}|Climbing Gear, @{climbing_gear}+@{attribute_bonus}|Command Apparatus, @{command_app}+@{attribute_bonus}|Firefighting, @{firefighting}+@{attribute_bonus}|First Aid Kit, @{first_aid_kits}+@{attribute_bonus}|Long Gun, @{long_gun}+@{attribute_bonus}|Martial Arts, @{martial_arts}+@{attribute_bonus}|Medical Gear, @{medical_gear}+@{attribute_bonus}|Piercing, @{piercing}+@{attribute_bonus}|Pistol, @{pistol}+@{attribute_bonus}|Recon Gear, @{recon_gear}+@{attribute_bonus}|Slashing, @{slashing}+@{attribute_bonus}|Survival Kit, @{survival_kit}+@{attribute_bonus}|Swimming/Diving, @{swimming_diving}+@{attribute_bonus}|Throwing, @{throwing}+@{attribute_bonus}|Tools, @{tools}+@{attribute_bonus}|Value, @{value}+@{attribute_bonus}|Vehicles, @{vehicles}+@{attribute_bonus}})*?{Multiplier|1|2|3|4|5}]]`)
+							input(name=`attr_button_base` type='hidden' value=`[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]`)
 
 							input(name=`attr_total` type='hidden' value=`(@{skill} [Skill]+@{button_base} [Kit])`)
 							input(name=`attr_skill_name` type='text' value=``)
@@ -108,13 +108,13 @@ include src/pug/_mixins.pug
 		
 		.column
 			.grid.box.logo
-				img(alt='Outbreak Character Sheet', src='https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/OU_Logo_340pxWx90pxH.png')
+				img(alt='Outbreak Character Sheet', src='https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/OU_Logo_340pxWx90pxH.png')
 					
 			.grid.box.dice-box
 				button(data-i18n='Dice Pool' name='roll_Pool' type='roll' value='&{template:ou-small} {{Diff=@{difficulty_dice}}} {{Spd1=@{speed_dice}}} {{Dmg=@{damage_dice}}} {{Deplet=@{depletion_dice}}} {{DieDif=@{difficulty_die}}} {{DieSpd=@{speed_die}}} {{DieDmg=@{damage_die}}} {{DieDep=@{depletion_die}}}')
 
 				.die
-					img(alt='difficulty dice' src='https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/HuntersIcon_difficulty_16pxW_x16pxH.jpg' title='Difficult Dice')
+					img(alt='difficulty dice' src='https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/HuntersIcon_difficulty_16pxW_x16pxH.jpg' title='Difficult Dice')
 					select(name='attr_difficulty_dice')
 						- let n = 0;
 						while n < 6
@@ -123,7 +123,7 @@ include src/pug/_mixins.pug
 
 				each val in ['speed', 'damage', 'depletion']
 					.die
-						img(alt=`${val} dice` src=`https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/HuntersIcon_${val}_16pxW_x16pxH.jpg`)
+						img(alt=`${val} dice` src=`https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/HuntersIcon_${val}_16pxW_x16pxH.jpg`)
 						+diceSelect(`${val}`)
 
 				each val in ['difficulty', 'speed', 'damage', 'depletion']
@@ -190,7 +190,7 @@ include src/pug/_mixins.pug
 						-const name = val.replace(' ', '_').toLowerCase();
 						.kits
 							h2(data-i18n=`${val}`) #{val}
-							img(alt='' src=`https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_${val.replace(' ', '')}_30x30.png`)
+							img(alt='' src=`https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_${val.replace(' ', '')}_30x30.png`)
 							input(name=`attr_${name}` type='number' value='')
 
 				.grid.green-kits
@@ -198,7 +198,7 @@ include src/pug/_mixins.pug
 						-const name = val.replace(/ /g, '_').replace('/', '_').toLowerCase();
 						.kits
 							h2(data-i18n=`${val}`) #{val}
-							img(alt='' src=`https://raw.githubusercontent.com/clevett/roll20-character-sheets/outbreakv1/Outbreak/src/img/KitIcons_${val.replace(/ /g, '').replace('/', '')}_30x30.png`)
+							img(alt='' src=`https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Outbreak/src/img/KitIcons_${val.replace(/ /g, '').replace('/', '')}_30x30.png`)
 							input(name=`attr_${name}` type='number' value='')
 
 
diff --git a/Outbreak/src/pug/_mixins.pug b/Outbreak/src/pug/_mixins.pug
index ac6f5ad7e3..aac1d28fdd 100644
--- a/Outbreak/src/pug/_mixins.pug
+++ b/Outbreak/src/pug/_mixins.pug
@@ -27,7 +27,7 @@ mixin dieRadios(type)
 mixin skillList(skill, primaryAttribute, secondaryAttribute)
 	.skill
 		-const name = skill.toLowerCase().replace('/', '_').replace(' ', '_');
-		input(name=`attr_${name}_button_base` type='hidden' value=`[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{${primaryAttribute}_bonus}|Athletic Gear, @{athletic_gear}+@{${primaryAttribute}_bonus}|Bludgeon, @{bludgeoning}+@{${primaryAttribute}_bonus}|Climbing Gear, @{climbing_gear}+@{${primaryAttribute}_bonus}|Command Apparatus, @{command_app}+@{${primaryAttribute}_bonus}|Firefighting, @{firefighting}+@{${primaryAttribute}_bonus}|First Aid Kit, @{first_aid_kits}+@{${primaryAttribute}_bonus}|Long Gun, @{long_gun}+@{${primaryAttribute}_bonus}|Martial Arts, @{martial_arts}+@{${primaryAttribute}_bonus}|Medical Gear, @{medical_gear}+@{${primaryAttribute}_bonus}|Piercing, @{piercing}+@{${primaryAttribute}_bonus}|Pistol, @{pistol}+@{${primaryAttribute}_bonus}|Recon Gear, @{recon_gear}+@{${primaryAttribute}_bonus}|Slashing, @{slashing}+@{${primaryAttribute}_bonus}|Survival Kit, @{survival_kit}+@{${primaryAttribute}_bonus}|Swimming/Diving, @{swimming_diving}+@{${primaryAttribute}_bonus}|Throwing, @{throwing}+@{${primaryAttribute}_bonus}|Tools, @{tools}+@{${primaryAttribute}_bonus}|Value, @{value}+@{${primaryAttribute}_bonus}|Vehicles, @{vehicles}+@{${primaryAttribute}_bonus}})*?{Multiplier|1|2|3|4|5}]]`)
+		input(name=`attr_${name}_button_base` type='hidden' value=`[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]`)
 
 		input(name=`attr_${name}_attributes` type='hidden' value=`(@{${primaryAttribute}}+@{${secondaryAttribute}_bonus})`)
 			
@@ -44,7 +44,7 @@ mixin skillList(skill, primaryAttribute, secondaryAttribute)
 mixin expertSkillList(skill, primaryAttribute, secondaryAttribute)
 	.skill
 		-const name = skill.toLowerCase().replace('/', '_').replace(' ', '_');
-		input(name=`attr_${name}_button_base` type='hidden' value=`[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}+@{${primaryAttribute}_bonus}|Athletic Gear, @{athletic_gear}+@{${primaryAttribute}_bonus}|Bludgeon, @{bludgeoning}+@{${primaryAttribute}_bonus}|Climbing Gear, @{climbing_gear}+@{${primaryAttribute}_bonus}|Command Apparatus, @{command_app}+@{${primaryAttribute}_bonus}|Firefighting, @{firefighting}+@{${primaryAttribute}_bonus}|First Aid Kit, @{first_aid_kits}+@{${primaryAttribute}_bonus}|Long Gun, @{long_gun}+@{${primaryAttribute}_bonus}|Martial Arts, @{martial_arts}+@{${primaryAttribute}_bonus}|Medical Gear, @{medical_gear}+@{${primaryAttribute}_bonus}|Piercing, @{piercing}+@{${primaryAttribute}_bonus}|Pistol, @{pistol}+@{${primaryAttribute}_bonus}|Recon Gear, @{recon_gear}+@{${primaryAttribute}_bonus}|Slashing, @{slashing}+@{${primaryAttribute}_bonus}|Survival Kit, @{survival_kit}+@{${primaryAttribute}_bonus}|Swimming/Diving, @{swimming_diving}+@{${primaryAttribute}_bonus}|Throwing, @{throwing}+@{${primaryAttribute}_bonus}|Tools, @{tools}+@{${primaryAttribute}_bonus}|Value, @{value}+@{${primaryAttribute}_bonus}|Vehicles, @{vehicles}+@{${primaryAttribute}_bonus}})*?{Multiplier|1|2|3|4|5}]]`)
+		input(name=`attr_${name}_button_base` type='hidden' value=`[[(?{Gear Or Kit| None, 0 | Archery, @{archery_gear}|Athletic Gear, @{athletic_gear}|Bludgeon, @{bludgeoning}|Climbing Gear, @{climbing_gear}|Command Apparatus, @{command_app}|Firefighting, @{firefighting}|First Aid Kit, @{first_aid_kits}|Long Gun, @{long_gun}|Martial Arts, @{martial_arts}|Medical Gear, @{medical_gear}|Piercing, @{piercing}|Pistol, @{pistol}|Recon Gear, @{recon_gear}|Slashing, @{slashing}|Survival Kit, @{survival_kit}|Swimming/Diving, @{swimming_diving}|Throwing, @{throwing}|Tools, @{tools}|Value, @{value}|Vehicles, @{vehicles}})*?{Multiplier|1|2|3|4|5}]]`)
 
 		input(name=`attr_${name}_attributes` type='hidden' value=`(@{${primaryAttribute}_bonus}+@{${secondaryAttribute}_bonus})`)