From 883b30e109877cccf5b90e71772f081b731eedbd Mon Sep 17 00:00:00 2001
From: Osvel Cabrera <31380806+Skyeris@users.noreply.github.com>
Date: Wed, 23 Nov 2022 22:00:01 -0500
Subject: [PATCH] Prime and Inventory Page Rework - Fallout V&D

-Level information will be moved to Character Information.
-Skills page was combined into Prime.
-Perks page was moved to Inventory.
-Formulas will no longer be displayed on the Character Sheet.
-For SPECIAL, only Base will be calculated into every stat.
-Because of this change, Total will now be used for SPECIAL checks so you can now put in your bonuses and penalties into +/- without affecting the other stats.
---
 .../Fallout-VnV.html                          | 263 +++++++-----------
 1 file changed, 102 insertions(+), 161 deletions(-)

diff --git a/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html b/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
index 1eaa056816..5fee85b33a 100644
--- a/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
+++ b/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
@@ -1,8 +1,7 @@
 <h5>Fallout: Vaults & Deathclaws PNP </h5>
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Prime" checked="checked" />
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" title="Skills" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab3" value="3" title="Combat" />
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab5" value="4" title="Inventory" />
+<input type="radio" name="attr_tab" class="sheet-tab sheet-tab5" value="4" title="Perks & Inv" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab6" value="5" title="Vehicles" />
 
 <div class="sheet-tab-br"></div>
@@ -27,8 +26,16 @@
             <input type="text" class="sheet-text_left" name="attr_titlecharacter_race" value="Race" readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_race"  />
             <input type="text" class="sheet-text_left" name="attr_titlecharacter_karma_alignment" value="Karma" readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_karma_alignment"  />
         </div>
+        <div>    
+            <input type="text" class="sheet-text_level" name="attr_titlecharacter_level" value="Level" readonly />&nbsp;<input type="number" class="sheet-text_right" name="attr_level">
+            <input type="text" class="sheet-text_perk" name="attr_titlecharacter_perks" value="Level Per Perk"  readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_perks"  />
+        </div>
+        <div>  
+            <input type="text" class="sheet-text_level" name="attr_titlecharacter_vpoints" value="Vault Points" readonly />&nbsp;<input type="number" class="sheet-text_right" name="attr_character_vpoints"  />  
+            <input type="text" class="sheet-text_perk" name="attr_titlecharacter_exp" value="Experience Points" readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_exp"  />
+        </div>
     </div>
-    
+    <textarea name="attr_specialnotes" style="width:96%" ></textarea>
     <h3 style="width:98%">Primary Statistics</h3>
         <div class="sheet-center_stat">
         <div>
@@ -104,7 +111,6 @@
             <input type="number" class="sheet-number" name="attr_luck_racial_max" value='0' />
         </div>
     </div>
-    <textarea name="attr_specialnotes" style="width:96%" ></textarea>
     <h3 style="width:98%">Secondary Statistics</h3>
     <div class="sheet-center_stats">
         <div>
@@ -112,382 +118,300 @@
             <input type="text" class="sheet-text_stat" value="Total" readonly />
             <input type="text" class="sheet-text_statplus" value="+/-" readonly />
             <input type="text" class="sheet-text_stat" value="Base" readonly />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="text" class="sheet-text_stats" value="Formula" readonly/>
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Action Points" readonly />
+            <input type="text" class="sheet-text_statsname" value="Action Points (AP)" readonly />
             <input type="number" class="sheet-number" name="attr_actionpoints" value='@{mod_actionpoints} + @{base_actionpoints}' disabled="true"/>
             <input type="number" class="sheet-number" name="attr_mod_actionpoints" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_actionpoints" value='(ceil((@{agility})/2))+5' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_actionpoints" value="5 + (AGI / 2)" readonly />
+            <input type="number" class="sheet-number" name="attr_base_actionpoints" value='(ceil((@{agility_base})/2))+5' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Critical Chance" readonly />
+            <input type="text" class="sheet-text_statsname" value="Critical Chance (CC)" readonly />
             <input type="number" class="sheet-number" name="attr_critical_chance" value="@{mod_critical_chance} + @{base_critical_chance}" disabled="true" max="50" />
             <input type="number" class="sheet-number"name="attr_mod_critical_chance" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_critical_chance" value="(@{luck})" disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_critical_chance" value="LCK" readonly />
+            <input type="number" class="sheet-number" name="attr_base_critical_chance" value="(@{luck_base})" disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Detection" readonly />
+            <input type="text" class="sheet-text_statsname" value="Detection (DE)" readonly />
             <input type="number" class="sheet-number" name="attr_detection" value='@{mod_detection} + @{base_detection}' disabled="true"/>
             <input type="number" class="sheet-number" name="attr_mod_detection" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_detection" value='(25 + (@{perception} * 5))' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_detection" value="25 + (PER x 5)" readonly />
+            <input type="number" class="sheet-number" name="attr_base_detection" value='(25 + (@{perception_base} * 5))' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Limb Res." readonly />
+            <input type="text" class="sheet-text_statsname" value="Limb Res (LR)" readonly />
             <input type="number" class="sheet-number" name="attr_resistance_limb" value='@{mod_resistance_limb} + @{base_resistance_limb}' disabled="true"/>
             <input type="number" class="sheet-number" name="attr_mod_resistance_limb" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_resistance_limb" value='(@{endurance})' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_resistance_limb" value="END" readonly />
+            <input type="number" class="sheet-number" name="attr_base_resistance_limb" value='(@{endurance_base})' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Melee Damage" readonly />
+            <input type="text" class="sheet-text_statsname" value="Melee Damage (MD)" readonly />
             <input type="number" class="sheet-number" name="attr_melee_damage" value='@{mod_melee_damage} + @{base_melee_damage}' disabled="true"/>
             <input type="number" class="sheet-number"name="attr_mod_melee_damage" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_melee_damage" value='(@{strength})' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_melee_damage" value="STR" readonly />
+            <input type="number" class="sheet-number" name="attr_base_melee_damage" value='(@{strength_base})' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Personality" readonly />
+            <input type="text" class="sheet-text_statsname" value="Personality (PL)" readonly />
             <input type="number" class="sheet-number" name="attr_personality" value='@{mod_personality} + @{base_personality}' disabled="true"/>
             <input type="number" class="sheet-number" name="attr_mod_personality" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_personality" value='((@{charisma}) * 10)' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_personality" value="CHA x 10 ft" readonly />
+            <input type="number" class="sheet-number" name="attr_base_personality" value='((@{charisma_base}) * 10)' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Radiation Res." readonly />
+            <input type="text" class="sheet-text_statsname" value="Radiation Res (RR)" readonly />
             <input type="number" class="sheet-number" name="attr_resistance_radiation" value='@{mod_resistance_radiation} + @{base_resistance_radiation}' disabled="true"/>
             <input type="number" class="sheet-number"name="attr_mod_resistance_radiation" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_resistance_radiation" value='((@{endurance})*2)' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_resistance_radiation" value="END x 2" readonly />
+            <input type="number" class="sheet-number" name="attr_base_resistance_radiation" value='((@{endurance_base})*2)' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Sequence" readonly />
+            <input type="text" class="sheet-text_statsname" value="Sequence (SQ)" readonly />
             <input type="number" class="sheet-number" name="attr_sequence" value='@{mod_sequence} + @{base_sequence}' disabled="true"/>
             <input type="number" class="sheet-number" name="attr_mod_sequence" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_sequence" value='(ceil((@{agility})/2))' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_sequence" value="AGI / 2" readonly />
+            <input type="number" class="sheet-number" name="attr_base_sequence" value='(ceil((@{agility_base})/2))' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Skill Points" readonly />
+            <input type="text" class="sheet-text_statsname" value="Skill Points (SP)" readonly />
             <input type="number" class="sheet-number" name="attr_skill_points" value='@{mod_skill_points} + @{base_skill_points}' disabled="true"/>
             <input type="number" class="sheet-number"name="attr_mod_skill_points" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_skill_points" value='10 + ((@{intelligence})*3)' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_skill_points" value="10 + (INT x 3)" readonly />
+            <input type="number" class="sheet-number" name="attr_base_skill_points" value='10 + ((@{intelligence_base})*3)' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="System Shock" readonly />
+            <input type="text" class="sheet-text_statsname" value="System Shock (SS)" readonly />
             <input type="number" class="sheet-number" name="attr_system_shock" value='@{mod_system_shock} + @{base_system_shock}' disabled="true"/>
             <input type="number" class="sheet-number"name="attr_mod_system_shock" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_system_shock" value='(ceil((@{endurance})/2))' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_system_shock" value="END / 2" readonly />
+            <input type="number" class="sheet-number" name="attr_base_system_shock" value='(ceil((@{endurance_base})/2))' disabled="true" />
         </div>
         <div>
-            <input type="text" class="sheet-text_statsname" value="Vault Limit" readonly />
+            <input type="text" class="sheet-text_statsname" value="Vault Limit (VL)" readonly />
             <input type="number" class="sheet-number" name="attr_vault_limit" value='@{mod_vault_limit} + @{base_vault_limit}' disabled="true"/>
             <input type="number" class="sheet-number" name="attr_mod_vault_limit" value="0" />
-            <input type="number" class="sheet-number" name="attr_base_vault_limit" value='(@{charisma} + 1)' disabled="true" />
-            <input type="text"   class="sheet-number_formula" name="attr_basetext_vault_limit" value="CHA + 1" readonly />
+            <input type="number" class="sheet-number" name="attr_base_vault_limit" value='(@{charisma_base} + 1)' disabled="true" />
+        </div>
+        
+        
         </div>
-    </div>
     </div>
     
     <div class='sheet-col'>
         <h3 style="width:98%">Languages</h3>
            <textarea name="attr_languages_text" style="width:96%" ></textarea>
-        <h3 style="width:98%">Perks & Traits</h3>
-        <div>    
-            <input type="text" class="sheet-text_level" name="attr_titlecharacter_level" value="Level" readonly />&nbsp;<input type="number" class="sheet-text_right" name="attr_level">
-            <input type="text" class="sheet-text_perk" name="attr_titlecharacter_perks" value="Level Per Perk"  readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_perks"  />
-        </div>
-        <div>  
-            <input type="text" class="sheet-text_level" name="attr_titlecharacter_vpoints" value="Vault Points" readonly />&nbsp;<input type="number" class="sheet-text_right" name="attr_character_vpoints"  />  
-            <input type="text" class="sheet-text_perk" name="attr_titlecharacter_exp" value="Experience Points" readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_exp"  />
-        </div>
-           <input type="text" class="sheet-text_center" name="attr_perk_name" value="Perk Name" style="width:99%" />
-           <textarea name="attr_perk_text" style="width:96%" ></textarea>
-              <fieldset class="repeating_perks">
-            <input type="text" class="sheet-text_center" name="attr_perk_name-repeating" value="Perk Name" style="width:99%" />
-           <textarea name="attr_perk_text-repeating" style="width:96%" ></textarea>
-          </fieldset>
-    </div>
-    </div>
-</div>
-</div>
-
-<div class="sheet-tab-content sheet-tab2">
-    <h3 style="width:98%">Combat Skills</h3>
-    <div class="sheet-center_skill" style="width:75%">
+        
+        <h3 style="width:98%">Combat Skills</h3>
+        <div class="sheet-center_skill" style="width:98%">
         <div>
-            <input type="text" class="sheet-text_stattag" value="Roll" readonly style="width:6%"/>
-            <input type="text" class="sheet-text_statscenter" value="      Skill" readonly style="width:20%"/>&nbsp;&nbsp;&nbsp;
-            <input type="text" class="sheet-text_stattag" value="TAG" readonly style="width:5%;font-size:10px"/>
-            <input type="text" class="sheet-text_stattag" value="Total" readonly style="width:6%"/>&nbsp;
-            <input type="text" class="sheet-text_stattag" value="Temp" readonly style="width:8%"/>&nbsp;
-            <input type="text" class="sheet-text_stattag" value="+/-" readonly style="width:5%"/>&nbsp;
-            <input type="text" class="sheet-text_stattag" value="Base" readonly style="width:7%"/>&nbsp;
-            <input type="text" class="sheet-text_formula" value="Formula + LCK" readonly/>
+            <input type="text" class="sheet-text_stattag" value="Roll" readonly style="width:9%"/>
+            <input type="text" class="sheet-text_statscenter" value="Skill" readonly style="width:20%"/>
+            <input type="text" class="sheet-text_stattag" value="TAG" readonly style="width:10%"/>
+            <input type="text" class="sheet-text_stattag" value="Total" readonly style="width:13%"/>
+            <input type="text" class="sheet-text_stattag" value="Temp" readonly style="width:13%"/>
+            <input type="text" class="sheet-text_stattag" value="+/-" readonly style="width:13%"/>
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-archery" value="&{template:default} {{name=@{character_name}}} {{Archery=[[[[@{archery}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Archery" readonly />
             <input name="attr_tagskill31" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_archery" value="(@{mod-archery} + @{base-archery} + 20*@{tagskill31} + @{temp-archery})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_archery" value="(@{strength_base} + @{perception_base} + @{agility_base} + @{luck_base} + 20*@{tagskill31} + @{temp-archery} + @{mod-archery})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-archery" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-archery" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-archery" value="@{strength} + @{perception} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-archery" value="STR + PER + AGI" readonly/>
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-big_guns" value="&{template:default} {{name=@{character_name}}} {{Big Guns=[[[[@{big_guns}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Big Guns" readonly />
             <input name="attr_tagskill1" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_big_guns" value="(@{mod-big_guns} + @{base-big_guns} + 20*@{tagskill1} + @{temp-big_guns})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_big_guns" value="(@{mod-big_guns} + @{strength_base} + @{perception_base} + @{endurance_base} + @{luck_base} + 20*@{tagskill1} + @{temp-big_guns})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-big_guns" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-big_guns" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-big_guns" value="@{strength} + @{perception} + @{endurance} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-big_guns" value="STR + PER + END" readonly />
 	    </div>
 
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-energy_weapons" value="&{template:default} {{name=@{character_name}}} {{Energy Weapons=[[[[@{energy_weapons}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Energy Weapons" readonly />
             <input name="attr_tagskill2" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_energy_weapons" value="(@{mod-energy_weapons} + @{base-energy_weapons} + 20*@{tagskill2} + @{temp-energy_weapons})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_energy_weapons" value="(@{mod-energy_weapons} + 5 + @{perception_base} + @{perception_base} + @{luck_base} + 20*@{tagskill2} + @{temp-energy_weapons})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-energy_weapons" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-energy_weapons" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-energy_weapons" value="5 + @{perception} + @{perception} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-energy_weapons" value="5 + PER + PER" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-melee_weapons" value="&{template:default} {{name=@{character_name}}} {{Melee Weapons=[[[[@{melee_weapons}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Melee Weapons" readonly />
             <input name="attr_tagskill3" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_melee_weapons" value="(@{mod-melee_weapons} + @{base-melee_weapons} + 20*@{tagskill3} + @{temp-melee_weapons})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_melee_weapons" value="(@{mod-melee_weapons} + 5 + @{strength} + @{agility_base} + @{luck_base} + 20*@{tagskill3} + @{temp-melee_weapons})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-melee_weapons" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-melee_weapons" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-melee_weapons" value="5 + @{strength} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-melee_weapons" value="5 + STR + AGI" readonly />
-            
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-small_guns" value="&{template:default} {{name=@{character_name}}} {{Small Guns=[[[[@{small_guns}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Small Guns" readonly />
             <input name="attr_tagskill4" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_small_guns" value="(@{mod-small_guns} + @{base-small_guns} + 20*@{tagskill4} + @{temp-small_guns})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_small_guns" value="(@{mod-small_guns} + 5 + @{perception_base} + @{perception_base} + @{luck_base} + 20*@{tagskill4} + @{temp-small_guns})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-small_guns" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-small_guns" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-small_guns" value="5 + @{perception} + @{perception} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-small_guns" value="5 + PER + PER" readonly />
-            
         </div>
-
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-throwing" value="&{template:default} {{name=@{character_name}}} {{Throwing=[[[[@{throwing}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Throwing" readonly />
             <input name="attr_tagskill5" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_throwing" value="(@{mod-throwing} + @{base-throwing} + 20*@{tagskill5} + @{temp-throwing})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_throwing" value="(@{mod-throwing} + 5 + @{strength_base} + @{agility_base} + @{luck_base} + 20*@{tagskill5} + @{temp-throwing})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-throwing" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-throwing" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-throwing" value="5 + @{strength} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-throwing" value="5 + STR + AGI" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-unarmed" value="&{template:default} {{name=@{character_name}}} {{Unarmed=[[[[@{unarmed}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Unarmed" readonly />
             <input name="attr_tagskill7" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_unarmed" value="(@{mod-unarmed} + @{base-unarmed} + 20*@{tagskill7} + @{temp-unarmed})" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_unarmed" value="(@{mod-unarmed} + @{strength_base} + @{endurance_base} + @{agility_base} + @{luck_base} + 20*@{tagskill7} + @{temp-unarmed})" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-unarmed" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-unarmed" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-unarmed" value="@{strength} + @{endurance} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-unarmed" value="STR + END + AGI" readonly />
         </div>
     </div>
         
     <h3 style="width:98%">Support Skills</h3>
-    <div class="sheet-center_skill" style="width:75%">
+    <div class="sheet-center_skill" style="width:98%">
         <div>
-            <input type="text" class="sheet-text_stattag" value="Roll" readonly style="width:6%"/>
-            <input type="text" class="sheet-text_statscenter" value="      Skill" readonly style="width:20%"/>&nbsp;&nbsp;&nbsp;
-            <input type="text" class="sheet-text_stattag" value="TAG" readonly style="width:5%;font-size:10px"/>
-            <input type="text" class="sheet-text_stattag" value="Total" readonly style="width:6%"/>&nbsp;
-            <input type="text" class="sheet-text_stattag" value="Temp" readonly style="width:8%"/>&nbsp;
-            <input type="text" class="sheet-text_stattag" value="+/-" readonly style="width:5%"/>&nbsp;
-            <input type="text" class="sheet-text_stattag" value="Base" readonly style="width:7%"/>&nbsp;
-            <input type="text" class="sheet-text_formula" value="Formula + LK" readonly style="width:19%"/>
+            <input type="text" class="sheet-text_stattag" value="Roll" readonly style="width:9%"/>
+            <input type="text" class="sheet-text_statscenter" value="Skill" readonly style="width:20%"/>
+            <input type="text" class="sheet-text_stattag" value="TAG" readonly style="width:10%"/>
+            <input type="text" class="sheet-text_stattag" value="Total" readonly style="width:13%"/>
+            <input type="text" class="sheet-text_stattag" value="Temp" readonly style="width:13%"/>
+            <input type="text" class="sheet-text_stattag" value="+/-" readonly style="width:13%"/>
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-blacksmith" value="&{template:default} {{name=@{character_name}}} {{Blacksmith=[[[[@{blacksmith}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Blacksmith" readonly />
             <input name="attr_tagskill9" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_blacksmith" value="@{mod-blacksmith} + @{base-blacksmith} + 20*@{tagskill9} + @{temp-blacksmith}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_blacksmith" value="@{mod-blacksmith} + @{strength_base} + @{endurance_base} + @{agility_base} + @{luck_base} + 20*@{tagskill9} + @{temp-blacksmith}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-blacksmith" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-blacksmith" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-blacksmith" value="@{strength} + @{endurance} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-blacksmith" value="STR + END + AGI" readonly />
-        </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-charm" value="&{template:default} {{name=@{character_name}}} {{Charm=[[[[@{charm}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Charm" readonly />
             <input name="attr_tagskill11" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_charm" value="@{mod-charm} + @{base-charm} + 20*@{tagskill11} + @{temp-charm}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_charm" value="@{mod-charm} +5 + @{charisma_base} + @{charisma_base} + @{luck_base} + 20*@{tagskill11} + @{temp-charm}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-charm" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-charm" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-charm" value="5 + @{charisma} + @{charisma} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-charm" value="5 + CHA + CHA" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-chemistry" value="&{template:default} {{name=@{character_name}}} {{Chemistry=[[[[@{chemistry}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Chemistry" readonly />
             <input name="attr_tagskill23" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_chemistry" value="@{mod-chemistry} + @{base-chemistry} + 20*@{tagskill23}+ @{temp-chemistry}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_chemistry" value="@{mod-chemistry} + @{perception_base} + @{intelligence_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill23}+ @{temp-chemistry}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-chemistry" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-chemistry" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-chemistry" value="@{perception} + @{intelligence} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-chemistry" value="PER + INT + INT" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-computer_science" value="&{template:default} {{name=@{character_name}}} {{Computer Science=[[[[@{computer_science}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Computer Science" readonly />
             <input name="attr_tagskill12" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_computer_science" value="@{mod-computer_science} + @{base-computer_science} + 20*@{tagskill12} + @{temp-computer_science}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_computer_science" value="@{mod-computer_science} + @{perception_base} + @{intelligence_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill12} + @{temp-computer_science}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-computer_science" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-computer_science" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-computer_science" value="@{perception} + @{intelligence} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-computer_science" value="PER + INT + INT" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-deception" value="&{template:default} {{name=@{character_name}}} {{Deception=[[[[@{deception}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Deception" readonly />
             <input name="attr_tagskill13" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_deception" value="@{mod-deception} + @{base-deception} + 20*@{tagskill13} + @{temp-deception}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_deception" value="@{mod-deception} + @{charisma_base} + @{charisma_base} + @{perception_base}+ @{luck_base} + 20*@{tagskill13} + @{temp-deception}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-deception" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-deception" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-deception" value="@{charisma} + @{charisma} + @{perception}+ @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-deception" value="PER + CHA + CHA" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-doctor" value="&{template:default} {{name=@{character_name}}} {{Doctor=[[[[@{doctor}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Doctor" readonly />
             <input name="attr_tagskill15" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_doctor" value="@{mod-doctor} + @{base-doctor} + 20*@{tagskill15} + @{temp-doctor}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_doctor" value="@{mod-doctor} + @{perception_base} + @{intelligence_base} + @{agility_base} + @{luck_base} + 20*@{tagskill15} + @{temp-doctor}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-doctor" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-doctor" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-doctor" value="@{perception} + @{intelligence} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-doctor" value="PER + INT + AGI" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-engineer" value="&{template:default} {{name=@{character_name}}} {{Engineer=[[[[@{engineer}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Engineer" readonly />
             <input name="attr_tagskill30" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_engineer" value="@{mod-engineer} + @{base-engineer} + 20*@{tagskill30} + @{temp-engineer}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_engineer" value="@{mod-engineer} + 5 + @{intelligence_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill30} + @{temp-engineer}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-engineer" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-engineer" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-engineer" value="5 + @{intelligence} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-engineer" value="5 + INT + INT" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-gambling" value="&{template:default} {{name=@{character_name}}} {{Gambling=[[[[@{gambling}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Gambling" readonly />
             <input name="attr_tagskill16" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_gambling" value="@{mod-gambling} + @{base-gambling} + 20*@{tagskill16} + @{temp-gambling}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_gambling" value="@{mod-gambling} + 10 + @{luck_base} + @{luck_base} + 20*@{tagskill16} + @{temp-gambling}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-gambling" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-gambling" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-gambling" value="10 + @{luck} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-gambling" value="10 + LCK" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-gunsmith" value="&{template:default} {{name=@{character_name}}} {{Gunsmith=[[[[@{gunsmith}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Gunsmith" readonly />
             <input name="attr_tagskill17" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_gunsmith" value="@{mod-gunsmith} + @{base-gunsmith} + 20*@{tagskill17} + @{temp-gunsmith}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_gunsmith" value="@{mod-gunsmith} + @{intelligence_base} + @{perception_base} + @{agility_base} + @{luck_base} + 20*@{tagskill17} + @{temp-gunsmith}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-gunsmith" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-gunsmith" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-gunsmith" value="@{intelligence} + @{perception} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-gunsmith" value="PER + INT + AGI" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-insight" value="&{template:default} {{name=@{character_name}}} {{Insight=[[[[@{insight}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Insight" readonly />
             <input name="attr_tagskill29" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_insight" value="@{mod-insight} + @{base-insight} + 20*@{tagskill29} + @{temp-insight}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_insight" value="@{mod-insight} + @{charisma_base} + @{intelligence_base} + @{perception_base} + @{luck_base} + 20*@{tagskill29} + @{temp-insight}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-insight" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-insight" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-insight" value="@{charisma} + @{intelligence} + @{perception} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-insight" value="PER + CHA + INT" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-intimidation" value="&{template:default} {{name=@{character_name}}} {{Intimidation=[[[[@{intimidation}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Intimidation" readonly />
             <input name="attr_tagskill18" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_intimidation" value="@{mod-intimidation} + @{base-intimidation} + 20*@{tagskill18} + @{temp-intimidation}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_intimidation" value="@{mod-intimidation} + @{strength_base} + @{endurance_base} + @{charisma_base} + @{luck_base} + 20*@{tagskill18} + @{temp-intimidation}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-intimidation" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-intimidation" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-intimidation" value="@{strength} + @{endurance} + @{charisma} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-intimidation" value="STR + END + CHA" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-lore" value="&{template:default} {{name=@{character_name}}} {{Lore=[[[[@{lore}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Lore" readonly />
             <input name="attr_tagskill22" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_lore" value="@{mod-lore} + @{base-lore} + 20*@{tagskill22}+ @{temp-lore}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_lore" value="@{mod-lore} + 5 + @{intelligence_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill22}+ @{temp-lore}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-lore" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-lore" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-lore" value="5 + @{intelligence} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-lore" value="5 + INT + INT" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-observation" value="&{template:default} {{name=@{character_name}}} {{Observation=[[[[@{observation}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Observation" readonly />
             <input name="attr_tagskill14" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_observation" value="@{mod-observation} + @{base-observation} + 20*@{tagskill14} + @{temp-observation}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_observation" value="@{mod-observation} + 5 + @{perception_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill14} + @{temp-observation}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-observation" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-observation" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-observation" value="5 + @{perception} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-observation" value="5 + PER + INT" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-pilot" value="&{template:default} {{name=@{character_name}}} {{Pilot=[[[[@{pilot}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Pilot" readonly />
             <input name="attr_tagskill24" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_pilot" value="@{mod-pilot} + @{base-pilot} + 20*@{tagskill24}+ @{temp-pilot}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_pilot" value="@{mod-pilot} + @{agility_base} + @{perception_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill24}+ @{temp-pilot}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-pilot" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-pilot" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-pilot" value="@{agility} + @{perception} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-pilot" value="PER + INT + AGI" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-sleight_of_hand" value="&{template:default} {{name=@{character_name}}} {{Sleight of Hand=[[[[@{sleight_of_hand}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Sleight of Hand" readonly />
             <input name="attr_tagskill26" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_sleight_of_hand" value="@{mod-sleight_of_hand} + @{base-sleight_of_hand} + 20*@{tagskill26}+ @{temp-sleight_of_hand}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_sleight_of_hand" value="@{mod-sleight_of_hand} + @{perception_base} + @{charisma_base} + @{agility_base} + @{luck_base} + 20*@{tagskill26}+ @{temp-sleight_of_hand}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-sleight_of_hand" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-sleight_of_hand" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-sleight_of_hand" value="@{perception} + @{charisma} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-sleight_of_hand" value="PER + CHA + AGI" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-sneak" value="&{template:default} {{name=@{character_name}}} {{sneak=[[[[@{sneak}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Sneak" readonly />
             <input name="attr_tagskill27" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_sneak" value="@{mod-sneak} + @{base-sneak} + 20*@{tagskill27}+ @{temp-sneak}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_sneak" value="@{mod-sneak} + 5 + @{agility_base} + @{agility_base} + @{luck_base} + 20*@{tagskill27}+ @{temp-sneak}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-sneak" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-sneak" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-sneak" value="5 + @{agility} + @{agility} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-sneak" value="5 + AGI + AGI" readonly />
         </div>
         <div>
             <button class="sheet-skill_button" type='roll' name="attr_roll-survival" value="&{template:default} {{name=@{character_name}}} {{Survival=[[[[@{survival}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Survival" readonly />
             <input name="attr_tagskill28" value="1" type="checkbox">&nbsp;&nbsp;
-            <input type="number" class="sheet-number" name="attr_survival" value="@{mod-survival} + @{base-survival} + 20*@{tagskill28}+ @{temp-survival}" disabled="true"/>
+            <input type="number" class="sheet-number" name="attr_survival" value="@{mod-survival} + @{perception_base} + @{endurance_base} + @{intelligence_base} + @{luck_base} + 20*@{tagskill28}+ @{temp-survival}" disabled="true"/>
             <input type="number" class="sheet-number"name="attr_temp-survival" value="0" />
             <input type="number" class="sheet-number"name="attr_mod-survival" value="0" />
-            <input type="number" class="sheet-number" name="attr_base-survival" value="@{perception} + @{endurance} + @{intelligence} + @{luck}" disabled="true" />
-            <input type="text" class="sheet-number_skill" name="attr_basetext-survival" value="PER + END + INT" readonly />
         </div> 
+        </div>
+        </div>
+    </div>
+    </div>
 </div>
 </div>
 
@@ -715,7 +639,7 @@
         <div class='sheet-col'>
             <div class="sheet-center">
                 <div>
-                    <button type='roll' class="sheet-skill_button" name="attr_weapon_roll-1" value="&{template:default} {{name=@{weapon_name-1}}} {{attack Roll=[[[[@{weapon_select-1}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck}]],100}kl1]]]]}} {{Dmg=[[@{weapon_damage-1}]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Dmg Type=@{weapon_damage_type-1}}} {{notes=@{weapon_notes-1}}}"></button>
+                    <button type='roll' class="sheet-skill_button" name="attr_weapon_roll-1" value="&{template:default} {{name=@{weapon_name-1}}} {{attack Roll=[[[[@{weapon_select-1}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]]}} {{Dmg=[[@{weapon_damage-1}]]}} {{AC=@{ac_reduction-1}}} {{DT=@{dt_reduction-1}}} {{Dmg Type=@{weapon_damage_type-1}}} {{notes=@{weapon_notes-1}}}"></button>
                     <input type="text" class="sheet-number" name="attr_weapon_name-1" style="width:20%"/>
                     <input type="text" class="sheet-text_damage" value="Rng" readonly style="width:5%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_range-1" style="width:6%"/>
@@ -778,7 +702,7 @@
         <div class='sheet-col'>
             <div class="sheet-center">
                 <div>
-                    <button type='roll' class="sheet-skill_button" name="attr_weapon_roll-2" value="&{template:default} {{name=@{weapon_name-2}}} {{attack Roll=[[[[@{weapon_select-2}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck}]],100}kl1]]]]}} {{Dmg=[[@{weapon_damage-2}]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Dmg Type=@{weapon_damage_type-2}}} {{notes=@{weapon_notes-2}}}"></button>
+                    <button type='roll' class="sheet-skill_button" name="attr_weapon_roll-2" value="&{template:default} {{name=@{weapon_name-2}}} {{attack Roll=[[[[@{weapon_select-2}]] + [[?{Hit Chance|0}]] - 1d100cs<[[{[[@{critical_chance} + (?{Crit Bonus|0})]],50}kl1]]cf>[[{[[90+@{luck_base}]],100}kl1]]]]}} {{Dmg=[[@{weapon_damage-2}]]}} {{AC=@{ac_reduction-2}}} {{DT=@{dt_reduction-2}}} {{Dmg Type=@{weapon_damage_type-2}}} {{notes=@{weapon_notes-2}}}"></button>
                     <input type="text" class="sheet-number" name="attr_weapon_name-2" style="width:20%"/>
                     <input type="text" class="sheet-text_damage" value="Rng" readonly style="width:5%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_range-2" style="width:6%"/>
@@ -841,15 +765,30 @@
 </div>
 
 <div class="sheet-tab-content sheet-tab5">
+    
+    <div class='sheet-2colrow'>
+    <div class='sheet-col'>
+    <h3 style="width:99%">Perks & Traits</h3>
+    <input type="text" class="sheet-text_center" name="attr_perk_name" value="Perk Name" style="width:99%" />
+       <textarea name="attr_perk_text" style="width:96%" ></textarea>
+          <fieldset class="repeating_perks">
+        <input type="text" class="sheet-text_center" name="attr_perk_name-repeating" value="Perk Name" style="width:99%" />
+       <textarea name="attr_perk_text-repeating" style="width:96%" ></textarea>
+      </fieldset>
+    </div>
+    
+    <div class='sheet-col'>
     <h3 style="width:99%">Inventory</h3>
     <div class="sheet-center" style="width:95%">
         <div class="sheet-tab-br"></div>
         <div>
-            <input type="text" class="sheet-text_damage" value="Total Carry Weight" readonly />&nbsp;
-            <input type="text" class="sheet-number" name="attr_total_carry_weight" style='width:10%'/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="text" class="sheet-text_damage" value="Current Carry Weight" readonly />&nbsp;
+            <input type="text" class="sheet-text_damage" value="Total CW" readonly style='width:25%'/>
+            <input type="text" class="sheet-number" name="attr_total_carry_weight" style='width:10%'/>
+            <input type="text" class="sheet-text_damage" value="Current CW" readonly style='width:25%'/>
             <input type="text" class="sheet-number" name="attr_current_carry_weight" style='width:10%'/>
-            <input type="text" class="sheet-text_damage" value="Caps" readonly />&nbsp;
+        </div>
+        <div>
+            <input type="text" class="sheet-text_damage" value="Caps" readonly style='width:20%'/>&nbsp;
             <input type="text" class="sheet-number" name="attr_caps" style='width:10%'/>
         </div>
         <div>
@@ -873,6 +812,8 @@
             </div>
         </div>
     </fieldset>
+    </div>
+    </div> 
 </div>
 <div class="sheet-tab-content sheet-tab6">
     <h3 style="width:98%">Vehicles</h3>