From e27ef6781a68938dc08b7c28ef649ad71a5e5dfa Mon Sep 17 00:00:00 2001
From: LilLiteralist <stephenccahill@gmail.com>
Date: Sun, 1 Feb 2026 23:43:02 -0600
Subject: [PATCH] Fully implemented Bonuses and Penalties

---
 .../StarWarsSagaEdition.css                   |   3 +-
 .../StarWarsSagaEdition.html                  | 519 +++++++++++++++---
 Star Wars Saga Edition/sheet.json             |   2 +-
 3 files changed, 446 insertions(+), 78 deletions(-)

diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.css b/Star Wars Saga Edition/StarWarsSagaEdition.css
index a5b95a3898..f403cf6f07 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.css	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.css	
@@ -251,7 +251,8 @@ input.tab[type="radio"]:focus {
 .bonus-categories-grid {
     margin: 6px 2px 4px 4px;
     display:grid;
-    grid-template-columns: 1fr 3fr 2fr;
+    /* grid-template-columns: 1fr 3fr 2fr; This is if checkboxes are used. */
+    grid-template-columns: 3fr 2fr;
     row-gap: 2px;
 }
 
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 1eea192afc..8836062a93 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -6,7 +6,7 @@
 <input type="radio" name="attr_tab" class="tab tab2" value="2" title="NPC" />
 <input type="radio" name="attr_tab" class="tab tab3" value="3" title="Vehicle" />
 <input type="radio" name="attr_tab" class="tab tab4" value="4" title="Settings" />
-
+<input type="number" name="attr_version_number" class="hidden" value="0" />
 
 
 <!--
@@ -140,22 +140,22 @@
 					<input type="checkbox" class="sect-show hidden" value="1" name="attr_bonus-show" checked/>
 					<div class="bonus-categories-grid sect vertical-center">
 						<!-- Row 1 of grid (Attacks) -->
-						<input type="checkbox" class="visible-checkbox" name="attr_bonus-attacks-active" value="1" title="Applies to attacks">
+						<!-- <input type="checkbox" class="visible-checkbox" name="attr_bonus-attacks-active" value="1" title="Applies to attacks"> -->
 						<h4 data-i18n="attacks">Attacks</h4>
 						<input type="number" name="attr_bonus-all-attacks" value="0">
 						<!-- Row 2 of grid (Damage) -->
-						<input type="checkbox" class="visible-checkbox" name="attr_bonus-damage-active" value="1" title="Applies to damage">
+						<!-- <input type="checkbox" class="visible-checkbox" name="attr_bonus-damage-active" value="1" title="Applies to damage"> -->
 						<h4 data-i18n="damage">Damage</h4>
 						<input type="number" name="attr_bonus-all-damage" value="0">
 						<!-- Row 3 of grid (Defenses) -->
-						<input type="checkbox" class="visible-checkbox" name="attr_bonus-defenses-active" value="1" title="Applies to defenses">
+						<!-- <input type="checkbox" class="visible-checkbox" name="attr_bonus-defenses-active" value="1" title="Applies to defenses"> -->
 						<label class="clickable" title="Show/Hide specific defenses">
 							<span data-i18n="defenses">Defenses</span>
 							<input type="checkbox" class="hidden" value="1" name="attr_bonus-defenses-show" />
 						</label>
 						<input type="number" name="attr_bonus-all-defenses" value="0">
 						<!-- Row 4 of grid (Skills) -->
-						<input type="checkbox" class="visible-checkbox" name="attr_bonus-skills-active" value="1" title="Applies to skills">
+						<!-- <input type="checkbox" class="visible-checkbox" name="attr_bonus-skills-active" value="1" title="Applies to skills"> -->
 						<label class="clickable" title="Show/Hide specific skills">
 							<span data-i18n="skills">Skills</span>
 							<input type="checkbox" class="hidden" value="1" name="attr_bonus-skills-show" />
@@ -239,42 +239,42 @@
 							<span data-i18n="jump">Jump</span>
 						</div>
 						<div class="sect">
-							<input type="number" name="attr_bonuses-Knowledge-Bureaucracy" value="0">
+							<input type="number" name="attr_bonuses-KnowledgeBureaucracy" value="0">
 							<span>
 								<span data-i18n="knowledge">Knowledge</span>
 								(<span data-i18n="bureaucracy">Bureaucracy</span>)
 							</span>
 						</div>
 						<div class="sect">
-							<input type="number" name="attr_bonuses-Knowledge-LifeSciences" value="0">
+							<input type="number" name="attr_bonuses-KnowledgeLifeSciences" value="0">
 							<span>
 								<span data-i18n="knowledge">Knowledge</span>
 								(<span data-i18n="life_sciences">Life Sciences</span>)
 							</span>
 						</div>
 						<div class="sect">
-							<input type="number" name="attr_bonuses-Knowledge-PhysicalSciences" value="0">
+							<input type="number" name="attr_bonuses-KnowledgePhysicalSciences" value="0">
 							<span>
 								<span data-i18n="knowledge">Knowledge</span>
 								(<span data-i18n="physical_sciences">Physical Sciences</span>)
 							</span>
 						</div>
 						<div class="sect">
-							<input type="number" name="attr_bonuses-Knowledge-SocialSciences" value="0">
+							<input type="number" name="attr_bonuses-KnowledgeSocialSciences" value="0">
 							<span>
 								<span data-i18n="knowledge">Knowledge</span>
 								(<span data-i18n="social_sciences">Social Sciences</span>)
 							</span>
 						</div>
 						<div class="sect">
-							<input type="number" name="attr_bonuses-Knowledge-Tactics" value="0">
+							<input type="number" name="attr_bonuses-KnowledgeTactics" value="0">
 							<span>
 								<span data-i18n="knowledge">Knowledge</span>
 								(<span data-i18n="tactics">Tactics</span>)
 							</span>
 						</div>
 						<div class="sect">
-							<input type="number" name="attr_bonuses-Knowledge-Technology" value="0">
+							<input type="number" name="attr_bonuses-KnowledgeTechnology" value="0">
 							<span>
 								<span data-i18n="knowledge">Knowledge</span>
 								(<span data-i18n="technology">Technology</span>)
@@ -323,6 +323,141 @@
 					</div>
 				</div>
 			</fieldset>
+			<button type="action" name="act_AddBuffsToSkills" style="position: relative;top: -40px;left: 60px;" title="If your skill formulas have been changed with either the take 10/20 option or the Skill Focus house rule, you may need to click this button once.">Add buffs to skill formulas</button>
+			<div class="hidden">
+				<div style="display:flex;flex-wrap:wrap;gap:5px;">
+					<div>
+						Attacks<br/>
+						<input type="number" name="attr_total_bonus_attack" value="0">
+					</div>
+					<div>
+						Damage<br/>
+						<input type="number" name="attr_total_bonus_damage" value="0">
+					</div>
+					<div>
+						Reflex<br/>
+						<input type="number" name="attr_total_bonus_reflex" value="0">
+					</div>
+					<div>
+						FF<br/>
+						<input type="number" name="attr_total_bonus_flatfooted" value="0">
+					</div>
+					<div>
+						Fort<br/>
+						<input type="number" name="attr_total_bonus_fort" value="0">
+					</div>
+					<div>
+						Will<br/>
+						<input type="number" name="attr_total_bonus_will" value="0">
+					</div>
+				</div>
+				<div style="display:flex;flex-wrap:wrap;gap:5px;">
+					<div>
+						Acrobatics<br/>
+						<input type="number" name="attr_total_bonus_Acrobatics" value="0">
+					</div>
+					<div>
+						Athletics<br/>
+						<input type="number" name="attr_total_bonus_Athletics" value="0">
+					</div>
+					<div>
+						Climb<br/>
+						<input type="number" name="attr_total_bonus_Climb" value="0">
+					</div>
+					<div>
+						Deception<br/>
+						<input type="number" name="attr_total_bonus_Deception" value="0">
+					</div>
+					<div>
+						Endurance<br/>
+						<input type="number" name="attr_total_bonus_Endurance" value="0">
+					</div>
+					<div>
+						Gather Info<br/>
+						<input type="number" name="attr_total_bonus_GatherInformation" value="0">
+					</div>
+					<div>
+						Initiative<br/>
+						<input type="number" name="attr_total_bonus_Initiative" value="0">
+					</div>
+					<div>
+						Jump<br/>
+						<input type="number" name="attr_total_bonus_Jump" value="0">
+					</div>
+					<div>
+						Bureaucracy<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-Bureaucracy" value="0">
+					</div>
+					<div>
+						Gal Lore<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-GalacticLore" value="0">
+					</div>
+					<div>
+						Life<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-LifeSciences" value="0">
+					</div>
+					<div>
+						Physical<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-PhysicalScience" value="0">
+					</div>
+					<div>
+						Social<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-SocialScience" value="0">
+					</div>
+					<div>
+						Tactics<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-Tactics" value="0">
+					</div>
+					<div>
+						Tech<br/>
+						<input type="number" name="attr_total_bonus_Knowledge-Technology" value="0">
+					</div>
+					<div>
+						Mechanics<br/>
+						<input type="number" name="attr_total_bonus_Mechanics" value="0">
+					</div>
+					<div>
+						Perception<br/>
+						<input type="number" name="attr_total_bonus_Perception" value="0">
+					</div>
+					<div>
+						Persuasion<br/>
+						<input type="number" name="attr_total_bonus_Persuasion" value="0">
+					</div>
+					<div>
+						Pilot<br/>
+						<input type="number" name="attr_total_bonus_Pilot" value="0">
+					</div>
+					<div>
+						Ride<br/>
+						<input type="number" name="attr_total_bonus_Ride" value="0">
+					</div>
+					<div>
+						Stealth<br/>
+						<input type="number" name="attr_total_bonus_Stealth" value="0">
+					</div>
+					<div>
+						Survival<br/>
+						<input type="number" name="attr_total_bonus_Survival" value="0">
+					</div>
+					<div>
+						Swim<br/>
+						<input type="number" name="attr_total_bonus_Swim" value="0">
+					</div>
+					<div>
+						Treat Injury<br/>
+						<input type="number" name="attr_total_bonus_TreatInjury" value="0">
+					</div>
+					<div>
+						Use Computer<br/>
+						<input type="number" name="attr_total_bonus_UseComputer" value="0">
+					</div>
+					<div>
+						Use Force<br/>
+						<input type="number" name="attr_total_bonus_UsetheForce" value="0">
+					</div>
+				</div>	
+			</div>				
 		</div>
 	</div>
 
@@ -806,7 +941,7 @@
 					<span class="vertical-center grid-title" data-i18n="misc">Misc</span>
 					<!-- Reflex Defense row -->
 					<span class="col1 vertical-center" style="grid-row-start:span 2;" data-i18n="reflex">Reflex</span>
-					<input type="number" name="attr_Reflex" class="shift-left" value="10+@{RefMod}[Mod]+@{RefLevel}[Level]+@{RefClass}[Class]+@{RefMisc}[Misc]+@{RefSizeMod}[Size Mod]+@{CT}[CT]" disabled="true" title="Reflex @{Reflex}" />
+					<input type="number" name="attr_Reflex" class="shift-left" value="10+@{RefMod}[Mod]+@{RefLevel}[Level]+@{RefClass}[Class]+@{RefMisc}[Misc]+@{RefSizeMod}[Size Mod]+@{CT}[CT]+@{total_bonus_reflex}[Buffs]" disabled="true" title="Reflex @{Reflex}" />
 					<span class="center vertical-center">&nbsp;=&nbsp;10&nbsp;+&nbsp;</span>
 					<input type="number" name="attr_RefLevel" value="@{RefLevel|max}" disabled="true" title="Reflex Level / Armor bonus @{RefLevel}"/>
 					<input type="text" name="attr_RefLevel_max" value="@{level}" title="Reflex Level Formula @{RefLevel|max}" class="hidden" />
@@ -824,13 +959,13 @@
 					<input type="number" name="attr_RefMisc" value="0" title="Reflex Miscellaneous Modifier @{RefMisc}" />
 					<!-- Flat-footed row -->
 					<span class="col1 vertical-center small shift-left" data-i18n="flat-footed">Flat&#8209;footed</span>
-					<input type="number" name="attr_ReflexFlatFooted" class="shift-left" value="10+@{dexpenalty}[Dex Penalty]+@{RefLevel}[Level]+@{RefClass}[Class]+@{RefFlatFootedMisc}[Misc]+@{RefSizeMod}[Size Mod]+@{CT}[CT]" disabled="true" title="Flat-footed Reflex Defense @{ReflexFlatFooted}" />
+					<input type="number" name="attr_ReflexFlatFooted" class="shift-left" value="10+@{dexpenalty}[Dex Penalty]+@{RefLevel}[Level]+@{RefClass}[Class]+@{RefFlatFootedMisc}[Misc]+@{RefSizeMod}[Size Mod]+@{CT}[CT]+@{total_bonus_flatfooted}[Buffs]" disabled="true" title="Flat-footed Reflex Defense @{ReflexFlatFooted}" />
 					<span style="grid-column-start:span 3;"></span>
 					<input type="number" value="0" name="attr_RefSizeMod" class="hidden" />
 					<input type="number" name="attr_RefFlatFootedMisc" value="0" title="Reflex Flat Footed Miscellaneous Modifier @{RefFlatFootedMisc}" />
 					<!-- Fortitude Defense row -->
 					<span class="col1 vertical-center" data-i18n="fortitude">Fortitude</span>
-					<input type="number" name="attr_Fortitude" class="shift-left" value="10+@{FortMod}[Mod]+@{FortLevel}[Level]+@{FortClass}[Class]+@{FortMisc}[Misc]+@{CT}[CT]" disabled="true" title="Fortitude Defense @{Fortitude}" />
+					<input type="number" name="attr_Fortitude" class="shift-left" value="10+@{FortMod}[Mod]+@{FortLevel}[Level]+@{FortClass}[Class]+@{FortMisc}[Misc]+@{CT}[CT]+@{total_bonus_fort}[Buffs]" disabled="true" title="Fortitude Defense @{Fortitude}" />
 					<span class="center vertical-center">&nbsp;=&nbsp;10&nbsp;+&nbsp;</span>
 					<input type="number" name="attr_FortLevel" value="@{FortLevel|max}" disabled="true" title="Fortitude Level / Armor bonus @{FortLevel}" />
 					<input type="text" name="attr_FortLevel_max" value="@{level}" title="Fortitude Level Formula @{FortLevel|max}" class="hidden" />
@@ -846,7 +981,7 @@
 					<input type="number" name="attr_FortMisc" value="0" title="Fortitude Miscellaneous Modifier @{FortMisc}" />
 					<!-- Will Defense row -->
 					<span class="col1 vertical-center" data-i18n="will">Will</span>
-					<input type="number" name="attr_Will" class="shift-left" value="10+@{WillMod}[Mod]+@{WillLevel}[Level]+@{WillClass}[Class]+@{WillMisc}[Misc]+@{CT}[CT]" disabled="true" title="Will Defense @{Will}" />
+					<input type="number" name="attr_Will" class="shift-left" value="10+@{WillMod}[Mod]+@{WillLevel}[Level]+@{WillClass}[Class]+@{WillMisc}[Misc]+@{CT}[CT]+@{total_bonus_will}[Buffs]" disabled="true" title="Will Defense @{Will}" />
 					<span class="center vertical-center">&nbsp;=&nbsp;10&nbsp;+&nbsp;</span>
 					<input type="number" name="attr_WillLevel" value="@{level}" disabled="true" title="Will Level / Armor bonus @{WillLevel}"/>
 					<input type="number" name="attr_WillClass" value="0" title="Will Class bonus @{WillClass}" />
@@ -1007,7 +1142,7 @@
 											</b>
 										</span>
 										<br>
-										<textarea type="text" name="attr_AttackTotal" class="atkFormula" spellcheck="false" title="Attack Total formula @{repeating_attack_X_AttackTotal}">@{BAB}[BAB] + @{attackMod}[Mod] + @{attackModMisc}[Misc] +@{CT}[CT] +@{ArmorType|max}[Armor Penalty]</textarea>
+										<textarea type="text" name="attr_AttackTotal" class="atkFormula" spellcheck="false" title="Attack Total formula @{repeating_attack_X_AttackTotal}">@{BAB}[BAB] + @{attackMod}[Mod] + @{attackModMisc}[Misc] +@{CT}[CT] +@{ArmorType|max}[Armor Penalty] + @{total_bonus_attack}[Buffs]</textarea>
 										<span class="small">
 											<b>
 												<span data-i18n="attack">Attack</span>
@@ -1058,7 +1193,7 @@
 											</b>
 										</span>
 										<br>
-										<textarea type="text" name="attr_DamageTotal" class="atkFormula" spellcheck="false" title="Damage Total formula @{repeating_attack_X_DamageTotal}">[[(floor(@{level}/2))]][Half Level] + @{damageMod}[Mod] + @{damageMisc}[Misc]</textarea>
+										<textarea type="text" name="attr_DamageTotal" class="atkFormula" spellcheck="false" title="Damage Total formula @{repeating_attack_X_DamageTotal}">[[(floor(@{level}/2))]][Half Level] + @{damageMod}[Mod] + @{damageMisc}[Misc] + @{total_bonus_damage}[Buffs]</textarea>
 										<span class="small">
 											<b>
 												<span data-i18n="damage">Damage</span>
@@ -1191,7 +1326,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_AcrobaticsFormula" spellcheck="false" title="Skill Total formula @{AcrobaticsFormula}" value="@{level|max}[Half Level]+@{AcrobaticsMod}[Mod]+@{AcrobaticsFeat}[Training]+@{AcrobaticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AcrobaticsMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_AcrobaticsFormula" spellcheck="false" title="Skill Total formula @{AcrobaticsFormula}" value="@{level|max}[Half Level]+@{AcrobaticsMod}[Mod]+@{AcrobaticsFeat}[Training]+@{AcrobaticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AcrobaticsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Acrobatics}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_AcrobaticsFormula_max" spellcheck="false" title="Skill Template formula @{AcrobaticsFormula|max}" value="&{template:skill} {{name=Acrobatics}} {{skill=[[1d20 + @{Acrobatics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Acrobatics|max}}}" />
@@ -1245,7 +1380,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_AthleticsFormula" spellcheck="false" title="Skill Total formula @{AthleticsFormula}" value="@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+@{AthleticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AthleticsMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_AthleticsFormula" spellcheck="false" title="Skill Total formula @{AthleticsFormula}" value="@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+@{AthleticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AthleticsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Athletics}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_AthleticsFormula_max" spellcheck="false" title="Skill Template formula @{AthleticsFormula|max}" value="&{template:skill} {{name= Athletics}} {{skill=[[1d20 + @{Athletics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Athletics|max}}}" />
@@ -1299,7 +1434,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_ClimbFormula" spellcheck="false" title="Skill Total formula @{ClimbFormula}" value="@{level|max}[Half Level]+@{ClimbMod}[Mod]+@{ClimbFeat}[Training]+@{ClimbFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{ClimbMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_ClimbFormula" spellcheck="false" title="Skill Total formula @{ClimbFormula}" value="@{level|max}[Half Level]+@{ClimbMod}[Mod]+@{ClimbFeat}[Training]+@{ClimbFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{ClimbMisc}[Misc]+@{CT}[CT]+@{total_bonus_Climb}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_ClimbFormula_max" spellcheck="false" title="Skill Template formula @{ClimbFormula|max}" value="&{template:skill} {{name=Climb}} {{skill=[[1d20 + @{Climb} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Climb|max}}}" />
@@ -1353,7 +1488,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_DeceptionFormula" spellcheck="false" title="Skill Total formula @{DeceptionFormula}" value="@{level|max}[Half Level]+@{DeceptionMod}[Mod]+@{DeceptionFeat}[Training]+@{DeceptionFeat|max}[Focus]+@{DeceptionMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_DeceptionFormula" spellcheck="false" title="Skill Total formula @{DeceptionFormula}" value="@{level|max}[Half Level]+@{DeceptionMod}[Mod]+@{DeceptionFeat}[Training]+@{DeceptionFeat|max}[Focus]+@{DeceptionMisc}[Misc]+@{CT}[CT]+@{total_bonus_Deception}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_DeceptionFormula_max" spellcheck="false" title="Skill Template formula @{DeceptionFormula|max}" value="&{template:skill} {{name=Deception}} {{skill=[[1d20 + @{Deception} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Deception|max}}}" />
@@ -1407,7 +1542,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_EnduranceFormula" spellcheck="false" title="Skill Total formula @{EnduranceFormula}" value="@{level|max}[Half Level]+@{EnduranceMod}[Mod]+@{EnduranceFeat}[Training]+@{EnduranceFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{EnduranceMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_EnduranceFormula" spellcheck="false" title="Skill Total formula @{EnduranceFormula}" value="@{level|max}[Half Level]+@{EnduranceMod}[Mod]+@{EnduranceFeat}[Training]+@{EnduranceFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{EnduranceMisc}[Misc]+@{CT}[CT]+@{total_bonus_Endurance}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_EnduranceFormula_max" spellcheck="false" title="Skill Template formula @{EnduranceFormula|max}" value="&{template:skill} {{name=Endurance}} {{skill=[[1d20 + @{Endurance} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Endurance|max}}}" />
@@ -1461,7 +1596,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_GatherInformationFormula" spellcheck="false" title="Skill Total formula @{GatherInformationFormula}" value="@{level|max}[Half Level]+@{GatherInformationMod}[Mod]+@{GatherInformationFeat}[Training]+@{GatherInformationFeat|max}[Focus]+@{GatherInformationMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_GatherInformationFormula" spellcheck="false" title="Skill Total formula @{GatherInformationFormula}" value="@{level|max}[Half Level]+@{GatherInformationMod}[Mod]+@{GatherInformationFeat}[Training]+@{GatherInformationFeat|max}[Focus]+@{GatherInformationMisc}[Misc]+@{CT}[CT]+@{total_bonus_GatherInformation}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_GatherInformationFormula_max" spellcheck="false" title="Skill Template formula @{GatherInformationFormula|max}" value="&{template:skill} {{name=Gather Information}} {{skill=[[1d20 + @{GatherInformation} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{GatherInformation|max}}}" />
@@ -1515,7 +1650,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_InitiativeFormula" spellcheck="false" title="Skill Total formula @{InitiativeFormula}" value="@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_InitiativeFormula" spellcheck="false" title="Skill Total formula @{InitiativeFormula}" value="@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]+@{total_bonus_Initiative}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_InitiativeFormula_max" spellcheck="false" title="Skill Template formula @{InitiativeFormula|max}" value="&{template:skill} {{name=Initiative}} {{skill=[[1d20 + @{Initiative} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Initiative|max}}}" />
@@ -1569,7 +1704,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_JumpFormula" spellcheck="false" title="Skill Total formula @{JumpFormula}" value="@{level|max}[Half Level]+@{JumpMod}[Mod]+@{JumpFeat}[Training]+@{JumpFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{JumpMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_JumpFormula" spellcheck="false" title="Skill Total formula @{JumpFormula}" value="@{level|max}[Half Level]+@{JumpMod}[Mod]+@{JumpFeat}[Training]+@{JumpFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{JumpMisc}[Misc]+@{CT}[CT]+@{total_bonus_Jump}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_JumpFormula_max" spellcheck="false" title="Skill Template formula @{JumpFormula|max}" value="&{template:skill} {{name=Jump}} {{skill=[[1d20 + @{Jump} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Jump|max}}}" />
@@ -1626,7 +1761,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-BureaucracyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-BureaucracyFormula}" value="@{level|max}[Half Level]+@{Knowledge-BureaucracyMod}[Mod]+@{Knowledge-BureaucracyFeat}[Training]+@{Knowledge-BureaucracyFeat|max}[Focus]+@{Knowledge-BureaucracyMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-BureaucracyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-BureaucracyFormula}" value="@{level|max}[Half Level]+@{Knowledge-BureaucracyMod}[Mod]+@{Knowledge-BureaucracyFeat}[Training]+@{Knowledge-BureaucracyFeat|max}[Focus]+@{Knowledge-BureaucracyMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-Bureaucracy}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-BureaucracyFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-BureaucracyFormula|max}" value="&{template:skill} {{name=Knowledge (Bureaucracy)}} {{skill=[[1d20 + @{Knowledge-Bureaucracy} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-Bureaucracy|max}}}" />
@@ -1683,7 +1818,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-GalacticLoreFormula" spellcheck="false" title="Skill Total formula @{Knowledge-GalacticLoreFormula}" value="@{level|max}[Half Level]+@{Knowledge-GalacticLoreMod}[Mod]+@{Knowledge-GalacticLoreFeat}[Training]+@{Knowledge-GalacticLoreFeat|max}[Focus]+@{Knowledge-GalacticLoreMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-GalacticLoreFormula" spellcheck="false" title="Skill Total formula @{Knowledge-GalacticLoreFormula}" value="@{level|max}[Half Level]+@{Knowledge-GalacticLoreMod}[Mod]+@{Knowledge-GalacticLoreFeat}[Training]+@{Knowledge-GalacticLoreFeat|max}[Focus]+@{Knowledge-GalacticLoreMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-GalacticLore}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-GalacticLoreFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-GalacticLoreFormula|max}" value="&{template:skill} {{name=Knowledge (Galactic Lore)}} {{skill=[[1d20 + @{Knowledge-GalacticLore} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-GalacticLore|max}}}" />
@@ -1741,7 +1876,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-LifeSciencesFormula" spellcheck="false" title="Skill Total formula @{Knowledge-LifeSciencesFormula}" value="@{level|max}[Half Level]+@{Knowledge-LifeSciencesMod}[Mod]+@{Knowledge-LifeSciencesFeat}[Training]+@{Knowledge-LifeSciencesFeat|max}[Focus]+@{Knowledge-LifeSciencesMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-LifeSciencesFormula" spellcheck="false" title="Skill Total formula @{Knowledge-LifeSciencesFormula}" value="@{level|max}[Half Level]+@{Knowledge-LifeSciencesMod}[Mod]+@{Knowledge-LifeSciencesFeat}[Training]+@{Knowledge-LifeSciencesFeat|max}[Focus]+@{Knowledge-LifeSciencesMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-LifeSciences}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-LifeSciencesFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-LifeSciencesFormula|max}" value="&{template:skill} {{name=Knowledge (Life Sciences)}} {{skill=[[1d20 + @{Knowledge-LifeSciences} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-LifeSciences|max}}}" />
@@ -1798,7 +1933,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-PhysicalScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-PhysicalScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-PhysicalScienceMod}[Mod]+@{Knowledge-PhysicalScienceFeat}[Training]+@{Knowledge-PhysicalScienceFeat|max}[Focus]+@{Knowledge-PhysicalScienceMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-PhysicalScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-PhysicalScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-PhysicalScienceMod}[Mod]+@{Knowledge-PhysicalScienceFeat}[Training]+@{Knowledge-PhysicalScienceFeat|max}[Focus]+@{Knowledge-PhysicalScienceMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-PhysicalScience}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-PhysicalScienceFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-PhysicalScienceFormula|max}" value="&{template:skill} {{name=Knowledge (Physical Sciences)}} {{skill=[[1d20 + @{Knowledge-PhysicalScience} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-PhysicalScience|max}}}" />
@@ -1855,7 +1990,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-SocialScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-SocialScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-SocialScienceMod}[Mod]+@{Knowledge-SocialScienceFeat}[Training]+@{Knowledge-SocialScienceFeat|max}[Focus]+@{Knowledge-SocialScienceMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-SocialScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-SocialScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-SocialScienceMod}[Mod]+@{Knowledge-SocialScienceFeat}[Training]+@{Knowledge-SocialScienceFeat|max}[Focus]+@{Knowledge-SocialScienceMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-SocialScience}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-SocialScienceFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-SocialScienceFormula|max}" value="&{template:skill} {{name=Knowledge (Social Sciences)}} {{skill=[[1d20 + @{Knowledge-SocialScience} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-SocialScience|max}}}" />
@@ -1912,7 +2047,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-TacticsFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TacticsFormula}" value="@{level|max}[Half Level]+@{Knowledge-TacticsMod}[Mod]+@{Knowledge-TacticsFeat}[Training]+@{Knowledge-TacticsFeat|max}[Focus]+@{Knowledge-TacticsMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-TacticsFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TacticsFormula}" value="@{level|max}[Half Level]+@{Knowledge-TacticsMod}[Mod]+@{Knowledge-TacticsFeat}[Training]+@{Knowledge-TacticsFeat|max}[Focus]+@{Knowledge-TacticsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-Tactics}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-TacticsFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-TacticsFormula|max}" value="&{template:skill} {{name=Knowledge (Tactics)}} {{skill=[[1d20 + @{Knowledge-Tactics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-Tactics|max}}}" />
@@ -1969,7 +2104,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_Knowledge-TechnologyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TechnologyFormula}" value="@{level|max}[Half Level]+@{Knowledge-TechnologyMod}[Mod]+@{Knowledge-TechnologyFeat}[Training]+@{Knowledge-TechnologyFeat|max}[Focus]+@{Knowledge-TechnologyMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_Knowledge-TechnologyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TechnologyFormula}" value="@{level|max}[Half Level]+@{Knowledge-TechnologyMod}[Mod]+@{Knowledge-TechnologyFeat}[Training]+@{Knowledge-TechnologyFeat|max}[Focus]+@{Knowledge-TechnologyMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-Technology}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_Knowledge-TechnologyFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-TechnologyFormula|max}" value="&{template:skill} {{name=Knowledge (Technology)}} {{skill=[[1d20 + @{Knowledge-Technology} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-Technology|max}}}" />
@@ -2023,7 +2158,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_MechanicsFormula" spellcheck="false" title="Skill Total formula @{MechanicsFormula}" value="@{level|max}[Half Level]+@{MechanicsMod}[Mod]+@{MechanicsFeat}[Training]+@{MechanicsFeat|max}[Focus]+@{MechanicsMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_MechanicsFormula" spellcheck="false" title="Skill Total formula @{MechanicsFormula}" value="@{level|max}[Half Level]+@{MechanicsMod}[Mod]+@{MechanicsFeat}[Training]+@{MechanicsFeat|max}[Focus]+@{MechanicsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Mechanics}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_MechanicsFormula_max" spellcheck="false" title="Skill Template formula @{MechanicsFormula|max}" value="&{template:skill} {{name=Mechanics}} {{skill=[[1d20 + @{Mechanics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Mechanics|max}}}" />
@@ -2077,7 +2212,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_PerceptionFormula" spellcheck="false" title="Skill Total formula @{PerceptionFormula}" value="@{level|max}[Half Level]+@{PerceptionMod}[Mod]+@{PerceptionFeat}[Training]+@{PerceptionFeat|max}[Focus]+@{PerceptionMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_PerceptionFormula" spellcheck="false" title="Skill Total formula @{PerceptionFormula}" value="@{level|max}[Half Level]+@{PerceptionMod}[Mod]+@{PerceptionFeat}[Training]+@{PerceptionFeat|max}[Focus]+@{PerceptionMisc}[Misc]+@{CT}[CT]+@{total_bonus_Perception}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_PerceptionFormula_max" spellcheck="false" title="Skill Template formula @{PerceptionFormula|max}" value="&{template:skill} {{name=Perception}} {{skill=[[1d20 + @{Perception} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Perception|max}}}" />
@@ -2131,7 +2266,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_PersuasionFormula" spellcheck="false" title="Skill Total formula @{PersuasionFormula}" value="@{level|max}[Half Level]+@{PersuasionMod}[Mod]+@{PersuasionFeat}[Training]+@{PersuasionFeat|max}[Focus]+@{PersuasionMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_PersuasionFormula" spellcheck="false" title="Skill Total formula @{PersuasionFormula}" value="@{level|max}[Half Level]+@{PersuasionMod}[Mod]+@{PersuasionFeat}[Training]+@{PersuasionFeat|max}[Focus]+@{PersuasionMisc}[Misc]+@{CT}[CT]+@{total_bonus_Persuasion}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_PersuasionFormula_max" spellcheck="false" title="Skill Template formula @{PersuasionFormula|max}" value="&{template:skill} {{name=Persuasion}} {{skill=[[1d20 + @{Persuasion} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Persuasion|max}}}" />
@@ -2185,7 +2320,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_PilotFormula" spellcheck="false" title="Skill Total formula @{PilotFormula}" value="@{level|max}[Half Level]+@{PilotMod}[Mod]+@{PilotFeat}[Training]+@{PilotFeat|max}[Focus]+@{PilotMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_PilotFormula" spellcheck="false" title="Skill Total formula @{PilotFormula}" value="@{level|max}[Half Level]+@{PilotMod}[Mod]+@{PilotFeat}[Training]+@{PilotFeat|max}[Focus]+@{PilotMisc}[Misc]+@{CT}[CT]+@{total_bonus_Pilot}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_PilotFormula_max" spellcheck="false" title="Skill Template formula @{PilotFormula|max}" value="&{template:skill} {{name=Pilot}} {{skill=[[1d20 + @{Pilot} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Pilot|max}}}" />
@@ -2239,7 +2374,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_RideFormula" spellcheck="false" title="Skill Total formula @{RideFormula}" value="@{level|max}[Half Level]+@{RideMod}[Mod]+@{RideFeat}[Training]+@{RideFeat|max}[Focus]+@{RideMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_RideFormula" spellcheck="false" title="Skill Total formula @{RideFormula}" value="@{level|max}[Half Level]+@{RideMod}[Mod]+@{RideFeat}[Training]+@{RideFeat|max}[Focus]+@{RideMisc}[Misc]+@{CT}[CT]+@{total_bonus_Ride}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_RideFormula_max" spellcheck="false" title="Skill Template formula @{RideFormula|max}" value="&{template:skill} {{name=Ride}} {{skill=[[1d20 + @{Ride} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Ride|max}}}" />
@@ -2293,7 +2428,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_StealthFormula" spellcheck="false" title="Skill Total formula @{StealthFormula}" value="@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+@{StealthFeat|max}[Focus]+@{StealthSize}[Size]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_StealthFormula" spellcheck="false" title="Skill Total formula @{StealthFormula}" value="@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+@{StealthFeat|max}[Focus]+@{StealthSize}[Size]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]+@{total_bonus_Stealth}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_StealthFormula_max" spellcheck="false" title="Skill Template formula @{StealthFormula|max}" value="&{template:skill} {{name=Stealth}} {{skill=[[1d20 + @{Stealth} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Stealth|max}}}" />
@@ -2347,7 +2482,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_SurvivalFormula" spellcheck="false" title="Skill Total formula @{SurvivalFormula}" value="@{level|max}[Half Level]+@{SurvivalMod}[Mod]+@{SurvivalFeat}[Training]+@{SurvivalFeat|max}[Focus]+@{SurvivalMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_SurvivalFormula" spellcheck="false" title="Skill Total formula @{SurvivalFormula}" value="@{level|max}[Half Level]+@{SurvivalMod}[Mod]+@{SurvivalFeat}[Training]+@{SurvivalFeat|max}[Focus]+@{SurvivalMisc}[Misc]+@{CT}[CT]+@{total_bonus_Survival}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_SurvivalFormula_max" spellcheck="false" title="Skill Template formula @{SurvivalFormula|max}" value="&{template:skill} {{name=Survival}} {{skill=[[1d20 + @{Survival} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Survival|max}}}" />
@@ -2401,7 +2536,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_SwimFormula" spellcheck="false" title="Skill Total formula @{SwimFormula}" value="@{level|max}[Half Level]+@{SwimMod}[Mod]+@{SwimFeat}[Training]+@{SwimFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{SwimMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_SwimFormula" spellcheck="false" title="Skill Total formula @{SwimFormula}" value="@{level|max}[Half Level]+@{SwimMod}[Mod]+@{SwimFeat}[Training]+@{SwimFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{SwimMisc}[Misc]+@{CT}[CT]+@{total_bonus_Swim}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_SwimFormula_max" spellcheck="false" title="Skill Template formula @{SwimFormula|max}" value="&{template:skill} {{name=Swim}} {{skill=[[1d20 + @{Swim} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Swim|max}}}" />
@@ -2455,7 +2590,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_TreatInjuryFormula" spellcheck="false" title="Skill Total formula @{TreatInjuryFormula}" value="@{level|max}[Half Level]+@{TreatInjuryMod}[Mod]+@{TreatInjuryFeat}[Training]+@{TreatInjuryFeat|max}[Focus]+@{TreatInjuryMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_TreatInjuryFormula" spellcheck="false" title="Skill Total formula @{TreatInjuryFormula}" value="@{level|max}[Half Level]+@{TreatInjuryMod}[Mod]+@{TreatInjuryFeat}[Training]+@{TreatInjuryFeat|max}[Focus]+@{TreatInjuryMisc}[Misc]+@{CT}[CT]+@{total_bonus_TreatInjury}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_TreatInjuryFormula_max" spellcheck="false" title="Skill Template formula @{TreatInjuryFormula|max}" value="&{template:skill} {{name=Treat Injury}} {{skill=[[1d20 + @{TreatInjury} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{TreatInjury|max}}}" />
@@ -2509,7 +2644,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_UseComputerFormula" spellcheck="false" title="Skill Total formula @{UseComputerFormula}" value="@{level|max}[Half Level]+@{UseComputerMod}[Mod]+@{UseComputerFeat}[Training]+@{UseComputerFeat|max}[Focus]+@{UseComputerMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_UseComputerFormula" spellcheck="false" title="Skill Total formula @{UseComputerFormula}" value="@{level|max}[Half Level]+@{UseComputerMod}[Mod]+@{UseComputerFeat}[Training]+@{UseComputerFeat|max}[Focus]+@{UseComputerMisc}[Misc]+@{CT}[CT]+@{total_bonus_UseComputer}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_UseComputerFormula_max" spellcheck="false" title="Skill Template formula @{UseComputerFormula|max}" value="&{template:skill} {{name=Use Computer}} {{skill=[[1d20 + @{UseComputer} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{UseComputer|max}}}" />
@@ -2563,7 +2698,7 @@
 						<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 							<span class="small bold">Skill Modifier Total Formula</span>
 							<br/>
-							<input type="text" name="attr_UsetheForceFormula" spellcheck="false" title="Skill Total formula @{UsetheForceFormula}" value="@{level|max}[Half Level]+@{UsetheForceMod}[Mod]+@{UsetheForceFeat}[Training]+@{UsetheForceFeat|max}[Focus]+@{UsetheForceMisc}[Misc]+@{CT}[CT]" />
+							<input type="text" name="attr_UsetheForceFormula" spellcheck="false" title="Skill Total formula @{UsetheForceFormula}" value="@{level|max}[Half Level]+@{UsetheForceMod}[Mod]+@{UsetheForceFeat}[Training]+@{UsetheForceFeat|max}[Focus]+@{UsetheForceMisc}[Misc]+@{CT}[CT]+@{total_bonus_UsetheForce}[Buffs]" />
 							<span class="small bold">Template Formula</span>
 							<br/>
 							<input type="text" name="attr_UsetheForceFormula_max" spellcheck="false" title="Skill Template formula @{UsetheForceFormula|max}" value="&{template:skill} {{name=Use the Force}} {{skill=[[1d20 + @{UsetheForce} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{UsetheForce|max}}}" />
@@ -3696,26 +3831,26 @@
 					<tr>
 						<td class="col1" rowspan="2"><span data-i18n="reflex">Reflex</span></td>
 						<td></td>
-						<td><input type="number" name="attr_NPC-Reflex" value="@{RefTotal}+@{ct}" disabled="true" title="Reflex @{NPC-Reflex}" /></td>
+						<td><input type="number" name="attr_NPC-Reflex" value="@{RefTotal}+@{ct}+@{total_bonus_reflex}[Buffs]" disabled="true" title="Reflex @{NPC-Reflex}" /></td>
 						<td><input type="text" name="attr_RefTotal" value="10+@{level}+@{Dex|max}+@{RefSizeMod}" title="Reflex Total (You can use formulas, for example: 10+@{level}[Level]+@{Dex|max} or enter the total Defence Score) @{RefTotal}"/></td>
 					</tr>
 						<input type="hidden" name="attr_dexpenalty" title="dexpenalty" value="( [[ (0-floor((@{dex|max} +0.1)/(abs(@{dex|max}+0.1) +0.001))*@{dex|max}) ]] )" disabled="true" />
 					<tr>
 						<!-- rowspan placeholder -->
 						<td class="col1"><div class="small"><span data-i18n="flat-footed">Flat&#8209;footed</span></div></td>
-						<td><input type="number" name="attr_NPC-ReflexFlatFooted" value="@{RefTotal|max}+@{ct}" disabled="true" title="Reflex Flat Footed @{NPC-ReflexFlatFooted}" /></td>
+						<td><input type="number" name="attr_NPC-ReflexFlatFooted" value="@{RefTotal|max}+@{ct}+@{total_bonus_flatfooted}[Buffs]" disabled="true" title="Reflex Flat Footed @{NPC-ReflexFlatFooted}" /></td>
 						<td><input type="text" name="attr_RefTotal_max" value="10+@{level}+@{dexpenalty}+@{RefSizeMod}" title="Flat-footed Reflex Total (You can use formulas, for example: 10+@{level} or enter the total Defence Score) @{RefTotal|max}"/></td>
 					</tr>
 					<tr>
 						<td class="col1"><span data-i18n="fortitude">Fortitude</span></td>
 						<td rowspan="2"></td>
-						<td><input type="number" name="attr_NPC-Fortitude" value="@{FortTotal}+@{ct}" disabled="true" title ="Fortitude @{NPC-Fortitude}" /></td>
+						<td><input type="number" name="attr_NPC-Fortitude" value="@{FortTotal}+@{ct}+@{total_bonus_fort}[Buffs]" disabled="true" title ="Fortitude @{NPC-Fortitude}" /></td>
 						<td><input type="text" name="attr_FortTotal" value="10+@{level}+@{CON|max}" title="Fortitude Total (You can use formulas, for example: 10+@{level} or enter the total Defence Score) @{FortTotal}"/></td>
 					</tr>
 					<tr>
 						<td class="col1"><span data-i18n="will">Will</span></td>
 						<!-- rowspan placeholder -->
-						<td><input type="number" name="attr_NPC-Will" value="@{WillTotal}+@{ct}" disabled="true" title="Will @{NPC-Will}"/></td>
+						<td><input type="number" name="attr_NPC-Will" value="@{WillTotal}+@{ct}+@{total_bonus_will}[Buffs]" disabled="true" title="Will @{NPC-Will}"/></td>
 						<td><input type="text" name="attr_WillTotal" value="10+@{level}+@{Wis|max}" title="Will Total (You can use formulas, for example: 10+@{level} or enter the total Defence Score) @{WillTotal}"/></td>
 					</tr>
 					<tbody>
@@ -3761,7 +3896,7 @@
 											<span class="sheet-table-data" style="min-width:44px"></span>
 											<span class="sheet-table-data col1" style="min-width:55px">Attack</span>
 											<span class="sheet-table-data center" style="min-width:130px">
-												<input type="number" name="attr_AttackTotal" value="@{Attack}+@{ct}" disabled="true" title="Attack Total Preview @{repeating_npc-attack_X_AttackTotal}" />
+												<input type="number" name="attr_AttackTotal" value="@{Attack}+@{ct}+@{total_bonus_attack}[Buffs]" disabled="true" title="Attack Total Preview @{repeating_npc-attack_X_AttackTotal}" />
 											</span>
 											<span class="sheet-table-data center" style="padding:0px 5px;">|</span>
 											<span class="sheet-table-data center">
@@ -3780,7 +3915,7 @@
 											<span class="sheet-table-data" style="min-width:130px">
 												<input type="text" name="attr_damage" value="2d8" style="width:60px" title="Weapon Damage @{repeating_npc-attack_X_damage}"/>
 												+
-												<input type="number" name="attr_DamageTotal" value="@{damage|max}" disabled="true" title="Damage Total @{repeating_npc-attack_X_DamageTotal}" />
+												<input type="number" name="attr_DamageTotal" value="@{damage|max}+@{total_bonus_damage}[Buffs]" disabled="true" title="Damage Total @{repeating_npc-attack_X_DamageTotal}" />
 											</span>
 											<span class="sheet-table-data center" style="padding:0px 5px;">|</span>
 											<span class="sheet-table-data center">
@@ -3912,7 +4047,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_AcrobaticsFormula" spellcheck="false" title="Skill Total formula @{AcrobaticsFormula}" value="@{level|max}[Half Level]+@{AcrobaticsMod}[Mod]+@{AcrobaticsFeat}[Training]+@{AcrobaticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AcrobaticsMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_AcrobaticsFormula" spellcheck="false" title="Skill Total formula @{AcrobaticsFormula}" value="@{level|max}[Half Level]+@{AcrobaticsMod}[Mod]+@{AcrobaticsFeat}[Training]+@{AcrobaticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AcrobaticsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Acrobatics}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_AcrobaticsFormula_max" spellcheck="false" title="Skill Template formula @{AcrobaticsFormula|max}" value="&{template:skill} {{name=Acrobatics}} {{skill=[[1d20 + @{Acrobatics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Acrobatics|max}}}" />
@@ -3968,7 +4103,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_AthleticsFormula" spellcheck="false" title="Skill Total formula @{AthleticsFormula}" value="@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+@{AthleticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AthleticsMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_AthleticsFormula" spellcheck="false" title="Skill Total formula @{AthleticsFormula}" value="@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+@{AthleticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AthleticsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Athletics}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_AthleticsFormula_max" spellcheck="false" title="Skill Template formula @{AthleticsFormula|max}" value="&{template:skill} {{name= Athletics}} {{skill=[[1d20 + @{Athletics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Athletics|max}}}" />
@@ -4024,7 +4159,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_ClimbFormula" spellcheck="false" title="Skill Total formula @{ClimbFormula}" value="@{level|max}[Half Level]+@{ClimbMod}[Mod]+@{ClimbFeat}[Training]+@{ClimbFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{ClimbMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_ClimbFormula" spellcheck="false" title="Skill Total formula @{ClimbFormula}" value="@{level|max}[Half Level]+@{ClimbMod}[Mod]+@{ClimbFeat}[Training]+@{ClimbFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{ClimbMisc}[Misc]+@{CT}[CT]+@{total_bonus_Climb}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_ClimbFormula_max" spellcheck="false" title="Skill Template formula @{ClimbFormula|max}" value="&{template:skill} {{name=Climb}} {{skill=[[1d20 + @{Climb} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Climb|max}}}" />
@@ -4080,7 +4215,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_DeceptionFormula" spellcheck="false" title="Skill Total formula @{DeceptionFormula}" value="@{level|max}[Half Level]+@{DeceptionMod}[Mod]+@{DeceptionFeat}[Training]+@{DeceptionFeat|max}[Focus]+@{DeceptionMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_DeceptionFormula" spellcheck="false" title="Skill Total formula @{DeceptionFormula}" value="@{level|max}[Half Level]+@{DeceptionMod}[Mod]+@{DeceptionFeat}[Training]+@{DeceptionFeat|max}[Focus]+@{DeceptionMisc}[Misc]+@{CT}[CT]+@{total_bonus_Deception}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_DeceptionFormula_max" spellcheck="false" title="Skill Template formula @{DeceptionFormula|max}" value="&{template:skill} {{name=Deception}} {{skill=[[1d20 + @{Deception} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Deception|max}}}" />
@@ -4136,7 +4271,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_EnduranceFormula" spellcheck="false" title="Skill Total formula @{EnduranceFormula}" value="@{level|max}[Half Level]+@{EnduranceMod}[Mod]+@{EnduranceFeat}[Training]+@{EnduranceFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{EnduranceMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_EnduranceFormula" spellcheck="false" title="Skill Total formula @{EnduranceFormula}" value="@{level|max}[Half Level]+@{EnduranceMod}[Mod]+@{EnduranceFeat}[Training]+@{EnduranceFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{EnduranceMisc}[Misc]+@{CT}[CT]+@{total_bonus_Endurance}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_EnduranceFormula_max" spellcheck="false" title="Skill Template formula @{EnduranceFormula|max}" value="&{template:skill} {{name=Endurance}} {{skill=[[1d20 + @{Endurance} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Endurance|max}}}" />
@@ -4192,7 +4327,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_GatherInformationFormula" spellcheck="false" title="Skill Total formula @{GatherInformationFormula}" value="@{level|max}[Half Level]+@{GatherInformationMod}[Mod]+@{GatherInformationFeat}[Training]+@{GatherInformationFeat|max}[Focus]+@{GatherInformationMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_GatherInformationFormula" spellcheck="false" title="Skill Total formula @{GatherInformationFormula}" value="@{level|max}[Half Level]+@{GatherInformationMod}[Mod]+@{GatherInformationFeat}[Training]+@{GatherInformationFeat|max}[Focus]+@{GatherInformationMisc}[Misc]+@{CT}[CT]+@{total_bonus_GatherInformation}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_GatherInformationFormula_max" spellcheck="false" title="Skill Template formula @{GatherInformationFormula|max}" value="&{template:skill} {{name=Gather Information}} {{skill=[[1d20 + @{GatherInformation} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{GatherInformation|max}}}" />
@@ -4248,7 +4383,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_InitiativeFormula" spellcheck="false" title="Skill Total formula @{InitiativeFormula}" value="@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_InitiativeFormula" spellcheck="false" title="Skill Total formula @{InitiativeFormula}" value="@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]+@{total_bonus_Initiative}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_InitiativeFormula_max" spellcheck="false" title="Skill Template formula @{InitiativeFormula|max}" value="&{template:skill} {{name=Initiative}} {{skill=[[1d20 + @{Initiative} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Initiative|max}}}" />
@@ -4304,7 +4439,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_JumpFormula" spellcheck="false" title="Skill Total formula @{JumpFormula}" value="@{level|max}[Half Level]+@{JumpMod}[Mod]+@{JumpFeat}[Training]+@{JumpFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{JumpMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_JumpFormula" spellcheck="false" title="Skill Total formula @{JumpFormula}" value="@{level|max}[Half Level]+@{JumpMod}[Mod]+@{JumpFeat}[Training]+@{JumpFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{JumpMisc}[Misc]+@{CT}[CT]+@{total_bonus_Jump}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_JumpFormula_max" spellcheck="false" title="Skill Template formula @{JumpFormula|max}" value="&{template:skill} {{name=Jump}} {{skill=[[1d20 + @{Jump} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Jump|max}}}" />
@@ -4363,7 +4498,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-BureaucracyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-BureaucracyFormula}" value="@{level|max}[Half Level]+@{Knowledge-BureaucracyMod}[Mod]+@{Knowledge-BureaucracyFeat}[Training]+@{Knowledge-BureaucracyFeat|max}[Focus]+@{Knowledge-BureaucracyMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-BureaucracyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-BureaucracyFormula}" value="@{level|max}[Half Level]+@{Knowledge-BureaucracyMod}[Mod]+@{Knowledge-BureaucracyFeat}[Training]+@{Knowledge-BureaucracyFeat|max}[Focus]+@{Knowledge-BureaucracyMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-Bureaucracy}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-BureaucracyFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-BureaucracyFormula|max}" value="&{template:skill} {{name=Knowledge (Bureaucracy)}} {{skill=[[1d20 + @{Knowledge-Bureaucracy} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-Bureaucracy|max}}}" />
@@ -4422,7 +4557,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-GalacticLoreFormula" spellcheck="false" title="Skill Total formula @{Knowledge-GalacticLoreFormula}" value="@{level|max}[Half Level]+@{Knowledge-GalacticLoreMod}[Mod]+@{Knowledge-GalacticLoreFeat}[Training]+@{Knowledge-GalacticLoreFeat|max}[Focus]+@{Knowledge-GalacticLoreMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-GalacticLoreFormula" spellcheck="false" title="Skill Total formula @{Knowledge-GalacticLoreFormula}" value="@{level|max}[Half Level]+@{Knowledge-GalacticLoreMod}[Mod]+@{Knowledge-GalacticLoreFeat}[Training]+@{Knowledge-GalacticLoreFeat|max}[Focus]+@{Knowledge-GalacticLoreMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-GalacticLore}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-GalacticLoreFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-GalacticLoreFormula|max}" value="&{template:skill} {{name=Knowledge (Galactic Lore)}} {{skill=[[1d20 + @{Knowledge-GalacticLore} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-GalacticLore|max}}}" />
@@ -4482,7 +4617,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-LifeSciencesFormula" spellcheck="false" title="Skill Total formula @{Knowledge-LifeSciencesFormula}" value="@{level|max}[Half Level]+@{Knowledge-LifeSciencesMod}[Mod]+@{Knowledge-LifeSciencesFeat}[Training]+@{Knowledge-LifeSciencesFeat|max}[Focus]+@{Knowledge-LifeSciencesMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-LifeSciencesFormula" spellcheck="false" title="Skill Total formula @{Knowledge-LifeSciencesFormula}" value="@{level|max}[Half Level]+@{Knowledge-LifeSciencesMod}[Mod]+@{Knowledge-LifeSciencesFeat}[Training]+@{Knowledge-LifeSciencesFeat|max}[Focus]+@{Knowledge-LifeSciencesMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-LifeSciences}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-LifeSciencesFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-LifeSciencesFormula|max}" value="&{template:skill} {{name=Knowledge (Life Sciences)}} {{skill=[[1d20 + @{Knowledge-LifeSciences} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-LifeSciences|max}}}" />
@@ -4541,7 +4676,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-PhysicalScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-PhysicalScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-PhysicalScienceMod}[Mod]+@{Knowledge-PhysicalScienceFeat}[Training]+@{Knowledge-PhysicalScienceFeat|max}[Focus]+@{Knowledge-PhysicalScienceMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-PhysicalScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-PhysicalScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-PhysicalScienceMod}[Mod]+@{Knowledge-PhysicalScienceFeat}[Training]+@{Knowledge-PhysicalScienceFeat|max}[Focus]+@{Knowledge-PhysicalScienceMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-PhysicalScience}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-PhysicalScienceFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-PhysicalScienceFormula|max}" value="&{template:skill} {{name=Knowledge (Physical Sciences)}} {{skill=[[1d20 + @{Knowledge-PhysicalScience} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-PhysicalScience|max}}}" />
@@ -4600,7 +4735,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-SocialScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-SocialScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-SocialScienceMod}[Mod]+@{Knowledge-SocialScienceFeat}[Training]+@{Knowledge-SocialScienceFeat|max}[Focus]+@{Knowledge-SocialScienceMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-SocialScienceFormula" spellcheck="false" title="Skill Total formula @{Knowledge-SocialScienceFormula}" value="@{level|max}[Half Level]+@{Knowledge-SocialScienceMod}[Mod]+@{Knowledge-SocialScienceFeat}[Training]+@{Knowledge-SocialScienceFeat|max}[Focus]+@{Knowledge-SocialScienceMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-SocialScience}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-SocialScienceFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-SocialScienceFormula|max}" value="&{template:skill} {{name=Knowledge (Social Sciences)}} {{skill=[[1d20 + @{Knowledge-SocialScience} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-SocialScience|max}}}" />
@@ -4659,7 +4794,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-TacticsFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TacticsFormula}" value="@{level|max}[Half Level]+@{Knowledge-TacticsMod}[Mod]+@{Knowledge-TacticsFeat}[Training]+@{Knowledge-TacticsFeat|max}[Focus]+@{Knowledge-TacticsMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-TacticsFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TacticsFormula}" value="@{level|max}[Half Level]+@{Knowledge-TacticsMod}[Mod]+@{Knowledge-TacticsFeat}[Training]+@{Knowledge-TacticsFeat|max}[Focus]+@{Knowledge-TacticsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-Tactics}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-TacticsFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-TacticsFormula|max}" value="&{template:skill} {{name=Knowledge (Tactics)}} {{skill=[[1d20 + @{Knowledge-Tactics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-Tactics|max}}}" />
@@ -4718,7 +4853,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_Knowledge-TechnologyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TechnologyFormula}" value="@{level|max}[Half Level]+@{Knowledge-TechnologyMod}[Mod]+@{Knowledge-TechnologyFeat}[Training]+@{Knowledge-TechnologyFeat|max}[Focus]+@{Knowledge-TechnologyMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_Knowledge-TechnologyFormula" spellcheck="false" title="Skill Total formula @{Knowledge-TechnologyFormula}" value="@{level|max}[Half Level]+@{Knowledge-TechnologyMod}[Mod]+@{Knowledge-TechnologyFeat}[Training]+@{Knowledge-TechnologyFeat|max}[Focus]+@{Knowledge-TechnologyMisc}[Misc]+@{CT}[CT]+@{total_bonus_Knowledge-Technology}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_Knowledge-TechnologyFormula_max" spellcheck="false" title="Skill Template formula @{Knowledge-TechnologyFormula|max}" value="&{template:skill} {{name=Knowledge (Technology)}} {{skill=[[1d20 + @{Knowledge-Technology} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Knowledge-Technology|max}}}" />
@@ -4774,7 +4909,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_MechanicsFormula" spellcheck="false" title="Skill Total formula @{MechanicsFormula}" value="@{level|max}[Half Level]+@{MechanicsMod}[Mod]+@{MechanicsFeat}[Training]+@{MechanicsFeat|max}[Focus]+@{MechanicsMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_MechanicsFormula" spellcheck="false" title="Skill Total formula @{MechanicsFormula}" value="@{level|max}[Half Level]+@{MechanicsMod}[Mod]+@{MechanicsFeat}[Training]+@{MechanicsFeat|max}[Focus]+@{MechanicsMisc}[Misc]+@{CT}[CT]+@{total_bonus_Mechanics}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_MechanicsFormula_max" spellcheck="false" title="Skill Template formula @{MechanicsFormula|max}" value="&{template:skill} {{name=Mechanics}} {{skill=[[1d20 + @{Mechanics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Mechanics|max}}}" />
@@ -4830,7 +4965,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_PerceptionFormula" spellcheck="false" title="Skill Total formula @{PerceptionFormula}" value="@{level|max}[Half Level]+@{PerceptionMod}[Mod]+@{PerceptionFeat}[Training]+@{PerceptionFeat|max}[Focus]+@{PerceptionMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_PerceptionFormula" spellcheck="false" title="Skill Total formula @{PerceptionFormula}" value="@{level|max}[Half Level]+@{PerceptionMod}[Mod]+@{PerceptionFeat}[Training]+@{PerceptionFeat|max}[Focus]+@{PerceptionMisc}[Misc]+@{CT}[CT]+@{total_bonus_Perception}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_PerceptionFormula_max" spellcheck="false" title="Skill Template formula @{PerceptionFormula|max}" value="&{template:skill} {{name=Perception}} {{skill=[[1d20 + @{Perception} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Perception|max}}}" />
@@ -4886,7 +5021,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_PersuasionFormula" spellcheck="false" title="Skill Total formula @{PersuasionFormula}" value="@{level|max}[Half Level]+@{PersuasionMod}[Mod]+@{PersuasionFeat}[Training]+@{PersuasionFeat|max}[Focus]+@{PersuasionMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_PersuasionFormula" spellcheck="false" title="Skill Total formula @{PersuasionFormula}" value="@{level|max}[Half Level]+@{PersuasionMod}[Mod]+@{PersuasionFeat}[Training]+@{PersuasionFeat|max}[Focus]+@{PersuasionMisc}[Misc]+@{CT}[CT]+@{total_bonus_Persuasion}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_PersuasionFormula_max" spellcheck="false" title="Skill Template formula @{PersuasionFormula|max}" value="&{template:skill} {{name=Persuasion}} {{skill=[[1d20 + @{Persuasion} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Persuasion|max}}}" />
@@ -4942,7 +5077,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_PilotFormula" spellcheck="false" title="Skill Total formula @{PilotFormula}" value="@{level|max}[Half Level]+@{PilotMod}[Mod]+@{PilotFeat}[Training]+@{PilotFeat|max}[Focus]+@{PilotMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_PilotFormula" spellcheck="false" title="Skill Total formula @{PilotFormula}" value="@{level|max}[Half Level]+@{PilotMod}[Mod]+@{PilotFeat}[Training]+@{PilotFeat|max}[Focus]+@{PilotMisc}[Misc]+@{CT}[CT]+@{total_bonus_Pilot}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_PilotFormula_max" spellcheck="false" title="Skill Template formula @{PilotFormula|max}" value="&{template:skill} {{name=Pilot}} {{skill=[[1d20 + @{Pilot} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Pilot|max}}}" />
@@ -4998,7 +5133,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_RideFormula" spellcheck="false" title="Skill Total formula @{RideFormula}" value="@{level|max}[Half Level]+@{RideMod}[Mod]+@{RideFeat}[Training]+@{RideFeat|max}[Focus]+@{RideMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_RideFormula" spellcheck="false" title="Skill Total formula @{RideFormula}" value="@{level|max}[Half Level]+@{RideMod}[Mod]+@{RideFeat}[Training]+@{RideFeat|max}[Focus]+@{RideMisc}[Misc]+@{CT}[CT]+@{total_bonus_Ride}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_RideFormula_max" spellcheck="false" title="Skill Template formula @{RideFormula|max}" value="&{template:skill} {{name=Ride}} {{skill=[[1d20 + @{Ride} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Ride|max}}}" />
@@ -5054,7 +5189,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_StealthFormula" spellcheck="false" title="Skill Total formula @{StealthFormula}" value="@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+@{StealthFeat|max}[Focus]+@{StealthSize}[Size]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_StealthFormula" spellcheck="false" title="Skill Total formula @{StealthFormula}" value="@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+@{StealthFeat|max}[Focus]+@{StealthSize}[Size]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]+@{total_bonus_Stealth}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_StealthFormula_max" spellcheck="false" title="Skill Template formula @{StealthFormula|max}" value="&{template:skill} {{name=Stealth}} {{skill=[[1d20 + @{Stealth} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Stealth|max}}}" />
@@ -5110,7 +5245,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_SurvivalFormula" spellcheck="false" title="Skill Total formula @{SurvivalFormula}" value="@{level|max}[Half Level]+@{SurvivalMod}[Mod]+@{SurvivalFeat}[Training]+@{SurvivalFeat|max}[Focus]+@{SurvivalMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_SurvivalFormula" spellcheck="false" title="Skill Total formula @{SurvivalFormula}" value="@{level|max}[Half Level]+@{SurvivalMod}[Mod]+@{SurvivalFeat}[Training]+@{SurvivalFeat|max}[Focus]+@{SurvivalMisc}[Misc]+@{CT}[CT]+@{total_bonus_Survival}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_SurvivalFormula_max" spellcheck="false" title="Skill Template formula @{SurvivalFormula|max}" value="&{template:skill} {{name=Survival}} {{skill=[[1d20 + @{Survival} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Survival|max}}}" />
@@ -5166,7 +5301,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_SwimFormula" spellcheck="false" title="Skill Total formula @{SwimFormula}" value="@{level|max}[Half Level]+@{SwimMod}[Mod]+@{SwimFeat}[Training]+@{SwimFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{SwimMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_SwimFormula" spellcheck="false" title="Skill Total formula @{SwimFormula}" value="@{level|max}[Half Level]+@{SwimMod}[Mod]+@{SwimFeat}[Training]+@{SwimFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{SwimMisc}[Misc]+@{CT}[CT]+@{total_bonus_Swim}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_SwimFormula_max" spellcheck="false" title="Skill Template formula @{SwimFormula|max}" value="&{template:skill} {{name=Swim}} {{skill=[[1d20 + @{Swim} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Swim|max}}}" />
@@ -5222,7 +5357,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_TreatInjuryFormula" spellcheck="false" title="Skill Total formula @{TreatInjuryFormula}" value="@{level|max}[Half Level]+@{TreatInjuryMod}[Mod]+@{TreatInjuryFeat}[Training]+@{TreatInjuryFeat|max}[Focus]+@{TreatInjuryMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_TreatInjuryFormula" spellcheck="false" title="Skill Total formula @{TreatInjuryFormula}" value="@{level|max}[Half Level]+@{TreatInjuryMod}[Mod]+@{TreatInjuryFeat}[Training]+@{TreatInjuryFeat|max}[Focus]+@{TreatInjuryMisc}[Misc]+@{CT}[CT]+@{total_bonus_TreatInjury}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_TreatInjuryFormula_max" spellcheck="false" title="Skill Template formula @{TreatInjuryFormula|max}" value="&{template:skill} {{name=Treat Injury}} {{skill=[[1d20 + @{TreatInjury} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{TreatInjury|max}}}" />
@@ -5278,7 +5413,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_UseComputerFormula" spellcheck="false" title="Skill Total formula @{UseComputerFormula}" value="@{level|max}[Half Level]+@{UseComputerMod}[Mod]+@{UseComputerFeat}[Training]+@{UseComputerFeat|max}[Focus]+@{UseComputerMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_UseComputerFormula" spellcheck="false" title="Skill Total formula @{UseComputerFormula}" value="@{level|max}[Half Level]+@{UseComputerMod}[Mod]+@{UseComputerFeat}[Training]+@{UseComputerFeat|max}[Focus]+@{UseComputerMisc}[Misc]+@{CT}[CT]+@{total_bonus_UseComputer}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_UseComputerFormula_max" spellcheck="false" title="Skill Template formula @{UseComputerFormula|max}" value="&{template:skill} {{name=Use Computer}} {{skill=[[1d20 + @{UseComputer} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{UseComputer|max}}}" />
@@ -5334,7 +5469,7 @@
 					<div class="sect skills-grid-formulas"> <!-- This can be hidden by the checkboxes at the beginning of the second or third row. -->
 						<span class="small bold">Skill Modifier Total Formula</span>
 						<br/>
-						<input type="text" name="attr_UsetheForceFormula" spellcheck="false" title="Skill Total formula @{UsetheForceFormula}" value="@{level|max}[Half Level]+@{UsetheForceMod}[Mod]+@{UsetheForceFeat}[Training]+@{UsetheForceFeat|max}[Focus]+@{UsetheForceMisc}[Misc]+@{CT}[CT]" />
+						<input type="text" name="attr_UsetheForceFormula" spellcheck="false" title="Skill Total formula @{UsetheForceFormula}" value="@{level|max}[Half Level]+@{UsetheForceMod}[Mod]+@{UsetheForceFeat}[Training]+@{UsetheForceFeat|max}[Focus]+@{UsetheForceMisc}[Misc]+@{CT}[CT]+@{total_bonus_UsetheForce}[Buffs]" />
 						<span class="small bold">Template Formula</span>
 						<br/>
 						<input type="text" name="attr_UsetheForceFormula_max" spellcheck="false" title="Skill Template formula @{UsetheForceFormula|max}" value="&{template:skill} {{name=Use the Force}} {{skill=[[1d20 + @{UsetheForce} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{UsetheForce|max}}}" />
@@ -7297,7 +7432,7 @@
 		<input type="text" disabled="true" name="wiki_URL" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/>
 		<button type="roll" class="wiki-url" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet">Send to chat</button>
 		<br/>
-		<b><span data-i18n="last_updated">Last updated</span>:</b> 25 January 2026
+		<b><span data-i18n="last_updated">Last updated</span>:</b> 1 February 2026
 	</div>
 </div>
 
@@ -8201,6 +8336,16 @@ const repeatingSum = (destinations, section, fields) => {
 		});
 	});
 };
+
+on("sheet:opened", function() {/*
+	getAttrs(['version_number'], function(values) {
+		if(values['version_number']==0) {
+			AddBuffsToSkills();
+			setAttrs("version_number":1)
+		}
+	});*/
+});
+
 // ====== PC /NPC Sheet ====== \\
 on("change:level", function() {
 	ArmorUpdate();
@@ -9303,6 +9448,228 @@ var EncumbranceUpdate = function() {
 		}
 	});
 };
+
+// Buff Stacking System
+// Handles complex bonus stacking rules with type checking
+// See about implementing some of this for the rest of the sheet to help with code cleanup.
+
+// Configuration: Define all skills
+const SKILLSLIST = [
+    'Acrobatics', 'Athletics', 'Climb', 'Deception', 'Endurance', 'GatherInformation',
+    'Initiative', 'Jump', 'Knowledge-Bureaucracy', 'Knowledge-GalacticLore', 'Knowledge-LifeSciences', 
+    'Knowledge-PhysicalScience', 'Knowledge-SocialScience', 'Knowledge-Tactics',
+    'Knowledge-Technology', 'Mechanics', 'Perception', 'Persuasion', 'Pilot', 'Ride',
+    'Stealth', 'Swim', 'Survival', 'TreatInjury', 'UseComputer', 'UsetheForce'
+];
+
+const DEFENSES = ['reflex', 'flatfooted', 'fort', 'will'];
+
+// Bonus types that always stack (even with themselves)
+const ALWAYS_STACK_TYPES = ['Untyped', 'Penalty', 'Circumstance', 'Dodge'];
+
+// Main calculation function
+var CalculateBonuses = function() {
+    getSectionIDs('repeating_bonuses', (idArray) => {
+        // Build array of all attributes we need to get
+        const getArr = [];
+        
+        idArray.forEach(id => {
+            getArr.push(`repeating_bonuses_${id}_bonus-applied`);
+            getArr.push(`repeating_bonuses_${id}_bonus-type`);
+            getArr.push(`repeating_bonuses_${id}_bonus-all-attacks`);
+            getArr.push(`repeating_bonuses_${id}_bonus-all-damage`);
+            getArr.push(`repeating_bonuses_${id}_bonus-all-defenses`);
+            getArr.push(`repeating_bonuses_${id}_bonus-reflex`);
+            getArr.push(`repeating_bonuses_${id}_bonus-flatfooted`);
+            getArr.push(`repeating_bonuses_${id}_bonus-fort`);
+            getArr.push(`repeating_bonuses_${id}_bonus-will`);
+            getArr.push(`repeating_bonuses_${id}_bonus-all-skills`);
+            
+            // Add all individual skill attributes
+            SKILLSLIST.forEach(skill => {
+                getArr.push(`repeating_bonuses_${id}_bonuses-${skill}`);
+            });
+        });
+        
+        getAttrs(getArr, (values) => {
+            // Data structures to hold bonuses by category and type
+            const attackBonuses = [];
+            const damageBonuses = [];
+            const defenseBonuses = {
+                reflex: [],
+                flatfooted: [],
+                fort: [],
+                will: []
+            };
+            const skillBonuses = {};
+            SKILLSLIST.forEach(skill => {
+                skillBonuses[skill] = [];
+            });
+            
+            // Process each buff entry
+            idArray.forEach(id => {
+                const applied = parseInt(values[`repeating_bonuses_${id}_bonus-applied`]) || 0;
+                
+                // Skip if buff is not applied
+                if (applied !== 1) return;
+                
+                const bonusType = values[`repeating_bonuses_${id}_bonus-type`] || 'Untyped';
+                
+                // Process Attacks
+                const attackValue = parseInt(values[`repeating_bonuses_${id}_bonus-all-attacks`]) || 0;
+                if (attackValue !== 0) {
+                    attackBonuses.push({ value: attackValue, type: bonusType });
+                }
+                
+                // Process Damage
+                const damageValue = parseInt(values[`repeating_bonuses_${id}_bonus-all-damage`]) || 0;
+                if (damageValue !== 0) {
+                    damageBonuses.push({ value: damageValue, type: bonusType });
+                }
+                
+                // Process Defenses
+                const allDefensesValue = parseInt(values[`repeating_bonuses_${id}_bonus-all-defenses`]) || 0;
+                
+                DEFENSES.forEach(defense => {
+                    const individualValue = parseInt(values[`repeating_bonuses_${id}_bonus-${defense}`]) || 0;
+                    
+                    // If all-defenses has a value, apply it to this defense
+                    if (allDefensesValue !== 0) {
+                        defenseBonuses[defense].push({ value: allDefensesValue, type: bonusType });
+                    }
+                    
+                    // If this specific defense has a value, apply it
+                    if (individualValue !== 0) {
+                        defenseBonuses[defense].push({ value: individualValue, type: bonusType });
+                    }
+                });
+                
+                // Process Skills
+                const allSkillsValue = parseInt(values[`repeating_bonuses_${id}_bonus-all-skills`]) || 0;
+                
+                SKILLSLIST.forEach(skill => {
+                    const individualValue = parseInt(values[`repeating_bonuses_${id}_bonuses-${skill}`]) || 0;
+                    
+                    // If all-skills has a value, apply it to this skill
+                    if (allSkillsValue !== 0) {
+                        skillBonuses[skill].push({ value: allSkillsValue, type: bonusType });
+                    }
+                    
+                    // If this specific skill has a value, apply it
+                    if (individualValue !== 0) {
+                        skillBonuses[skill].push({ value: individualValue, type: bonusType });
+                    }
+                });
+            });
+            
+            // Calculate totals using stacking rules
+            const totalAttack = calculateStackedBonus(attackBonuses);
+            const totalDamage = calculateStackedBonus(damageBonuses);
+            
+            const totalDefenses = {};
+            DEFENSES.forEach(defense => {
+                totalDefenses[defense] = calculateStackedBonus(defenseBonuses[defense]);
+            });
+            
+            const totalSkills = {};
+            SKILLSLIST.forEach(skill => {
+                totalSkills[skill] = calculateStackedBonus(skillBonuses[skill]);
+            });
+            
+            // Build the setAttrs object
+            const setObj = {
+                'total_bonus_attack': totalAttack,
+                'total_bonus_damage': totalDamage,
+                'total_bonus_reflex': totalDefenses.reflex,
+                'total_bonus_flatfooted': totalDefenses.flatfooted,
+                'total_bonus_fort': totalDefenses.fort,
+                'total_bonus_will': totalDefenses.will
+            };
+            
+            // Add all skill totals
+            SKILLSLIST.forEach(skill => {
+                setObj[`total_bonus_${skill}`] = totalSkills[skill];
+            });
+            
+            // Set all calculated values
+            setAttrs(setObj);
+        });
+    });
+};
+
+// Function to calculate stacked bonus given an array of {value, type} objects
+function calculateStackedBonus(bonusArray) {
+    if (bonusArray.length === 0) return 0;
+    // Separate bonuses by type
+    const bonusesByType = {};
+    
+    bonusArray.forEach(bonus => {
+        const type = bonus.type || 'Untyped';
+        if (!bonusesByType[type]) {
+            bonusesByType[type] = [];
+        }
+        bonusesByType[type].push(bonus.value);
+    });
+    
+    let total = 0;
+    
+    // For each bonus type, apply stacking rules
+    for (const type in bonusesByType) {
+        const values = bonusesByType[type];
+        
+        if (ALWAYS_STACK_TYPES.includes(type)) {
+            // These types always stack - sum all values
+            total += values.reduce((sum, val) => sum + val, 0);
+        } else {
+            // For typed bonuses, only the highest applies
+            total += Math.max(...values);
+        }
+    }
+    
+    return total;
+}
+on("change:repeating_bonuses remove:repeating_bonuses", CalculateBonuses);
+
+var AddBuffsToSkills = function() {
+    // Build array of all formula attributes we need to get
+    const getArr = SKILLSLIST.map(skill => `${skill}Formula`);
+    
+    getAttrs(getArr, (values) => {
+        const setObj = {};
+        
+        // Process each skill
+        SKILLSLIST.forEach(skillName => {
+            const formulaAttr = `${skillName}Formula`;
+            let formula = values[formulaAttr] || '';
+            
+            // Check if the buff reference is already in the formula
+            const buffReference = `@{total_bonus_${skillName}}[Buffs]`;
+            
+            if (!formula.includes(buffReference)) {
+                // Add the buff reference to the end of the formula
+                if (formula.length > 0 && !formula.endsWith('+')) {
+                    formula += '+';
+                }
+                formula += buffReference;
+                
+                // Add to our update object
+                setObj[formulaAttr] = formula;
+            }
+        });
+        
+        // Only call setAttrs if we have changes to make
+        if (Object.keys(setObj).length > 0) {
+            setAttrs(setObj);
+            console.log(`Updated ${Object.keys(setObj).length} skill formulas with buff references.`);
+        } else {
+            console.log('All skill formulas already contain buff references.');
+        }
+    });
+};
+
+// Event listener
+on("clicked:AddBuffsToSkills", AddBuffsToSkills );
+
 var VehicleSizeUpdate = function() {
 	getAttrs(["vehicle-size","vehicle-CapitalGrapple","vehicle-alternateStealth"], function(v) {
 	console.log("Size = " + v["vehicle-size"])
diff --git a/Star Wars Saga Edition/sheet.json b/Star Wars Saga Edition/sheet.json
index 640d0c2333..4b55194b67 100644
--- a/Star Wars Saga Edition/sheet.json	
+++ b/Star Wars Saga Edition/sheet.json	
@@ -4,7 +4,7 @@
 	"authors": "Alicia G (original author), Stephen C. (maintainer), Iain J (contributor)",
 	"roll20userid": "2889,436906,2196054",
 	"preview": "StarWarsSagaEditionpreview.png",
-	"instructions": "## Character Sheet \n\nInspired by the Saga Edition sheet by Mad Irishman Productions. This sheet calculates statistics using the rules as written, with options for various house rules. If you find a mistake or wish to request a feature, please contact the authors (links to profiles in the wiki). \n\n **Last Updated** 25 January, 2025\n\n View the wiki for the change log and more information on the sheet: https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet",
+	"instructions": "## Character Sheet \n\nInspired by the Saga Edition sheet by Mad Irishman Productions. This sheet calculates statistics using the rules as written, with options for various house rules. If you find a mistake or wish to request a feature, please contact the authors (links to profiles in the wiki). \n\n **Last Updated** 1 February, 2025\n\n View the wiki for the change log and more information on the sheet: https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet",
 	"useroptions": [
 		{
 			"attribute": "yellow-logo",