diff --git a/Age Of Vikings/AgeOfVikings.html b/Age Of Vikings/AgeOfVikings.html
index a43571a6dc..d4c08a2620 100644
--- a/Age Of Vikings/AgeOfVikings.html	
+++ b/Age Of Vikings/AgeOfVikings.html	
@@ -23,14 +23,15 @@
 		</div>
 -->
 		<div class="catHerding" style="width: 300px; height: 200px; margin: 0px 0px 0px 0px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true" title="Failure. Image courtesy PowerCoin - 'Ounce of Luck'" alt="">
+<!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
 		</div>
 		<label style="display: inline-block; vertical-align: top; height: 32px; width: 180px; color: rgb(69,109,91); margin: 46px 0px 0px -200px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 30px; text-align: center; border: 0px solid Black;" data-i18n="hero-sheet-u">HERO SHEET</label>
 		<div class="catHerding" style="width: 250px; height: 110px; margin: 16px 0px 0px 200px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
 		</div>
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -216px 0px 0px -350px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>		
 
 		<!-- Characteristics & Attributes -->
@@ -51,31 +52,31 @@
 
 				<label style="display: inline-block; vertical-align: top; height: 22px; width: 140px; color: rgb(83,124,151); margin: 10px 0px 2px 26px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 18px; text-align: center; border: 0px solid Red;" data-i18n="characteristics-u">CHARACTERISTICS</label>
 
-				<button class="btn sheet-skillName" style="margin-top: 4px;" type="roll" name="roll_strCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_str_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_str}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_str}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_str}*@{circumstanceMultiplier}*0.2)]]}}  {{Fumble=[[100-floor((100-@{characteristic_str}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="strRoll-c">
+				<button class="btn sheet-skillName" style="margin-top: 4px;" type="roll" name="roll_strCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_str_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_str}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_str}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_str}*@{circumstanceMultiplier}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{characteristic_str}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="strRoll-c">
 					<label class="sheet-charName" data-i18n="str-u">STR</label></button>
 				<input class="sheet-characteristic" style="margin: 4px 0px 0px 8px" name="attr_characteristic_str" type="text" value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" name="roll_conCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_con_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_con}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_con}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_con}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-floor((100-@{characteristic_con}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="conRoll-c">
+				<button class="btn sheet-skillName" type="roll" name="roll_conCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_con_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_con}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_con}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_con}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-ceil((100-@{characteristic_con}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="conRoll-c">
 					<label class="sheet-charName" data-i18n="con-u">CON</label></button>
 				<input class="sheet-characteristic" name="attr_characteristic_con" type="text" value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" name="roll_sizCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_siz_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_siz}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_siz}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_siz}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-floor((100-@{characteristic_siz}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="sizRoll-c">
+				<button class="btn sheet-skillName" type="roll" name="roll_sizCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_siz_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_siz}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_siz}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_siz}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-ceil((100-@{characteristic_siz}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="sizRoll-c">
 					<label class="sheet-charName" data-i18n="siz-u">SIZ</label></button>
 				<input class="sheet-characteristic" name="attr_characteristic_siz" type="text" value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" name="roll_dexCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_dex_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_dex}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_dex}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_dex}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-floor((100-@{characteristic_dex}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="dexRoll-c">
+				<button class="btn sheet-skillName" type="roll" name="roll_dexCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_dex_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_dex}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_dex}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_dex}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-ceil((100-@{characteristic_dex}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="dexRoll-c">
 					<label class="sheet-charName" data-i18n="dex-u">DEX</label></button>
 				<input class="sheet-characteristic" name="attr_characteristic_dex" type="text" value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" name="roll_intCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_int_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_int}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_int}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_int}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-floor((100-@{characteristic_int}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="intRoll-c">
+				<button class="btn sheet-skillName" type="roll" name="roll_intCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_int_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_int}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_int}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_int}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-ceil((100-@{characteristic_int}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="intRoll-c">
 					<label class="sheet-charName" data-i18n="int-u">INT</label></button>
 				<input class="sheet-characteristic" name="attr_characteristic_int" type="text" value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" name="roll_powCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_pow_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_pow}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_pow}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_pow}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-floor((100-@{characteristic_pow}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="powRoll-c">
+				<button class="btn sheet-skillName" type="roll" name="roll_powCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_pow_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_pow}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_pow}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_pow}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-ceil((100-@{characteristic_pow}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="powRoll-c">
 					<label class="sheet-charName" data-i18n="pow-u">POW</label></button>
 				<input class="sheet-characteristic" name="attr_characteristic_pow" type="text" value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" name="roll_chaCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_cha_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_cha}*@{circumstanceMultiplier})]]}} {{Crit=[[floor(@{characteristic_cha}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[floor(@{characteristic_cha}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-floor((100-@{characteristic_cha}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="chaRoll-c">
+				<button class="btn sheet-skillName" type="roll" name="roll_chaCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{characteristic_cha_name}}} {{Check=[[1]]}} {{DL=[[floor(@{characteristic_cha}*@{circumstanceMultiplier})]]}} {{Crit=[[ceil(@{characteristic_cha}*@{circumstanceMultiplier}*0.05)]]}} {{Special=[[ceil(@{characteristic_cha}*@{circumstanceMultiplier}*0.2)]]}} {{Fumble=[[100-ceil((100-@{characteristic_cha}*@{circumstanceMultiplier})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplier}x}}" data-i18n-title="chaRoll-c">
 					<label class="sheet-charName" data-i18n="cha-u">CHA</label></button>
 				<input class="sheet-characteristic" name="attr_characteristic_cha" type="text" value=' ' />
 
@@ -133,10 +134,58 @@
 				<input class="sheet-personal" style="width: 260px;" name='attr_character_name_meaning' type="text"  value=' ' />
 
 				<label style="display: inline-block; vertical-align: top; height: 22px; width: 92px; color: Black; margin:  0px 0px 2px 4px; font-family: 'Noto Serif'; font-size: 16px; font-weight: lighter; text-align: center; padding: 2px 0px 0px 2px; border: 1px dashed transparent;" data-i18n="spirit-animal-c">Spirit Animal</label>
-				<input class="sheet-personal" style="width: 276px;" name='attr_character_spirit_animal' type="text"  value=' ' />
+<!--
+character_spirit_animal
+	"mightyDef":"Mighty: Your hero attempts to solve problems first by means of physical force and brawn",
+	"bear-c":"Bear",
+	"bull-c":"Bull",
+	"eagle-c":"Eagle",
+	"steadfastDef":"Steadfast: Your hero believes that technique, craft, and expertise are the secrets of success",
+	"beaver-c":"Beaver",
+	"gyrFalcon-c":"Gyr Falcon",
+	"seal-c":"Seal",
+	"spiritualDef":"Spiritual: Your hero is attuned to the world of spirits, magic, and nature",
+	"cat-c":"Cat",
+	"goldenPlover":"Golden Plover",
+	"raven-c":"Raven",
+	"wandererDef":"Wanderer: Your hero has a drive to know every corner of Iceland and of the world beyond",
+	"goose-c":"Goose",
+	"horse-c":"Horse",
+	"wolf-c":"Wolf",
+	"cunningDef":"Cunning: Your hero first tries to outsmart an opponent to gain an advantage",
+	"owl-c":"Owl",
+	"snowFox-c":"Snow Fox",
+	"weasel-c":"Weasel",
+	"manipulativeDef":"Manipulative: Your hero enjoys making decisions while persuading other people to carry out their work",
+	"arcticTern-c":"Arctic Tern",
+	"dog-c":"Dog",
+	"mouse-c":"Mouse",
+-->
+				<select class="sheet-personal" style="width: 276px; text-align: center; margin-top: -8px;" name='attr_character_spirit_animal'>
+					<option value="" selected></option>
+					<option value="Bear" data-i18n="bear-c" data-i18n-title="mightyDef">Bear</option>
+					<option value="Bull" data-i18n="bull-c" data-i18n-title="mightyDef">Bull</option>
+					<option value="Eagle" data-i18n="eagle-c" data-i18n-title="mightyDef">Eagle</option>
+					<option value="Beaver" data-i18n="beaver-c" data-i18n-title="steadfastDef">Beaver</option>
+					<option value="Gyr Falcon" data-i18n="gyrFalcon-c" data-i18n-title="steadfastDef">Gyr Falcon</option>
+					<option value="Seal" data-i18n="seal-c" data-i18n-title="steadfastDef">Seal</option>
+					<option value="Cat" data-i18n="cat-c" data-i18n-title="spiritualDef">Cat</option>
+					<option value="Golden Plover" data-i18n="goldenPlover-c" data-i18n-title="spiritualDef">Golden Plover</option>
+					<option value="Raven" data-i18n="raven-c" data-i18n-title="spiritualDef">Raven</option>
+					<option value="Goose" data-i18n="goose-c" data-i18n-title="wandererDef">Goose</option>
+					<option value="Horse" data-i18n="horse-c" data-i18n-title="wandererDef">Horse</option>
+					<option value="Wolf" data-i18n="wolf-c" data-i18n-title="wandererDef">Wolf</option>
+					<option value="Owl" data-i18n="owl-c" data-i18n-title="cunningDef">Owl</option>
+					<option value="Snow Fox" data-i18n="snowFox-c" data-i18n-title="cunningDef">Snow Fox</option>
+					<option value="Weasel" data-i18n="weasel-c" data-i18n-title="cunningDef">Weasel</option>
+					<option value="Arctic Tern" data-i18n="arcticTern-c" data-i18n-title="manipulativeDef">Arctic Tern</option>
+					<option value="Dog" data-i18n="dog-c" data-i18n-title="manipulativeDef">Dog</option>
+					<option value="Mouse" data-i18n="mouse-c" data-i18n-title="manipulativeDef">Mouse</option>
+				</select>
+				<!-- <input class="sheet-personal" style="width: 276px;" name='attr_character_spirit_animal' type="text"  value=' ' /> -->
 
 				<label style="display: inline-block; vertical-align: top; height: 22px; width: 108px; color: Black; margin:  0px 0px 2px 4px; font-family: 'Noto Serif'; font-size: 16px; font-weight: lighter; text-align: center; padding: 2px 4px 0px 4px; border: 1px dashed transparent;" data-i18n="personality-type-c">Personality Type</label>
-				<input class="sheet-personal" style="width: 254px;" name='attr_character_personality_type' type="text"  value=' ' />
+				<input class="sheet-personal" style="width: 254px; text-align: center;" name='attr_character_personality_type' type="text"  value=' ' />
 
 				<label style="display: inline-block; vertical-align: top; height: 22px; width: 46px; color: Black; margin:  0px 0px 2px 4px; font-family: 'Noto Serif'; font-size: 16px; font-weight: lighter; text-align: center; padding: 2px 0px 0px 4px; border: 1px dashed transparent;" data-i18n="gender-c">Gender</label>
 				<input class="sheet-personal" style="width: 98px; text-align: center;" name='attr_character_gender' type="text" value=' ' />
@@ -159,7 +208,7 @@
 		
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -322px 0px 0px 400px; border: 0px solid Red;" >
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true"> -->
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>
 
 		<!-- Passions, Devotions and Magic Points -->
@@ -171,21 +220,21 @@
 				<input name="attr_passion_love_family_name" style="display: none;" type="text" value="love">
 				<input name="attr_passion_loyalty_goði_name" style="display: none;" type="text" value="loyalty">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 6px 0px 0px 6px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_honorCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_honor_name}}} {{Check=[[1]]}} {{DL=[[@{passion_honor}]]}} {{Crit=[[floor(@{passion_honor}*0.05)]]}} {{Special=[[floor(@{passion_honor}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_honor})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="honorRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 6px 0px 0px 6px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_honorCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_honor_name}}} {{Check=[[1]]}} {{DL=[[@{passion_honor}]]}} {{Crit=[[ceil(@{passion_honor}*0.05)]]}} {{Special=[[ceil(@{passion_honor}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_honor})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="honorRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<label class="sheet-skillName" style="width: 144px; height: 20px; font-size: 14px; font-variant: normal; padding: 14px 0px 0px 2px;" data-i18n="honor-c">Honor</label>
 				<input class="sheet-characteristic" type="text" style="width: 46px; height: 21px; margin: 12px 0px 0px 0px;" name='attr_passion_honor' value='60' />
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 8px 2px 0px 0px; padding: 8px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: 6px 0px 0px 0px;" name="attr_passion_honor_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_loveFamilyCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_love_family_name}}} {{Check=[[1]]}} {{DL=[[@{passion_love_family}]]}} {{Crit=[[floor(@{passion_love_family}*0.05)]]}} {{Special=[[floor(@{passion_love_family}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_love_family})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="love(family)Roll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_loveFamilyCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_love_family_name}}} {{Check=[[1]]}} {{DL=[[@{passion_love_family}]]}} {{Crit=[[ceil(@{passion_love_family}*0.05)]]}} {{Special=[[ceil(@{passion_love_family}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_love_family})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="love(family)Roll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<label class="sheet-skillName" style="width: 144px; height: 20px; font-size: 14px; font-variant: normal; padding: 6px 0px 0px 2px;" data-i18n="love-family-c">Love(family)</label>
 				<input class="sheet-characteristic" type="text" style="width: 46px; height: 21px; margin: 0px 0px 0px 0px;" name='attr_passion_love_family' value='60' />
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 2px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: 0px 0px 0px 0px;" name="attr_passion_love_family_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: -2px 0px 0px 6px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_loyaltyGodiCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_loyalty_goði_name}}} {{Check=[[1]]}} {{DL=[[@{passion_loyalty_goði}]]}} {{Crit=[[floor(@{passion_loyalty_goði}*0.05)]]}} {{Special=[[floor(@{passion_loyalty_goði}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_loyalty_goði})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="loyalty(Godi)Roll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: -2px 0px 0px 6px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_loyaltyGodiCheck" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_loyalty_goði_name}}} {{Check=[[1]]}} {{DL=[[@{passion_loyalty_goði}]]}} {{Crit=[[ceil(@{passion_loyalty_goði}*0.05)]]}} {{Special=[[ceil(@{passion_loyalty_goði}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_loyalty_goði})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="loyalty(Godi)Roll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<div style="display: inline-block; vertical-align: top; width: 146px; height: 20px; font-size: 14px; ">
 					<label style="display: inline-block; vertical-align: top; width: 46px; height: 14px; font-size: 14px; font-weight: 500; padding: 4px 0px 0px 4px; border: 0px solid Red;" data-i18n="loyalty-c">Loyalty</label>
@@ -197,7 +246,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 2px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: -2px 0px 0px 0px;" name="attr_passion_loyalty_goði_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion1Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_1_type}(@{passion_1_name})}} {{Check=[[1]]}} {{DL=[[@{passion_1}]]}} {{Crit=[[floor(@{passion_1}*0.05)]]}} {{Special=[[floor(@{passion_1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_1})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion1Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_1_type}(@{passion_1_name})}} {{Check=[[1]]}} {{DL=[[@{passion_1}]]}} {{Crit=[[ceil(@{passion_1}*0.05)]]}} {{Special=[[ceil(@{passion_1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_1})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_1_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 16px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -207,7 +256,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 0px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: 0px 0px 0px 0px;" name="attr_passion_1_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion2Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_2_type}(@{passion_2_name})}} {{Check=[[1]]}} {{DL=[[@{passion_2}]]}} {{Crit=[[floor(@{passion_2}*0.05)]]}} {{Special=[[floor(@{passion_2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_2})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion2Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_2_type}(@{passion_2_name})}} {{Check=[[1]]}} {{DL=[[@{passion_2}]]}} {{Crit=[[ceil(@{passion_2}*0.05)]]}} {{Special=[[ceil(@{passion_2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_2})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_2_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 18px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -217,7 +266,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 2px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: 0px 0px 0px 0px;" name="attr_passion_2_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion3Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_3_type}(@{passion_3_name})}} {{Check=[[1]]}} {{DL=[[@{passion_3}]]}} {{Crit=[[floor(@{passion_3}*0.05)]]}} {{Special=[[floor(@{passion_3}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_3})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion3Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_3_type}(@{passion_3_name})}} {{Check=[[1]]}} {{DL=[[@{passion_3}]]}} {{Crit=[[ceil(@{passion_3}*0.05)]]}} {{Special=[[ceil(@{passion_3}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_3})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_3_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 16px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -227,7 +276,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 0px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: -4px 0px 0px 0px;" name="attr_passion_3_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion4Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_4_type}(@{passion_4_name})}} {{Check=[[1]]}} {{DL=[[@{passion_4}]]}} {{Crit=[[floor(@{passion_4}*0.05)]]}} {{Special=[[floor(@{passion_4}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_4})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion4Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_4_type}(@{passion_4_name})}} {{Check=[[1]]}} {{DL=[[@{passion_4}]]}} {{Crit=[[ceil(@{passion_4}*0.05)]]}} {{Special=[[ceil(@{passion_4}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_4})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_4_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 18px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -237,7 +286,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 2px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: -4px 0px 0px 0px;" name="attr_passion_4_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion5Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_5_type}(@{passion_5_name})}} {{Check=[[1]]}} {{DL=[[@{passion_5}]]}} {{Crit=[[floor(@{passion_5}*0.05)]]}} {{Special=[[floor(@{passion_5}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_5})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion5Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_5_type}(@{passion_5_name})}} {{Check=[[1]]}} {{DL=[[@{passion_5}]]}} {{Crit=[[ceil(@{passion_5}*0.05)]]}} {{Special=[[ceil(@{passion_5}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_5})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_5_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 18px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -247,7 +296,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 2px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: -4px 0px 0px 0px;" name="attr_passion_5_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion6Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_6_type}(@{passion_6_name})}} {{Check=[[1]]}} {{DL=[[@{passion_6}]]}} {{Crit=[[floor(@{passion_6}*0.05)]]}} {{Special=[[floor(@{passion_6}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_6})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion6Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_6_type}(@{passion_6_name})}} {{Check=[[1]]}} {{DL=[[@{passion_6}]]}} {{Crit=[[ceil(@{passion_6}*0.05)]]}} {{Special=[[ceil(@{passion_6}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_6})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_6_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 16px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -257,7 +306,7 @@
 				<label style="display: inline-block; vertical-align: top; width: 8px; height: 14px; font-size: 12px; font-weight: 500; margin: 2px 2px 0px 0px; padding: 0px 0px 0px 0px;">%</label>
 				<input class="advancement" style="margin: 0px 0px 0px 0px;" name="attr_passion_6_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion10Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_7_type}(@{passion_7_name})}} {{Check=[[1]]}} {{DL=[[@{passion_7}]]}} {{Crit=[[floor(@{passion_7}*0.05)]]}} {{Special=[[floor(@{passion_7}*0.2)]]}}  {{Fumble=[[100-floor((100-@{passion_7})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 6px; width: 14px; padding: 0px 0px 0px 4px; border: 0px solid Blue;" name="roll_passion10Check" value="&{template:check} {{name=@{character_name} *@{characteristic_action}* @{passion_7_type}(@{passion_7_name})}} {{Check=[[1]]}} {{DL=[[@{passion_7}]]}} {{Crit=[[ceil(@{passion_7}*0.05)]]}} {{Special=[[ceil(@{passion_7}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{passion_7})*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="passionRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 60px; height: 19px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 2px 0px 0px 0px; border: 0; border-radius: 0px; border-bottom: 2px solid DimGray;" name='attr_passion_7_type' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 14px; font-size: 18px; font-weight: 500; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">(</label>
@@ -317,122 +366,183 @@
 			<div style="display: inline-block; vertical-align: top; height: 710px; width: 530px; border: 1px solid transparent;">
 				<label style="display: inline-block; vertical-align: top; height: 20px; width: 514px; color: rgb(83,124,151); margin: 16px 0px 2px 0px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 20px; text-align: center; border: 0px solid Red;" data-i18n="combat-u">COMBAT</label>
 			<!-- Melee Weapons -->
-				<label style="display: inline-block; vertical-align: top; height: 18px; width: 150px; color: Black; margin: 12px 0px 2px 4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 0px solid Red;" data-i18n="meleeWeapons-c">Melee Weapons</label>
-				<label style="display: inline-block; vertical-align: top; height: 18px; width:  54px; color: Black; margin: 12px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 1px; text-align: center; border: 1px solid transparent;">%</label>
-				<label style="display: inline-block; vertical-align: top; height: 18px; width: 120px; color: Black; margin: 12px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 6px; text-align: center; border: 1px solid transparent;" data-i18n="dmg-u">DMG</label>
-				<label style="display: inline-block; vertical-align: top; height: 18px; width:  54px; color: Black; margin: 12px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
-				<label style="display: inline-block; vertical-align: top; height: 18px; width: 106px; color: Black; margin: 12px 6px 2px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="hp-u">HP</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width: 146px; color: Black; margin: 12px 0px 2px 4px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 0px solid transparent;" data-i18n="meleeWeapons-c">Melee Weapons</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  40px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 1px; text-align: center; border: 1px solid transparent;">%</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  80px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 6px; text-align: center; border: 1px solid transparent;" data-i18n="dmg-u">DMG</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  80px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n-title="typeDef" data-i18n="type-u">TYPE</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  44px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  90px; color: Black; margin: 12px 0px 2px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="hp-u">HP</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon1Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_1_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_1}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_1_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_melee_1}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_melee_1}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_melee_1}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="act_weapon1Check" data-i18n-title="weaponRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
-				<input class="sheet-characteristic" type="text" style="width: 140px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 130px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  54px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_enc' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_hp_max' value=' ' />
-				<label style="display: inline-block; vertical-align: top; width: 6px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center;">/</label>
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_hp_current' value=' ' />
+<!--				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon1Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_1_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_1}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_1_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[ceil((@{weapon_melee_1}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{weapon_melee_1}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{weapon_melee_1}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+					<span style="font-family:dicefontd20;">t</span></button>
+-->
+				<input class="sheet-characteristic" type="text" style="width: 132px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_name' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  40px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  90px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 80px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 2px 4px 2px;" name="attr_weapon_melee_1_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>
+				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_hp_max' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 5px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_1_hp_current' value=' ' />
 				<input class="advancement" style="margin: 2px 0px 0px 0px;" name="attr_weapon_melee_1_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon2Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_2_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_2}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_2_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_melee_2}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_melee_2}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_melee_2}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+<!--				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon2Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_2_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_2}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_2_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[ceil((@{weapon_melee_2}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{weapon_melee_2}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{weapon_melee_2}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c"> -->
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="act_weapon2Check" data-i18n-title="weaponRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
-				<input class="sheet-characteristic" type="text" style="width: 140px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 130px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  54px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_enc' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_hp_max' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width: 132px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_name' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  40px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  90px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 80px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 2px 4px 2px;" name="attr_weapon_melee_2_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>
+				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 6px; height: 19px; color: Black; margin: 2px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_hp_current' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_2_hp_current' value=' ' />
 				<input class="advancement" style="margin: 4px 0px 0px 0px;" name="attr_weapon_melee_2_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon3Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_3_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_3}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_3_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_melee_3}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_melee_3}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_melee_3}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="act_weapon3Check" data-i18n-title="weaponRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
-				<input class="sheet-characteristic" type="text" style="width: 140px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 130px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  54px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_enc' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_hp_max' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width: 132px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_name' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  40px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  90px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 80px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 2px 4px 2px;" name="attr_weapon_melee_3_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>
+				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 6px; height: 19px; color: Black; margin: 2px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_hp_current' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 2px 0px 0px 0px;" name='attr_weapon_melee_3_hp_current' value=' ' />
 				<input class="advancement" style="margin: 4px 0px 0px 0px;" name="attr_weapon_melee_3_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon4Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_4_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_4}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_4_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_melee_4}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_melee_4}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_melee_4}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="act_weapon4Check" data-i18n-title="weaponRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
-				<input class="sheet-characteristic" type="text" style="width: 140px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 130px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  54px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_enc' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_hp_max' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width: 132px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_name' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  40px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  90px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 80px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 2px 4px 2px;" name="attr_weapon_melee_4_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>
+				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 6px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_hp_current' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_4_hp_current' value=' ' />
 				<input class="advancement" style="margin: 2px 0px 0px 0px;" name="attr_weapon_melee_4_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="roll_weapon5Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_5_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_5}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_5_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_melee_5}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_melee_5}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_melee_5}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px;" name="act_weapon5Check" data-i18n-title="weaponRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
-				<input class="sheet-characteristic" type="text" style="width: 140px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 130px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  54px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_enc' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_hp_max' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width: 132px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_name' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  40px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  90px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 80px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 2px 4px 2px;" name="attr_weapon_melee_5_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>
+				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 6px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_hp_current' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_melee_5_hp_current' value=' ' />
 				<input class="advancement" style="margin: 2px 0px 0px 0px;" name="attr_weapon_melee_5_check" type="checkbox" value="1">
 
 			<!-- Shield -->
-				<label style="display: inline-block; vertical-align: top; height: 20px; width: 150px; color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 0px solid transparent;" data-i18n="shield-c">Shield</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width: 146px; color: Black; margin: 12px 0px 2px 4px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 0px solid transparent;" data-i18n="shield-c">Shield</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  40px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 1px; text-align: center; border: 1px solid transparent;">%</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  80px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 6px; text-align: center; border: 1px solid transparent;" data-i18n="dmg-u">DMG</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  80px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n-title="typeDef" data-i18n="type-u">TYPE</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  44px; color: Black; margin: 12px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
+				<label style="display: inline-block; vertical-align: top; height: 18px; width:  90px; color: Black; margin: 12px 0px 2px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="hp-u">HP</label>
+<!--				<label style="display: inline-block; vertical-align: top; height: 20px; width: 150px; color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 0px solid transparent;" data-i18n="shield-c">Shield</label>
 				<label style="display: inline-block; vertical-align: top; height: 20px; width:  54px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 1px; text-align: center; border: 1px solid transparent;">%</label>
 				<label style="display: inline-block; vertical-align: top; height: 20px; width: 120px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 6px; text-align: center; border: 1px solid transparent;" data-i18n="dmg-u">DMG</label>
 				<label style="display: inline-block; vertical-align: top; height: 20px; width:  54px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
 				<label style="display: inline-block; vertical-align: top; height: 20px; width: 106px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="hp-u">HP</label>
-
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_shield1Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{shield_name}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{shield_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="shieldRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="act_shieldCheck" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{shield_name}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{shield_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[ceil((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="shieldRoll-c">
+-->
+				<button class="btn sheet-skillName" type="action" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="act_shieldCheck" data-i18n-title="shieldRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
-				<input class="sheet-characteristic" type="text" style="width: 140px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_skill_melee_weapon_shield' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 130px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  54px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_enc' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_hp_max' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width: 132px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_name' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  40px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_skill_melee_weapon_shield' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  90px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 80px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 2px 4px 2px;" name="attr_weapon_shield_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>
+				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 6px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_hp_current' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  38px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_shield_hp_current' value=' ' />
 				<input class="advancement" style="margin: 4px 0px 0px 0px;" name="attr_skill_melee_weapon_shield_check" type="checkbox" value="1">
 
 			<!-- Missile Weapons -->
-				<label style="display: inline-block; vertical-align: top; height: 20px; width: 112px; color: Black; margin: -2px 0px 2px 4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 1px solid transparent;" data-i18n="missileWeapons-c">Missile Weapons</label>
-				<label style="display: inline-block; vertical-align: top; height: 20px; width:  48px; color: Black; margin: -2px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;">%</label>
-				<label style="display: inline-block; vertical-align: top; height: 20px; width: 104px; color: Black; margin: -2px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 6px; text-align: center; border: 1px solid transparent;" data-i18n="dmg-u">DMG</label>
-				<label style="display: inline-block; vertical-align: top; height: 20px; width:  44px; color: Black; margin: -2px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
-				<label style="display: inline-block; vertical-align: top; height: 20px; width:  60px; color: Black; margin: -2px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="hp-u">HP</label>
-				<label style="display: inline-block; vertical-align: top; height: 20px; width:  46px; color: Black; margin: -2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="range-u">RANGE</label>
-				<label style="display: inline-block; vertical-align: top; height: 20px; width:  60px; color: Black; margin: -2px 0px 2px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 12px; text-align: left;   border: 1px solid transparent;" data-i18n="rate-u">RATE</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width: 112px; color: Black; margin: 2px 0px 2px 4px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; font-variant: small-caps; border: 1px solid transparent;" data-i18n="missileWeapons-c">Missile Weapons</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  40px; color: Black; margin: 2px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;">%</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  70px; color: Black; margin: 2px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="dmg-u">DMG</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  70px; color: Black; margin: 2px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="type-u">TYPE</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  32px; color: Black; margin: 2px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  60px; color: Black; margin: 2px 0px 2px 0px;  font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 1px solid transparent;" data-i18n="hp-u">HP</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  56px; color: Black; margin: 2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left;   border: 1px solid transparent;" data-i18n-title="range-c" data-i18n="range-u">RANGE</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width:  40px; color: Black; margin: 2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left;   border: 1px solid transparent;" data-i18n="rate-u">RATE</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 2px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_missle1Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_missile_1_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_missile_1}+@{skill_missile_weapon_category_modifier}]]}} {{Damage=[[@{weapon_missile_1_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_missile_1}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_missile_1}+@{skill_missile_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_missile_1}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="missileRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 2px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="act_missile1Check" data-i18n-title="missileRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:  98px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 110px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  46px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  42px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  72px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 70px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 0px 4px 0px;" name="attr_weapon_missile_1_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>				
+				<input class="sheet-characteristic" type="text" style="width:  36px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_enc' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px -2px;" name='attr_weapon_missile_1_hp_current' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_range' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  58px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_rate' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  48px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_range' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  42px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_1_rate' value=' ' />
 				<input class="advancement" style="margin: 2px 0px 0px 0px;" name="attr_weapon_missile_1_check" type="checkbox" value="1">
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 2px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_missle2Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_missile_2_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_missile_2}+@{skill_missile_weapon_category_modifier}]]}} {{Damage=[[@{weapon_missile_2_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[floor((@{weapon_missile_2}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{weapon_missile_2}+@{skill_missile_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{weapon_missile_2}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="missileRoll-c">
+				<button class="btn sheet-skillName" type="action" style="margin: 2px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="act_missile2Check" data-i18n-title="missileRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:  98px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_name' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  50px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width: 110px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_damage' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  46px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_enc' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  42px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  72px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_damage' value=' ' />
+				<select style="display: inline-block; vertical-align: top; width: 70px; height: 22px; margin: -1px 0px 0px 0px; padding: 2px 0px 4px 0px;" name="attr_weapon_missile_2_damage_type">
+					<option value="none" selected > </option>
+					<option value="impaling" data-i18n="impaling-c">Impaling</option>
+					<option value="slashing" data-i18n="slashing-c">Slashing</option>
+					<option value="crushing" data-i18n="crushing-c">Crushing</option>
+				</select>				
+				<input class="sheet-characteristic" type="text" style="width:  36px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_enc' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_hp_max' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 19px; color: Black; margin: 0px 0px 2px 0px; font-family: Arial; font-stretch: ultra-condensed; font-size: 18px; padding: 2px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px -2px;" name='attr_weapon_missile_2_hp_current' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  44px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_range' value=' ' />
-				<input class="sheet-characteristic" type="text" style="width:  58px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_rate' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  48px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_range' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  42px; height: 19px; margin: 0px 0px 0px 0px;" name='attr_weapon_missile_2_rate' value=' ' />
 				<input class="advancement" style="margin: 2px 0px 0px 0px;" name="attr_weapon_missile_2_check" type="checkbox" value="1">
 
 			<!-- Hit Locations and Points -->
-				<label style="display: inline-block; vertical-align: top; height: 20px; width: 514px; color: rgb(83,124,151); margin: 16px 0px 2px 0px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 20px; text-align: center; border: 0px solid Red;" data-i18n="hit-locations-u">HIT LOCATIONS</label>
+				<label style="display: inline-block; vertical-align: top; height: 20px; width: 514px; color: rgb(83,124,151); margin: 14px 0px 0px 0px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 20px; text-align: center; border: 0px solid Red;" data-i18n="hit-locations-u">HIT LOCATIONS</label>
 
 				<div style="display: inline-block; vertical-align: top; height: 230px; width: 140px; border: 2px solid rgb(129,71,57); margin: 56px 0px 0px 12px;">
 					<label style="display: inline-block; vertical-align: top; height: 18px; width: 140px; color: Black; margin: 14px 0px 2px 2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 20px; font-variant: small-caps; padding: 4px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="hitPoints-c">Hit Points</label>
@@ -445,7 +555,7 @@
 				</div>
 				
 				<div class="catHerding" style="width: 180px; height: 340px; margin: -10px 0px 0px 110px; opacity: 0.4; border: 0px solid Red;" >
-					<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-hit-location-figure.svg?raw=true">
+					<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-hit-location-figure.svg?raw=true">
 <!--				<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-hit-location-figure.svg?raw=true"> -->
 				</div>
 				
@@ -571,7 +681,7 @@
 			</div>
 		
 		<div class="catHerding" style="width: 300px; height: 200px; margin: -200px 0px 0px 530px; transform: scale(-1, -1);" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
 		</div>
 
@@ -586,7 +696,7 @@
 		<!-- Skills -->
 		<div style="display: inline-block; vertical-align: top; height: 1860px; width: 530px; border: 0px solid Pink;">
 			<div class="catHerding" style="z-index: -1; width: 300px; height: 200px; margin: -2px 0px 0px 530px; transform: scale(-1, 1);" >
-				<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+				<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 <!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
 			</div>
 
@@ -594,6 +704,14 @@
 				<label style="display: inline-block; vertical-align: top; height: 20px; width: 514px; color: rgb(83,124,151); margin: 0px 0px 0px 0px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 20px; text-align: center; border: 0px solid Red;" data-i18n="skills-u">SKILLS</label>
 		
 				<div class="sheet-skillsWrapper" style="border: 0px solid Red;">
+					<input type="hidden"  name="attr_character_spirit_animal_agility"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_communication"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_knowledge"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_manipulation"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_mythic"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_perception"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_stealth"  value="0" />
+					<input type="hidden"  name="attr_character_spirit_animal_flag"  value="0" />
 
 					<!-- Setup for getTranslationByKey([key]) -->
 					<span style="display: none" data-i18n="boat-c">Boat</span>
@@ -774,43 +892,43 @@
 						<label class="sheet-text_input sheet-skillName" style="margin: 6px 0px 0px 30px; font-weight: 800;" data-i18n="agility-u">AGILITY</label>
 						<input name="attr_skill_agility_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{boatSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_boat}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_boat}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{boatSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_boat}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_boat}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="boat-c">Boat</label>
 							<input name="attr_skill_agility_boat" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_agility_boat_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{climbSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_climb}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_climb}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_climb}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_climb}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{climbSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_climb}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_climb}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_climb}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_climb}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="climb-c">Climb</label>
 							<input name="attr_skill_agility_climb" class="sheet-text_input sheet-skill_values" type="text" value="40">
 							<input name="attr_skill_agility_climb_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{dodgeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_dodge}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_dodge}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_dodge}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_dodge}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{dodgeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_dodge}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_dodge}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_dodge}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_dodge}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="dodge-c">Dodge</label>
 							<input name="attr_skill_agility_dodge" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_agility_dodge_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{jumpSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_jump}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_jump}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_jump}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_jump}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{jumpSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_jump}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_jump}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_jump}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_jump}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="jump-c">Jump</label>
 							<input name="attr_skill_agility_jump" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_agility_jump_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{rideSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_ride}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_ride}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_ride}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_ride}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{rideSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_ride}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_ride}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_ride}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_ride}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="ride-c">Ride</label>
 							<input name="attr_skill_agility_ride" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_agility_ride_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skiSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_ski}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_ski}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_ski}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_ski}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skiSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_ski}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_ski}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_ski}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_ski}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="ski-c">Ski</label>
 							<input name="attr_skill_agility_ski" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_agility_ski_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{swimSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_swim}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_swim}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_swim}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_swim}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{swimSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_swim}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_swim}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_swim}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_swim}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="swim-c">Swim</label>
 							<input name="attr_skill_agility_swim" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_agility_swim_check" class="advancement" type="checkbox" value="1">
@@ -818,7 +936,7 @@
 
 						<fieldset class="repeating_agility">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -829,79 +947,79 @@
 						<input name="attr_skill_communication_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{actSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_act}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_act}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_act}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_act}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{actSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_act}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_act}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_act}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_act}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="act-c">Act</label>
 							<input name="attr_skill_communication_act" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_communication_act_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{artSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_art}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_art}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_art}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_art}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{artSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_art}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_art}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_art}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_art}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="art-c">Art</label>
 							<input name="attr_skill_communication_art" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_communication_art_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{bargainSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_bargain}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_bargain}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_bargain}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_bargain}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{bargainSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_bargain}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_bargain}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_bargain}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_bargain}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="bargain-c">Bargain</label>
 							<input name="attr_skill_communication_bargain" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_communication_bargain_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{charmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_charm}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_charm}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_charm}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_charm}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{charmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_charm}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_charm}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_charm}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_charm}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="charm-c">Charm</label>
 							<input name="attr_skill_communication_charm" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_communication_charm_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{danceSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_dance}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_dance}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_dance}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_dance}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{danceSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_dance}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_dance}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_dance}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_dance}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="dance-c">Dance</label>
 							<input name="attr_skill_communication_dance" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_communication_dance_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{disguiseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_disguise}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_disguise}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_disguise}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_disguise}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{disguiseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_disguise}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_disguise}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_disguise}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_disguise}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="disguise-c">Disguise</label>
 							<input name="attr_skill_communication_disguise" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_communication_disguise_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{fastTalkSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_fast_talk}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_fast_talk}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_fast_talk}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_fast_talk}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{fastTalkSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_fast_talk}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_fast_talk}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_fast_talk}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_fast_talk}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="fastTalk-c">Fast Talk</label>
 							<input name="attr_skill_communication_fast_talk" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_communication_fast_talk_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{intimidateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_intimidate}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_intimidate}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_intimidate}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_intimidate}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{intimidateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_intimidate}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_intimidate}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_intimidate}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_intimidate}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="intimidate-c">Intimidate</label>
 							<input name="attr_skill_communication_intimidate" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_communication_intimidate_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{intrigueSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_intrigue}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_intrigue}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_intrigue}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_intrigue}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{intrigueSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_intrigue}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_intrigue}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_intrigue}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_intrigue}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="intrigue-c">Intrigue</label>
 							<input name="attr_skill_communication_intrigue" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_communication_intrigue_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{orateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_orate}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_orate}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_orate}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_orate}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{orateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_orate}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_orate}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_orate}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_orate}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="orate-c">Orate</label>
 							<input name="attr_skill_communication_orate" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_communication_orate_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{singSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_sing}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_sing}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_sing}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_sing}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{singSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_sing}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_sing}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_sing}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_sing}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="sing-c">Sing</label>
 							<input name="attr_skill_communication_sing" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_communication_sing_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skaldicPoetrySkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skaldicPoetrySkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_skaldic_poetry}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="skaldicPoetry-c">Skaldic Poetry</label>
 							<input name="attr_skill_communication_skaldic_poetry" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_communication_skaldic_poetry_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{speakOwnLanguageSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_speak_own_language}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skill_communication_speak_own_language}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_communication_speak_own_language}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_communication_speak_own_language}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{speakOwnLanguageSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_communication_speak_own_language}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skill_communication_speak_own_language}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_communication_speak_own_language}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_communication_speak_own_language}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="speakOwnLanguage-c">Speak Own Language</label>
 							<input name="attr_skill_communication_speak_own_language" class="sheet-text_input sheet-skill_values" type="text" value="50">
 							<input name="attr_skill_communication_speak_own_language_check" class="advancement" type="checkbox" value="1">
@@ -909,7 +1027,7 @@
 				
 						<fieldset class="repeating_communication">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_communication_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_commCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_communication_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_communication_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_communication_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_communication_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="communicationSkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -920,109 +1038,109 @@
 						<input name="attr_skill_knowledge_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{animalLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{animalLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_animal_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="animalLore-c">Animal Lore</label>
 							<input name="attr_skill_knowledge_animal_lore" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_knowledge_animal_lore_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{areaLoreIcelandSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{areaLoreIcelandSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_area_lore_iceland}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="areaLoreIceland-c">Area Lore(Iceland)</label>
 							<input name="attr_skill_knowledge_area_lore_iceland" class="sheet-text_input sheet-skill_values" type="text" value="20">
 							<input name="attr_skill_knowledge_area_lore_iceland_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{battleSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_battle}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_battle}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_battle}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_battle}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{battleSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_battle}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_battle}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_battle}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_battle}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="battle-c">Battle</label>
 							<input name="attr_skill_knowledge_battle" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_knowledge_battle_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{customsNorseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{customsNorseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_customs_norse}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="customsNorse-c">Customs(Norse)</label>
 							<input name="attr_skill_knowledge_customs_norse" class="sheet-text_input sheet-skill_values" type="text" value="25">
 							<input name="attr_skill_knowledge_customs_norse_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{evaluateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{evaluateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_evaluate}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="evaluate-c">Evaluate</label>
 							<input name="attr_skill_knowledge_evaluate" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_knowledge_evaluate_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{farmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{farmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="farm-c">Farm</label>
 							<input name="attr_skill_knowledge_farm" class="sheet-text_input sheet-skill_values" type="text" value="30">
 							<input name="attr_skill_knowledge_farm_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{firstAidSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{firstAidSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_first_aid}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="firstAid-c">First Aid</label>
 							<input name="attr_skill_knowledge_first_aid" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_knowledge_first_aid_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{gameSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_game}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_game}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_game}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_game}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{gameSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_game}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_game}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_game}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_game}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="game-c">Game</label>
 							<input name="attr_skill_knowledge_game" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_knowledge_game_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{herdSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{herdSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="herd-c">Herd</label>
 							<input name="attr_skill_knowledge_herd" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_knowledge_herd_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{lawSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_law}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_law}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_law}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_law}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{lawSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_law}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_law}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_law}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_law}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="law-c">Law</label>
 							<input name="attr_skill_knowledge_law" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_knowledge_law_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{mineralLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{mineralLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_mineral_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="mineralLore-c">Mineral Lore</label>
 							<input name="attr_skill_knowledge_mineral_lore" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_knowledge_mineral_lore_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{mythLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{mythLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_myth_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="mythLore-c">Myth Lore</label>
 							<input name="attr_skill_knowledge_myth_lore" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_knowledge_myth_lore_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{navigateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{navigateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="navigate-c">Navigate</label>
 							<input name="attr_skill_knowledge_navigate" class="sheet-text_input sheet-skill_values" type="text" value="20">
 							<input name="attr_skill_knowledge_navigate_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{plantLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{plantLoreSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_plant_lore}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="plantLore-c">Plant Lore</label>
 							<input name="attr_skill_knowledge_plant_lore" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_knowledge_plant_lore_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{shiphandlingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{shiphandlingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_shiphandling}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="shiphandling-c">Shiphandling</label>
 							<input name="attr_skill_knowledge_shiphandling" class="sheet-text_input sheet-skill_values" type="text" value="0">
 							<input name="attr_skill_knowledge_shiphandling_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{survivalSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_survival}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_survival}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_survival}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_survival}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{survivalSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_survival}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_survival}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_survival}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_survival}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="survival-c">Survival</label>
 							<input name="attr_skill_knowledge_survival" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_knowledge_survival_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{treatDiseaseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{treatDiseaseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_treat_disease}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="treatDisease-c">Treat Disease</label>
 							<input name="attr_skill_knowledge_treat_disease" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_knowledge_treat_disease_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{treatPoisonSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{treatPoisonSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_treat_poison}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="treatPoison-c">Treat Poison</label>
 							<input name="attr_skill_knowledge_treat_poison" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_knowledge_treat_poison_check" class="advancement" type="checkbox" value="1">
@@ -1030,7 +1148,7 @@
 
 						<fieldset class="repeating_knowledge">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1044,31 +1162,31 @@
 						<label class="sheet-text_input sheet-skillName" style="margin: 6px 0px 0px 30px; font-weight: 800" data-i18n="manipulation-u">MANIPULATION</label>
 						<input name="attr_skill_manipulation_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{concealSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[floor((@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{concealSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[ceil((@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_manipulation_conceal}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="conceal-c">Conceal</label>
 							<input name="attr_skill_manipulation_conceal" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_manipulation_conceal_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{craftWeavingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[floor((@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{craftWeavingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[ceil((@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_manipulation_craft_weaving}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="craftWeaving-c">Craft(Weaving)</label>
 							<input name="attr_skill_manipulation_craft_weaving" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_manipulation_craft_weaving_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{deviseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_devise}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[floor((@{skill_manipulation_devise}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_manipulation_devise}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_manipulation_devise}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{deviseSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_devise}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[ceil((@{skill_manipulation_devise}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_manipulation_devise}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_manipulation_devise}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="devise-c">Devise</label>
 							<input name="attr_skill_manipulation_devise" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_manipulation_devise_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{playInstrumentSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[floor((@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{playInstrumentSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[ceil((@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_manipulation_play_instrument}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="playInstrument-c">Play Instrument</label>
 							<input name="attr_skill_manipulation_play_instrument" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_manipulation_play_instrument_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{sleightSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[floor((@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{sleightSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[ceil((@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_manipulation_sleight}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="sleight-c">Sleight</label>
 							<input name="attr_skill_manipulation_sleight" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_manipulation_sleight_check" class="advancement" type="checkbox" value="1">
@@ -1076,7 +1194,7 @@
 
 						<fieldset class="repeating_manipulation">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_manipCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_manipulation_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_manipulation_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_manipulation_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_manipulation_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="manipulationSkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1086,31 +1204,31 @@
 						<label class="sheet-text_input sheet-skillName" style="margin: 6px 0px 0px 30px; font-weight: 800" data-i18n="mythic-u">MYTHIC</label>
 						<input name="attr_skill_mythic_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{goUnderTheCloakSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{goUnderTheCloakSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_mythic_go_under_the_cloak}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="goUnderTheCloak-c">Go Under The Cloak</label>
 							<input name="attr_skill_mythic_go_under_the_cloak" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_mythic_go_under_the_cloak_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{prophecySkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_prophecy}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skill_mythic_prophecy}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_mythic_prophecy}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_mythic_prophecy}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{prophecySkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_prophecy}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skill_mythic_prophecy}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_mythic_prophecy}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_mythic_prophecy}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="prophecy-c">Prophecy</label>
 							<input name="attr_skill_mythic_prophecy" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_mythic_prophecy_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{runeMagicSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{runeMagicSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_mythic_rune_magic}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="runeMagic-c">Rune Magic</label>
 							<input name="attr_skill_mythic_rune_magic" class="sheet-text_input sheet-skill_values" type="text" value="0">
 							<input name="attr_skill_mythic_rune_magic_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{secondSightSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_second_sight}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skill_mythic_second_sight}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_mythic_second_sight}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_mythic_second_sight}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{secondSightSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_second_sight}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skill_mythic_second_sight}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_mythic_second_sight}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_mythic_second_sight}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="secondSight-c">Second Sight</label>
 							<input name="attr_skill_mythic_second_sight" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_mythic_second_sight_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{seiðurMagicSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{seiðurMagicSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_mythic_seiður_magic}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="seiðurMagic-c">Seiður Magic</label>
 							<input name="attr_skill_mythic_seiður_magic" class="sheet-text_input sheet-skill_values" type="text" value="0">
 							<input name="attr_skill_mythic_seiður_magic_check" class="advancement" type="checkbox" value="1">
@@ -1118,7 +1236,7 @@
 
 						<fieldset class="repeating_mythic">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_mythCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="mythicSkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1128,31 +1246,31 @@
 						<input name="attr_skill_perception_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{insightSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_insight}+@{skill_perception_category_modifier}]]}} {{Crit=[[floor((@{skill_perception_insight}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_perception_insight}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_perception_insight}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{insightSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_insight}+@{skill_perception_category_modifier}]]}} {{Crit=[[ceil((@{skill_perception_insight}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_perception_insight}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_perception_insight}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="insight-c">Insight</label>
 							<input name="attr_skill_perception_insight" class="sheet-text_input sheet-skill_values" type="text" value="20">
 							<input name="attr_skill_perception_insight_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{listenSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_listen}+@{skill_perception_category_modifier}]]}} {{Crit=[[floor((@{skill_perception_listen}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_perception_listen}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_perception_listen}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{listenSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_listen}+@{skill_perception_category_modifier}]]}} {{Crit=[[ceil((@{skill_perception_listen}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_perception_listen}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_perception_listen}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="listen-c">Listen</label>
 							<input name="attr_skill_perception_listen" class="sheet-text_input sheet-skill_values" type="text" value="25">
 							<input name="attr_skill_perception_listen_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{searchSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_search}+@{skill_perception_category_modifier}]]}} {{Crit=[[floor((@{skill_perception_search}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_perception_search}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_perception_search}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{searchSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_search}+@{skill_perception_category_modifier}]]}} {{Crit=[[ceil((@{skill_perception_search}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_perception_search}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_perception_search}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="search-c">Search</label>
 							<input name="attr_skill_perception_search" class="sheet-text_input sheet-skill_values" type="text" value="25">
 							<input name="attr_skill_perception_search_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{spotHiddenSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_spot_hidden}+@{skill_perception_category_modifier}]]}} {{Crit=[[floor((@{skill_perception_spot_hidden}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_perception_spot_hidden}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_perception_spot_hidden}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{spotHiddenSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_spot_hidden}+@{skill_perception_category_modifier}]]}} {{Crit=[[ceil((@{skill_perception_spot_hidden}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_perception_spot_hidden}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_perception_spot_hidden}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="spotHidden-c">Spot Hidden</label>
 							<input name="attr_skill_perception_spot_hidden" class="sheet-text_input sheet-skill_values" type="text" value="25">
 							<input name="attr_skill_perception_spot_hidden_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{trackSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_track}+@{skill_perception_category_modifier}]]}} {{Crit=[[floor((@{skill_perception_track}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_perception_track}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_perception_track}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{trackSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_perception_track}+@{skill_perception_category_modifier}]]}} {{Crit=[[ceil((@{skill_perception_track}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_perception_track}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_perception_track}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="track-c">Track</label>
 							<input name="attr_skill_perception_track" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_perception_track_check" class="advancement" type="checkbox" value="1">
@@ -1160,7 +1278,7 @@
 
 						<fieldset class="repeating_perception">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_perception_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_percCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_perception_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_perception_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_perception_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_perception_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="perceptionSkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1171,13 +1289,13 @@
 						<input name="attr_skill_stealth_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_stealthCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{hideSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_stealth_hide}+@{skill_stealth_category_modifier}]]}} {{Crit=[[floor((@{skill_stealth_hide}+@{skill_stealth_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_stealth_hide}+@{skill_stealth_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_stealth_hide}+@{skill_stealth_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="stealthSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_stealthCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{hideSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_stealth_hide}+@{skill_stealth_category_modifier}]]}} {{Crit=[[ceil((@{skill_stealth_hide}+@{skill_stealth_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_stealth_hide}+@{skill_stealth_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_stealth_hide}+@{skill_stealth_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="stealthSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="hide-c">Hide</label>
 							<input name="attr_skill_stealth_hide" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_stealth_hide_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_stealthCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{moveQuietlySkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier}]]}} {{Crit=[[floor((@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="stealthSkillRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_stealthCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{moveQuietlySkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier}]]}} {{Crit=[[ceil((@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_stealth_move_quietly}+@{skill_stealth_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="stealthSkillRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="moveQuietly-c">Move Quietly</label>
 							<input name="attr_skill_stealth_move_quietly" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_stealth_move_quietly_check" class="advancement" type="checkbox" value="1">
@@ -1185,7 +1303,7 @@
 
 						<fieldset class="repeating_stealth">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_stealthCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_stealth_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_stealth_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_stealth_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_stealth_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="stealthSkillRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_stealthCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_stealth_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_stealth_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_stealth_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_stealth_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="stealthSkillRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1193,59 +1311,59 @@
 						</fieldset>
 
 						<div style="height:12px;"></div>
-						
-						<button class="sheet-skillButtons" type="roll" name="roll_spiritAnimalCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{character_spirit_animal}}} {{Check=[[1]]}} {{DL=[[@{skill_spirit_animal}+@{skill_mythic_category_modifier}]]}} {{Crit=[[floor((@{skill_spirit_animal}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_spirit_animal}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_spirit_animal}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="spiritAnimalRoll-c"></button>
+<!--						
+						<button class="sheet-skillButtons" type="roll" name="roll_spiritAnimalCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{character_spirit_animal}}} {{Check=[[1]]}} {{DL=[[@{skill_spirit_animal}+@{skill_mythic_category_modifier}]]}} {{Crit=[[ceil((@{skill_spirit_animal}+@{skill_mythic_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_spirit_animal}+@{skill_mythic_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_spirit_animal}+@{skill_mythic_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="spiritAnimalRoll-c"></button>
 						<label class="sheet-text_input sheet-skillName" style="margin: 6px 0px 0px 0px; font-weight: 800" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</label>
 						<input name="attr_skill_spirit_animal" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0">
 						<input name="attr_skill_spirit_animal_check" class="advancement" type="checkbox" value="1">
-
+-->
 						<label class="sheet-text_input sheet-skillName" style="margin: 6px 0px 0px 30px; font-weight: 800" data-i18n="meleeWeapons-c">MELEE WEAPONS</label>
 						<input name="attr_skill_melee_weapon_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{oneHandAxeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{oneHandAxeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_1h_axe}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="oneHandAxe-c">1H Axe</label>
 							<input name="attr_skill_melee_weapon_1h_axe" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="10">
 							<input name="attr_skill_melee_weapon_1h_axe_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{twoHandAxeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{twoHandAxeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_2h_axe}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="twoHandAxe-c">2H Axe</label>
 							<input name="attr_skill_melee_weapon_2h_axe" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="5">
 							<input name="attr_skill_melee_weapon_2h_axe_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{broadswordSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{broadswordSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_broadsword}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="broadsword-c">Broadsword</label>
 							<input name="attr_skill_melee_weapon_broadsword" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="10">
 							<input name="attr_skill_melee_weapon_broadsword_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{quaterstaffSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{quaterstaffSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_quarterstaff}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="quaterstaff-c">Quaterstaff</label>
 							<input name="attr_skill_melee_weapon_quarterstaff" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="15">
 							<input name="attr_skill_melee_weapon_quarterstaff_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{knifeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{knifeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_knife}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="knife-c">Knife</label>
 							<input name="attr_skill_melee_weapon_knife" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="15">
 							<input name="attr_skill_melee_weapon_knife_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{polearmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{polearmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_polearm}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="polearm-c">Polearm</label>
 							<input name="attr_skill_melee_weapon_polearm" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="15">
 							<input name="attr_skill_melee_weapon_polearm_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{spearSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{spearSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_spear}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="spear-c">Spear</label>
 							<input name="attr_skill_melee_weapon_spear" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="15">
 							<input name="attr_skill_melee_weapon_spear_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{shieldSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{shieldSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_melee_weapon_shield}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="shield-c">Shield</label>
 							<input name="attr_skill_melee_weapon_shield" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="15">
 							<input name="attr_skill_melee_weapon_shield_check" class="advancement" type="checkbox" value="1">
@@ -1253,7 +1371,7 @@
 
 						<fieldset class="repeating_meleeWeapons">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_meleeWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_melee_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_melee_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="meleeWeaponRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1263,19 +1381,19 @@
 						<label class="sheet-text_input sheet-skillName" style="margin: 6px 0px 0px 30px; font-weight: 800" data-i18n="missileWeapons-c">MISSILE WEAPONS</label>
 						<input name="attr_skill_missile_weapon_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{bowSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{bowSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_missile_weapon_bow}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="bow-c">Bow</label>
 							<input name="attr_skill_missile_weapon_bow" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_missile_weapon_bow_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{slingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{slingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_missile_weapon_sling}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="sling-c">Sling</label>
 							<input name="attr_skill_missile_weapon_sling" class="sheet-text_input sheet-skill_values" type="text" value="5">
 							<input name="attr_skill_missile_weapon_sling_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{thrownAxeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{thrownAxeSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_missile_weapon_thrown_axe}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="thrownAxe-c">Thrown Axe</label>
 							<input name="attr_skill_missile_weapon_thrown_axe" class="sheet-text_input sheet-skill_values" type="text" value="10">
 							<input name="attr_skill_missile_weapon_thrown_axe_check" class="advancement" type="checkbox" value="1">
@@ -1283,7 +1401,7 @@
 
 						<fieldset class="repeating_missileWeapons">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_missileWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_missile_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_missile_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_missile_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_missile_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="missileWeaponRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1294,19 +1412,19 @@
 						<input name="attr_skill_natural_weapon_category_modifier" class="sheet-text_input sheet-skill_values" style="height: 26px;" type="text" value="0" readonly>
 
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{fistSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{fistSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_natural_weapon_fist}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="fist-c">Fist</label>
 							<input name="attr_skill_natural_weapon_fist" class="sheet-text_input sheet-skill_values" type="text" value="25">
 							<input name="attr_skill_natural_weapon_fist_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{grappleSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{grappleSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_natural_weapon_grapple}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="grapple-c">Grapple</label>
 							<input name="attr_skill_natural_weapon_grapple" class="sheet-text_input sheet-skill_values" type="text" value="25">
 							<input name="attr_skill_natural_weapon_grapple_check" class="advancement" type="checkbox" value="1">
 						</div>
 						<div class="sheet-skills">
-							<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{kickSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[floor((@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
+							<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{kickSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_natural_weapon_kick}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
 							<label  class="sheet-text_input sheet-skillName sheet-tweak" type="text" data-i18n="kick-c">Kick</label>
 							<input name="attr_skill_natural_weapon_kick" class="sheet-text_input sheet-skill_values" type="text" value="15">
 							<input name="attr_skill_natural_weapon_kick_check" class="advancement" type="checkbox" value="1">
@@ -1314,7 +1432,7 @@
 
 						<fieldset class="repeating_naturalWeapon">
 							<div class="sheet-skills">
-								<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[floor((@{skillValue}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[floor((@{skillValue}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skillValue}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
+								<button class="sheet-skillButtons" type="roll" name="roll_naturalWepCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{skill}}} {{Check=[[1]]}} {{DL=[[@{skillValue}+@{skill_natural_weapon_category_modifier}]]}} {{Crit=[[ceil((@{skillValue}+@{skill_natural_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skillValue}+@{skill_natural_weapon_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skillValue}+@{skill_natural_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="naturalWeaponRoll-c"></button>
 								<input name="attr_skill" class="sheet-text_input sheet-skillName sheet-tweak" type="text">
 								<input name="attr_skillValue" class="sheet-text_input sheet-skill_values" type="text" value="0">
 								<input name="attr_exp_check" class="advancement" type="checkbox" value="1">
@@ -1390,7 +1508,11 @@
 			<input class="sheet-characteristic"  name="attr_character_equipment_20_enc" style="width:  48px; margin: 0px 0px 0px 0px" type="text" value=' ' />		
 			<label style="display: inline-block; vertical-align: top; height: 20px; width: 70px; color: Black; margin: 6px 0px 0px 6px; font-family: Belleza; font-stretch: ultra-condensed; font-variant: small-caps; font-size: 16px; text-align: left; border: 1px solid transparent;" data-i18n="max-enc-u">Max ENC</label>
 			<input class="sheet-characteristic" type="text" style="width: 48px; height: 24px; margin: 0px 0px 0px 0px;" name='attr_attribute_max_enc' value=' ' readonly />
-			<label style="display: inline-block; vertical-align: top; height: 20px; width: 32px; color: Black; margin: 6px 0px 0px 36px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 16px; text-align: left; border: 1px solid transparent;" data-i18n="enc-u">ENC</label>
+
+			<input type="hidden"  name="attr_character_encumbrance_penalty"  value="0" />
+			<input type="text" name="attr_encumbered" style="display: inline-block; vertical-align: top; height: 28px; width: 28px; color: Red; background-color: transparent; margin:  2px 0px 0px 14px; font-size: 18px; font-weight: bold; text-align: right; padding: 0px; border: 1px solid Transparent;" readonly value="" data-i18n-title="encDef" />
+			
+			<label style="display: inline-block; vertical-align: top; height: 20px; width: 26px; color: Black; margin: 6px 0px 0px -2px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 16px; text-align: left; border: 0px solid Transparent;" data-i18n="enc-u">ENC</label>
 			<input class="sheet-characteristic" type="text" style="width: 48px; height: 24px; margin: 0px 0px 0px 0px;" name='attr_character_equipment_total_enc' value=' ' readonly />
 		</div>
 			
@@ -1403,16 +1525,16 @@
 	<div class="sheet-tab-content sheet-tab3"><!--- Tab 3 start -->
 	<!-- Farm Header -->
 		<div class="catHerding" style="width: 300px; height: 200px; margin: 0px 0px 0px 0px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
 		</div>
 		<label style="display: inline-block; vertical-align: top; height: 32px; width: 300px; color: rgb(69,109,91); margin: 46px 0px 0px -220px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 30px; text-align: center; border: 0px solid Black;" data-i18n="farm-record-sheet-u">FARM RECORD SHEET</label>
 		<div class="catHerding" style="width: 250px; height: 110px; margin: 16px 0px 0px 100px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true"> -->
 		</div>
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -216px 0px 0px -350px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true"> -->
 		</div>		
 
@@ -1437,7 +1559,7 @@
 			<input class="sheet-19height" type="text" name='attr_farmAnimals2' style="width: 370px; margin: 2px 0px 0px 14px;" value=' ' />
 			<input class="sheet-19height" type="text" name='attr_farmAnimals3' style="width: 370px; margin: 2px 0px 0px 14px;" value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 10px; width: 10px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{farmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 10px; width: 10px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_knowCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{farmSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_farm}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 30px; color: Black; margin:  2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 400; font-size: 12px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="farm-c" >Farm</label>
 			<input name="attr_skill_knowledge_farm" class="sheet-text_input sheet-skill_values" style="margin: 4px 0px 0px -2px" type="text">
@@ -1445,7 +1567,7 @@
 
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 6px; color: rgb(129,71,57); margin:  2px 0px 0px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 600; font-size: 24px; padding: 4px 0px 0px 2px; text-align: center; border: 0px solid Red;">/</label>
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 10px; padding: 4px 0px 0px 0px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{herdSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 10px; padding: 4px 0px 0px 0px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{herdSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_herd}+@{skill_knowledge_category_modifier}+@{circumstance_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 30px; color: Black; margin:  2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 400; font-size: 12px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="herd-c" >Herd</label>
 			<input name="attr_skill_knowledge_herd" class="sheet-text_input sheet-skill_values" style="margin: 4px 0px 0px -4px" type="text">
@@ -1470,7 +1592,7 @@
 			<label style="display: inline-block; vertical-align: top; height: 20px; width: 396px; color: rgb(83,124,151); margin: 4px 0px 2px 0px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 20px; text-align: center; border: 0px solid Red;" data-i18n="yearly-calendar-u">YEARLY CALENDAR</label>
 			<div class="catHerding" style="width: 386px; height: 406px; margin: -4px 0px 0px 10px; border: 0px solid Red;" >
 <!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-calendar.svg?raw=true"> -->
-				<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-calendar.svg?raw=true">
+				<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-calendar.svg?raw=true">
 			</div>
 			<label style=" height: 9px; width: 130px; color: Black; margin: -12px 0px 0px 0px; font-family: Arial;  font-size: 8px; padding: 0px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="copyright">© 2024 Chaosium Inc.</label>
 		</div>
@@ -1479,10 +1601,10 @@
 		<div style="display: inline-block; vertical-align: top; height: 502px; width: 780px; border: 2px solid rgb(129,71,57); margin: 6px 0px 4px 20px;">
 			<label style="display: inline-block; vertical-align: top; height: 0px; width: 776px; color: rgb(83,124,151); margin: 26px 0px 2px 0px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 20px; text-align: center; border: 0px solid Red;" data-i18n-title="legend" data-i18n="location-of-farm-u">LOCATION OF FARM</label>
 			<div class="catHerding" style="z-index=-1; width: 780px; height: 450px; margin: -6px 0px 0px 0px; opacity: 1.0;" >
-				<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-iceland-outline.svg?raw=true" style="width: 780px; height: 450px;">
+				<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-iceland-outline.svg?raw=true" style="width: 780px; height: 450px;">
 <!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-iceland-outline.svg?raw=true"> -->
 <!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-iceland-outline.svg?raw=true" style="z-index=-1; width: 780px; height: 450px; margin: -6px 0px 0px 0px; opacity: 1.0;"> -->
-<!--			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-iceland-outline.svg?raw=true" style="z-index=-1; width: 780px; height: 450px; margin: -6px 0px 0px 0px; opacity: 1.0;"> -->
+<!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-iceland-outline.svg?raw=true" style="z-index=-1; width: 780px; height: 450px; margin: -6px 0px 0px 0px; opacity: 1.0;"> -->
 			</div>
 			
 			<!-- An invisible Grid where a location can be marked as: Farm, Ship, Party, Settlement, or Path -->
@@ -17392,9 +17514,9 @@
 		
 		<label style=" height: 9px; width: 130px; color: Black; margin: -6px 0px 0px 0px; font-family: Arial;  font-size: 8px; padding: 0px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="copyright">© 2024 Chaosium Inc.</label>
 		<div class="catHerding" style="transform: scale(-1, -1); width: 300px; height: 200px; margin: -162px 0px 0px 530px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+<!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true" style="transform: scale(-1, -1);"> -->
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true" style="transform: scale(-1, -1);"> -->
-<!--		<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true" style="transform: scale(-1, -1);"> -->
 		</div>
 
 			<!-- Disclaimer -->
@@ -17419,14 +17541,14 @@
 		</div>	
 -->
 		<div class="catHerding" style="width: 300px; height: 200px; margin: 0px 0px 0px 0px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 		<label style="display: inline-block; vertical-align: top; height: 32px; width: 300px; color: rgb(69,109,91); margin: 46px 0px 0px -220px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 30px; text-align: center; border: 0px solid Black;" data-i18n="ship-record-sheet-u">SHIP RECORD SHEET</label>
 		<div class="catHerding" style="width: 250px; height: 110px; margin: 16px 0px 0px 100px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
 		</div>
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -216px 0px 0px -350px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>
 		
 		<div style="display: inline-block; vertical-align: top; height: 860px; width: 390px; border: 0px solid rgb(129,71,57); margin: -320px 0px 0px 20px;">
@@ -17498,7 +17620,7 @@
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 60px; color: Black; margin:  2px 0px 2px 14px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 600; font-size: 18px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="captain-c">Captain</label>
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 4px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_shipCaptain' value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 10px; width: 10px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{boatSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_boat}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_agility_boat}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 10px; width: 10px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{boatSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_agility_boat}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_agility_boat}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_agility_boat}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 24px; color: Black; margin:  2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 400; font-size: 12px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="boat-c" >Boat</label>
 			<input name="attr_skill_agility_boat" class="sheet-text_input sheet-skill_values" style="margin: 4px 0px 0px -2px" type="text">
@@ -17506,7 +17628,7 @@
 
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 6px; color: rgb(129,71,57); margin:  2px 0px 0px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 600; font-size: 24px; padding: 4px 0px 0px 2px; text-align: center; border: 0px solid Red;">/</label>
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 10px; padding: 4px 0px 0px 0px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{shiphandlingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 10px; padding: 4px 0px 0px 0px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{shiphandlingSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_shiphandling}+@{skill_agility_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="agilitySkillRoll-c">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 66px; color: Black; margin:  2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 400; font-size: 12px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="shiphandling-c" >Shiphandling</label>
 			<input name="attr_skill_knowledge_shiphandling" class="sheet-text_input sheet-skill_values" style="margin: 4px 0px 0px -4px" type="text">
@@ -17516,7 +17638,7 @@
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 80px; color: Black; margin:  2px 0px 2px 14px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 400; font-size: 18px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="helmsman-c">Helmsman</label>
 			<input class="sheet-characteristic" type="text" style="width: 80px; height: 19px; margin: 4px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_shipHelmsman' value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 10px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{navigateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[floor((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[floor((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-floor((100-(@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 10px; width: 14px; padding: 4px 0px 0px 4px; border: 0px solid Blue;" name="roll_agilCheck" value="&{template:check} {{name=@{character_name}}} {{SkillName=@{navigateSkillName}}} {{Check=[[1]]}} {{DL=[[@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}]]}} {{Crit=[[ceil((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.05)]]}} {{Special=[[ceil((@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier})*0.2)]]}} {{Fumble=[[100-ceil((100-(@{skill_knowledge_navigate}+@{skill_knowledge_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="knowledgeSkillRoll-c">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 116px; color: Black; margin:  2px 0px 2px -4px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-weight: 400; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n-title="includesKnowledgeBonus-c" data-i18n="navigate-c">Navigate</label>
 			<input name="attr_skill_knowledge_navigate" class="sheet-text_input sheet-skill_values" style="margin: 4px 0px 0px -4px" type="text">
@@ -17582,7 +17704,7 @@
 		</div>
 		<div class="catHerding" style="width: 300px; height: 200px; margin: -170px 0px 0px 530px; transform: scale(-1, -1);" >
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 
 			<!-- Disclaimer -->
@@ -17607,14 +17729,14 @@
 -->
 
 		<div class="catHerding" style="width: 300px; height: 200px; margin: 0px 0px 0px 0px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 		<label style="display: inline-block; vertical-align: top; height: 32px; width: 300px; color: rgb(69,109,91); margin: 46px 0px 0px -220px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 30px; text-align: center; border: 0px solid Black;" data-i18n="magic-sheet-u">MAGIC SHEET</label>
 		<div class="catHerding" style="width: 250px; height: 110px; margin: 16px 0px 0px 100px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
 		</div>
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -216px 0px 0px -350px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true"  style="border: 0px solid Black;">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true"  style="border: 0px solid Black;">
 		</div>
 
 		<div class="catHerding" style="width: 810px; height: 1720px; z-index: 1; margin: -330px 0px 0px 0px; border: 0px solid Red;" >
@@ -17740,7 +17862,7 @@
 
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -322px 0px 0px 400px; border: 0px solid Red;" >
 <!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true"> -->
-				<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+				<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 <!--			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true" style="transform: scale(-1, -1);"> -->
 		</div>
 
@@ -18059,6 +18181,41 @@
 				<input class="sheet-notes" name="attr_magicAreaOfPower8a"  style="width: 200px; margin: 10px 0px 0px 8px" type="text" value=' ' />
 				<input class="sheet-notes" name="attr_magicAreaOfPower8b"  style="width: 200px; margin: 4px 0px 0px 8px" type="text" value=' ' />
 			</div>
+	
+			<div style="display: inline-block; vertical-align: top; height: 60px; width: 60px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
+				<input  name="attr_magicRuneName9" style="height: 58px; width: 58px; color: rgb(129,71,57); font-weight: 400; font-size: 58px; text-align: center; margin: 1px 0px 0px 1px; padding-bottom: 4px;" type="text" />
+			</div>
+			<select style="display: inline-block; vertical-align: top; width: 80px; height: 26px; margin: 20px 0px 0px 8px;" name="attr_magicRuneName9">
+				<option value="ᚠ" data-i18n="fe-c">Fé</option>
+				<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+				<option value="ᚦ" data-i18n="durs-c">Durs</option>
+				<option value="ᚩ" data-i18n="oss-c">Oss</option>
+				<option value="ᚱ" data-i18n="reid-c">Reid</option>
+				<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+				<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+				<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+				<option value="ᛝ" data-i18n="ing-c">Ing</option>
+				<option value="ᛟ" data-i18n="odal-c">Odal</option>
+				<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+				<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+				<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+				<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+				<option value="ᛃ" data-i18n="ar-c">Ar</option>
+				<option value="ᚹ" data-i18n="vend-c">Vend</option>
+				<option value="ᛁ" data-i18n="iss-c">Iss</option>
+				<option value="ᚾ" data-i18n="naud-c">Naud</option>
+				<option value="ᛋ" data-i18n="sol-c">Sol</option>
+				<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+				<option value="ᛇ" data-i18n="yr-c">Yr</option>
+				<option value="ᛈ" data-i18n="peord-c">Peord</option>
+				<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+				<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+				<option value=" " selected data-i18n="none-c">None</option>
+			</select>
+			<div style="display: inline-block; vertical-align: top; width: 202px;">
+				<input class="sheet-notes" name="attr_magicAreaOfPower9a"  style="width: 200px; margin: 10px 0px 0px 8px" type="text" value=' ' />
+				<input class="sheet-notes" name="attr_magicAreaOfPower9b"  style="width: 200px; margin: 4px 0px 0px 8px" type="text" value=' ' />
+			</div>
 				
 		</div>
 
@@ -18069,20 +18226,27 @@
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 22%; color: Black; margin: 14px 0px 2px 16px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 18px; padding: 6px 0px 0px 0px; text-align: right; border: 0px solid Orange;" data-i18n="meanings-c">Meanings</label>
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 40%; color: Black; margin: 14px 0px 2px -16px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 18px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="results-c">Results</label>
 		<!-- First Rune Script -->
-			<div style="display: inline-block; vertical-align: top; height: 102px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
+			<input type="hidden" name="attr_rune_script_1_active_runes" value="0">
+			<input type="hidden" name="attr_rune_script_1_locked" value="0">
+			<div style="display: inline-block; vertical-align: top; height: 152px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
 				<input  name="attr_magicScript1Rune1" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript1Rune2" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript1Rune3" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript1Rune4" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript1Rune5" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript1Rune6" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript1Rune7" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript1Rune8" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript1Rune9" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 			</div>
-
+<!-- lock:( key:K -->
 			<input type="checkbox" name="attr_runeScript1" class="sheet-block-switch" style="accent-color: Black;" data-i18n-title="clickRuneScripts" value="1">
 			<button class="btn sheet-skillName" type="action" name="act_script1" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
 				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">E</span></button>
+			<button class="btn sheet-skillName" type="action" name="act_script1_lock" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
+				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">(</span></button>
 			
-			<div class="sheet-block-a" style="height: 110px; width: 234px; margin: -100px 0px 0px 150px; border: 0px solid Blue">
+			<div class="sheet-block-a" style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue">
 				<div style="display: inline-block; vertical-align: top; width: 82px;">
 					<input class="sheet-notes" name="attr_magicRuneMeaning1a"  style="width: 80px; margin:  4px 2px 0px 2px" type="text" value=' ' data-i18n-title="runeScriptName-c" />
 					<input class="sheet-notes" name="attr_magicRuneMeaning1b"  style="width: 80px; margin: -2px 2px 0px 2px" type="text" value=' ' />
@@ -18098,7 +18262,7 @@
 			</div>
 
 
-			<div class="sheet-block-b" style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue">
+			<div class="sheet-block-b" style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue">
 					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript1Rune1" data-i18n-title="firstRune-c">
 						<option value="ᚠ" data-i18n="fe-c">Fé</option>
 						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
@@ -18267,20 +18431,110 @@
 						<option value=" " selected data-i18n="none-c">None</option>
 					</select>
 				
-			</div>
+				
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 3px;" name="attr_magicScript1Rune7" data-i18n-title="seventhRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript1Rune8" data-i18n-title="eigthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript1Rune9" data-i18n-title="ninthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+				</div>
 
 		<!-- Second Rune Script -->
-			<div style="display: inline-block; vertical-align: top; height: 102px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
+			<input type="hidden" name="attr_rune_script_2_active_runes" value="0">
+			<div style="display: inline-block; vertical-align: top; height: 152px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
 				<input  name="attr_magicScript2Rune1" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript2Rune2" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript2Rune3" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript2Rune4" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript2Rune5" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript2Rune6" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript2Rune7" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript2Rune8" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript2Rune9" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 			</div>
 			<button class="btn sheet-skillName" type="action" name="act_script2" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
 				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">E</span></button>
-			<div class="sheet-block-a" style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue">
+			<button class="btn sheet-skillName" type="action" name="act_script2_lock" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
+				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">(</span></button>
+			<div class="sheet-block-a" style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue">
 				<div style="display: inline-block; vertical-align: top; width: 82px;">
 					<input class="sheet-notes" name="attr_magicRuneMeaning2a"  style="width: 80px; margin: 14px 2px 0px 2px" type="text" value=' ' data-i18n-title="runeScriptName-c" />
 					<input class="sheet-notes" name="attr_magicRuneMeaning2b"  style="width: 80px; margin: -2px 2px 0px 2px" type="text" value=' ' />
@@ -18295,7 +18549,7 @@
 				</div>
 			</div>
 			<div class="sheet-block-b"> 
-				<div style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue" >
+				<div style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue" >
 					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript2Rune1" data-i18n-title="firstRune-c">
 						<option value="ᚠ" data-i18n="fe-c">Fé</option>
 						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
@@ -18463,22 +18717,112 @@
 						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
 						<option value=" " selected data-i18n="none-c">None</option>
 					</select>
+				
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript2Rune7" data-i18n-title="seventhRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript2Rune8" data-i18n-title="eighthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript2Rune9" data-i18n-title="ninthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
 				</div>
 			</div>
 
 		<!-- Third Rune Script -->
-			<div style="display: inline-block; vertical-align: top; height: 102px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
+			<input type="hidden" name="attr_rune_script_3_active_runes" value="0">
+			<div style="display: inline-block; vertical-align: top; height: 152px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
 				<input  name="attr_magicScript3Rune1" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript3Rune2" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript3Rune3" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript3Rune4" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript3Rune5" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript3Rune6" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript3Rune7" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript3Rune8" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript3Rune9" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 			</div>
 			<button class="btn sheet-skillName" type="action" name="act_script3" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
 				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">E</span></button>
+			<button class="btn sheet-skillName" type="action" name="act_script3_lock" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
+				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">(</span></button>
 
-			<div class="sheet-block-a" style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue">
+			<div class="sheet-block-a" style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue">
 				<div style="display: inline-block; vertical-align: top; width: 82px;">
 					<input class="sheet-notes" name="attr_magicRuneMeaning3a"  style="width: 80px; margin: 14px 2px 0px 2px" type="text" value=' ' data-i18n-title="runeScriptName-c" />
 					<input class="sheet-notes" name="attr_magicRuneMeaning3b"  style="width: 80px; margin: -2px 2px 0px 2px" type="text" value=' ' />
@@ -18493,7 +18837,7 @@
 				</div>
 			</div>
 			<div class="sheet-block-b"> 
-				<div style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue" >
+				<div style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue" >
 					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript3Rune1" data-i18n-title="firstRune-c">
 						<option value="ᚠ" data-i18n="fe-c">Fé</option>
 						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
@@ -18661,22 +19005,112 @@
 						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
 						<option value=" " selected data-i18n="none-c">None</option>
 					</select>
+				
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript3Rune7" data-i18n-title="seventhRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript3Rune8" data-i18n-title="eigthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript3Rune9" data-i18n-title="ninththRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
 				</div>
 			</div>
 
 		<!-- Fourth Rune Script -->
-			<div style="display: inline-block; vertical-align: top; height: 102px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
+			<input type="hidden" name="attr_rune_script_4_active_runes" value="0">
+			<div style="display: inline-block; vertical-align: top; height: 152px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
 				<input  name="attr_magicScript4Rune1" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript4Rune2" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript4Rune3" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript4Rune4" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript4Rune5" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript4Rune6" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript4Rune7" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript4Rune8" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
+				<input  name="attr_magicScript4Rune9" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
 			</div>
 			<button class="btn sheet-skillName" type="action" name="act_script4" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
 				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">E</span></button>
+			<button class="btn sheet-skillName" type="action" name="act_script4_lock" style="margin: 0; width: 16px; height: 19px; padding: 0px 0px 0px 2px; border: 0px solid Red;">
+				<span style="font-family:Pictos; color: rgb(129,71,57); font-size: 16px;">(</span></button>
 
-			<div class="sheet-block-a" style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue">
+			<div class="sheet-block-a" style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue">
 				<div style="display: inline-block; vertical-align: top; width: 82px;">
 					<input class="sheet-notes" name="attr_magicRuneMeaning4a"  style="width: 80px; margin: 14px 2px 0px 2px" type="text" value=' ' data-i18n-title="runeScriptName-c" />
 					<input class="sheet-notes" name="attr_magicRuneMeaning4b"  style="width: 80px; margin: -2px 2px 0px 2px" type="text" value=' ' />
@@ -18691,7 +19125,7 @@
 				</div>
 			</div>
 			<div class="sheet-block-b"> 
-				<div style="height: 110px; width: 234px; margin: -110px 0px 0px 150px; border: 0px solid Blue" >
+				<div style="height: 150px; width: 234px; margin: -150px 0px 0px 150px; border: 0px solid Blue" >
 					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript4Rune1" data-i18n-title="firstRune-c">
 						<option value="ᚠ" data-i18n="fe-c">Fé</option>
 						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
@@ -18859,10 +19293,96 @@
 						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
 						<option value=" " selected data-i18n="none-c">None</option>
 					</select>
+				
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript4Rune7" data-i18n-title="seventhRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript4Rune8" data-i18n-title="eighthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
+		
+					<select style="display: inline-block; vertical-align: top; width: 74px; height: 26px; margin: 20px 0px 0px 0px;" name="attr_magicScript4Rune9" data-i18n-title="ninthRune-c">
+						<option value="ᚠ" data-i18n="fe-c">Fé</option>
+						<option value="ᚢ" data-i18n="ur-c">Ûr</option>
+						<option value="ᚦ" data-i18n="durs-c">Durs</option>
+						<option value="ᚩ" data-i18n="oss-c">Oss</option>
+						<option value="ᚱ" data-i18n="reid-c">Reid</option>
+						<option value="ᛖ" data-i18n="eykur-c">Eykur</option>
+						<option value="ᛗ" data-i18n="madur-c">Maბur</option>
+						<option value="ᛚ" data-i18n="logur-c">Lögur</option>
+						<option value="ᛝ" data-i18n="ing-c">Ing</option>
+						<option value="ᛟ" data-i18n="odal-c">Odal</option>
+						<option value="ᛞ" data-i18n="dagur-c">Dagur</option>
+						<option value="ᚻ" data-i18n="hagall-c">Hagall</option>
+						<option value="ᚲ" data-i18n="kaun-c">Kaun</option>
+						<option value="ᚷ" data-i18n="gjof-c">Gjof</option>
+						<option value="ᛃ" data-i18n="ar-c">Ar</option>
+						<option value="ᚹ" data-i18n="vend-c">Vend</option>
+						<option value="ᛁ" data-i18n="iss-c">Iss</option>
+						<option value="ᚾ" data-i18n="naud-c">Naud</option>
+						<option value="ᛋ" data-i18n="sol-c">Sol</option>
+						<option value="ᛉ" data-i18n="elgur-c">Elgur</option>
+						<option value="ᛇ" data-i18n="yr-c">Yr</option>
+						<option value="ᛈ" data-i18n="peord-c">Peord</option>
+						<option value="ᛏ" data-i18n="tyr-c">Tyr</option>
+						<option value="ᛒ" data-i18n="bjarkan-c">Bjarkan</option>
+						<option value=" " selected data-i18n="none-c">None</option>
+					</select>
 				</div>
 			</div>
 			
 		<!-- Fifth Rune Script -->
+<!--
+			<input type="hidden" name="attr_rune_script_5_active_runes" value="0">
 			<div style="display: inline-block; vertical-align: top; height: 102px; width: 130px; border: 2px solid rgb(129,71,57); margin: 10px 0px 0px 0px;">
 				<input  name="attr_magicScript5Rune1" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 1px; padding-bottom: 4px;" type="text" />
 				<input  name="attr_magicScript5Rune2" style="height: 46px; width: 40px; color: rgb(129,71,57); font-weight: 400; font-size: 46px; text-align: center; margin: 2px 0px 0px 0px; padding-bottom: 4px;" type="text" />
@@ -19059,13 +19579,13 @@
 					</select>
 				</div>
 			</div>
-
+-->
 		</div>
 
 
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -322px 0px 0px 400px; border: 0px solid Red;" >
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true"> -->
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>
 		<div style="display: inline-block; vertical-align: top; width: 816px; margin: -320px 0px 0px 4px;">
 
@@ -20204,7 +20724,7 @@
 		</div> <!-- Bind Runes section -->
 		<div class="catHerding" style="width: 300px; height: 200px; margin: -170px 0px 0px 530px; transform: scale(-1, -1);" >
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 
 			<!-- Disclaimer -->
@@ -20227,14 +20747,14 @@
 		</div>
 -->
 		<div class="catHerding" style="width: 300px; height: 200px; margin: 0px 0px 0px 0px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 		<label style="display: inline-block; vertical-align: top; height: 32px; width: 300px; color: rgb(69,109,91); margin: 46px 0px 0px -220px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 30px; text-align: center; border: 0px solid Black;" data-i18n="npc-record-sheet-u">NPC RECORD SHEET</label>
 		<div class="catHerding" style="width: 250px; height: 110px; margin: 16px 0px 0px 100px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
 		</div>
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -216px 0px 0px -350px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>
 
 		<div style="width: 826px; height: 1500px; margin: -340px 0px 0px 6px; border: 0px solid Red;">
@@ -20254,6 +20774,36 @@
 			<label style="display: inline-block; vertical-align: top; height: 22px; width: 38px; color: Black; margin: 14px 0px 2px 6px; font-family: 'Noto Serif'; font-size: 14px; text-align: left; border: 1px dashed transparent;" data-i18n="name-u">NAME</label>
 			<input class="sheet-characteristic" type="text" style="width: 200px; height: 19px; margin: 14px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcName' value=' ' />
 
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 0px 0px 0px -10px; border: 0px solid Red; " data-i18n="spirit-animal-c">Spirit Animal</label>
+				<input type="hidden"  name="attr_npc_spirit_animal_agility"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_communication"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_knowledge"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_manipulation"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_mythic"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_perception"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_stealth"  value="0" />
+				<input type="hidden"  name="attr_npc_spirit_animal_flag"  value="0" />
+			<select class="sheet-personal" style="width: 200px; text-align: center; margin: -4px 0px 0px 40px;" name='attr_npc_spirit_animal'>
+				<option value="" selected></option>
+				<option value="Bear" data-i18n="bear-c" data-i18n-title="mightyDef">Bear</option>
+				<option value="Bull" data-i18n="bull-c" data-i18n-title="mightyDef">Bull</option>
+				<option value="Eagle" data-i18n="eagle-c" data-i18n-title="mightyDef">Eagle</option>
+				<option value="Beaver" data-i18n="beaver-c" data-i18n-title="steadfastDef">Beaver</option>
+				<option value="Gyr Falcon" data-i18n="gyrFalcon-c" data-i18n-title="steadfastDef">Gyr Falcon</option>
+				<option value="Seal" data-i18n="seal-c" data-i18n-title="steadfastDef">Seal</option>
+				<option value="Cat" data-i18n="cat-c" data-i18n-title="spiritualDef">Cat</option>
+				<option value="Golden Plover" data-i18n="goldenPlover-c" data-i18n-title="spiritualDef">Golden Plover</option>
+				<option value="Raven" data-i18n="raven-c" data-i18n-title="spiritualDef">Raven</option>
+				<option value="Goose" data-i18n="goose-c" data-i18n-title="wandererDef">Goose</option>
+				<option value="Horse" data-i18n="horse-c" data-i18n-title="wandererDef">Horse</option>
+				<option value="Wolf" data-i18n="wolf-c" data-i18n-title="wandererDef">Wolf</option>
+				<option value="Owl" data-i18n="owl-c" data-i18n-title="cunningDef">Owl</option>
+				<option value="Snow Fox" data-i18n="snowFox-c" data-i18n-title="cunningDef">Snow Fox</option>
+				<option value="Weasel" data-i18n="weasel-c" data-i18n-title="cunningDef">Weasel</option>
+				<option value="Arctic Tern" data-i18n="arcticTern-c" data-i18n-title="manipulativeDef">Arctic Tern</option>
+				<option value="Dog" data-i18n="dog-c" data-i18n-title="manipulativeDef">Dog</option>
+				<option value="Mouse" data-i18n="mouse-c" data-i18n-title="manipulativeDef">Mouse</option>
+			</select>
 			<label style="display: inline-block; vertical-align: top; height: 22px; width: 90px; color: Black; margin: 14px 0px 2px 6px; font-family: 'Noto Serif'; font-weight: 300; font-size: 14px; text-align: left; border: 1px dashed transparent;" data-i18n="description-u">DESCRIPTION</label>
 			<input class="sheet-characteristic" type="text" style="width: 146px; height: 19px; margin: 14px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcDescription1' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width: 258px; height: 19px; margin: -8px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcDescription2' value=' ' />
@@ -20271,31 +20821,31 @@
 			<label style="display: inline-block; vertical-align: top; height: 16px; width: 30px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: right; border: 0px solid Orange;">%</label>
 			<label style="display: inline-block; vertical-align: top; height: 16px; width: 114px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon1Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon1}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage1}+@{npcDamageMod}]]}}  {{Crit=[[floor((@{npcWeaponSkill1}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npcWeaponSkill1}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeaponSkill1}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon1Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon1}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage1}+@{npcDamageMod}]]}}  {{Crit=[[ceil((@{npcWeaponSkill1}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npcWeaponSkill1}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeaponSkill1}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; padding: 1px;  border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npcWeapon1' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponSkill1' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponDamage1' value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon2Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon2}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill2+@{meleeWeaponsModN1}}]]}}{{Damage=[[@{npcWeaponDamage2}+@{npcDamageMod}]]}}  {{Crit=[[floor((@{npcWeaponSkill2}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npcWeaponSkill2}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeaponSkill2}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon2Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon2}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill2+@{meleeWeaponsModN1}}]]}}{{Damage=[[@{npcWeaponDamage2}+@{npcDamageMod}]]}}  {{Crit=[[ceil((@{npcWeaponSkill2}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npcWeaponSkill2}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeaponSkill2}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npcWeapon2' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponSkill2' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponDamage2' value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon3Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon3}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill3}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage3}+@{npcDamageMod}]]}}  {{Crit=[[floor((@{npcWeaponSkill3}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npcWeaponSkill3}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeaponSkill3}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon3Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon3}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill3}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage3}+@{npcDamageMod}]]}}  {{Crit=[[ceil((@{npcWeaponSkill3}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npcWeaponSkill3}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeaponSkill3}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npcWeapon3' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponSkill3' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponDamage3' value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon4Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon4}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill4}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage4}+@{npcDamageMod}]]}}  {{Crit=[[floor((@{npcWeaponSkill4}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npcWeaponSkill4}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeaponSkill4}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon4Check" value="&{template:check} {{name=@{npcName} *attacks with* @{npcWeapon4}}} {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill4}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage4}+@{npcDamageMod}]]}}  {{Crit=[[ceil((@{npcWeaponSkill4}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npcWeaponSkill4}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeaponSkill4}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npcWeapon4' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponSkill4' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponDamage4' value=' ' />
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon5Check" value="&{template:check} {{name=@{npcName} *attacks with* Brawl/Claw}}    {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill5}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage5}+@{npcDamageMod}]]}}  {{Crit=[[floor((@{npcWeaponSkill5}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npcWeaponSkill5}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeaponSkill5}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcWeapon5Check" value="&{template:check} {{name=@{npcName} *attacks with* Brawl/Claw}}    {{Check=[[1]]}} {{DL=[[@{npcWeaponSkill5}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcWeaponDamage5}+@{npcDamageMod}]]}}  {{Crit=[[ceil((@{npcWeaponSkill5}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npcWeaponSkill5}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeaponSkill5}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<label style="display: inline-block; vertical-align: top; height: 19px; width: 100px; color: Black; margin: 0px 0px 2px -2px; font-family: 'Noto Serif'; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="brawl/claw-c">Brawl/Claw</label>
 			<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcWeaponSkill5' value=' ' />
@@ -20312,7 +20862,7 @@
 			<label style="display: inline-block; vertical-align: top; height: 16px; width: 90px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 			<label style="display: inline-block; vertical-align: top; height: 16px; width: 26px;  color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
-			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcShieldCheck" value="&{template:check} {{name=@{npcName} *attacks with* @{npcShield}}} {{Check=[[1]]}} {{DL=[[@{npcShieldValue}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcShieldDamage}+@{npcDamageMod}]]}}  {{Crit=[[floor((@{npcShieldValue}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npcShieldValue}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcShieldValue}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcShieldRoll">
+			<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npcShieldCheck" value="&{template:check} {{name=@{npcName} *attacks with* @{npcShield}}} {{Check=[[1]]}} {{DL=[[@{npcShieldValue}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npcShieldDamage}+@{npcDamageMod}]]}}  {{Crit=[[ceil((@{npcShieldValue}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npcShieldValue}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcShieldValue}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcShieldRoll">
 				<span style="font-family:dicefontd20;">t</span></button>
 			<input class="sheet-characteristic" type="text" style="width:  82px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npcShield' value=' ' />
 			<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npcShieldValue' value=' ' />
@@ -20323,31 +20873,31 @@
 		
 		<div style="display: inline-block; vertical-align: top; width: 268px; margin: 10px 0px 0px 4px; border-right: 2px solid rgb(129,71,57);">
 			<div style="height: 12px"></div>
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{npcName} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{npcStr}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcStr}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcStr}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcStr}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcStrRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{npcName} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{npcStr}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcStr}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcStr}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcStr}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcStrRoll">
 				<label class="sheet-charName" data-i18n="str-u">STR</label></button>
 			<input class="sheet-characteristic" style="width: 36px; margin: 0" name="attr_npcStr" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{npcName} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{npcInt}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcInt}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcInt}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcInt}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcIntRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{npcName} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{npcInt}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcInt}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcInt}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcInt}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcIntRoll">
 				<label class="sheet-charName" data-i18n="int-u">INT</label></button>
 			<input class="sheet-characteristic" name="attr_npcInt" style="width: 36px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{npcName} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{npcCha}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcCha}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcCha}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcCha}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcChaRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{npcName} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{npcCha}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcCha}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcCha}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcCha}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcChaRoll">
 				<label class="sheet-charName" data-i18n="cha-u">CHA</label></button>
 			<input class="sheet-characteristic" name="attr_npcCha" style="width: 36px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{npcName} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{npcCon}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcCon}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcCon}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcCon}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcConRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{npcName} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{npcCon}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcCon}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcCon}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcCon}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcConRoll">
 				<label class="sheet-charName" data-i18n="con-u">CON</label></button>
 			<input class="sheet-characteristic" name="attr_npcCon" style="width: 36px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{npcName} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{npcPow}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcPow}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcPow}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcPow}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcPowRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{npcName} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{npcPow}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcPow}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcPow}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcPow}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcPowRoll">
 				<label class="sheet-charName" data-i18n="pow-u">POW</label></button>
 			<input class="sheet-characteristic" name="attr_npcPow" style="width: 36px; margin: 0; margin-right: 50px;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{npcName} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{npcSiz}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcSiz}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcSiz}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcSiz}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcSizRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{npcName} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{npcSiz}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcSiz}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcSiz}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcSiz}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcSizRoll">
 				<label class="sheet-charName" data-i18n="siz-u">SIZ</label></button>
 			<input class="sheet-characteristic" name="attr_npcSiz" style="width: 36px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{npcName} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{npcDex}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[floor(@{npcDex}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[floor(@{npcDex}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npcDex}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcDexRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{npcName} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{npcDex}*@{circumstanceMultiplierNPC})]]}} {{Crit=[[ceil(@{npcDex}*@{circumstanceMultiplierNPC}*0.05)]]}} {{Special=[[ceil(@{npcDex}*@{circumstanceMultiplierNPC}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npcDex}*@{circumstanceMultiplierNPC})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC}x}}" data-i18n-title="npcDexRoll">
 				<label class="sheet-charName" data-i18n="dex-u">DEX</label></button>
 			<input class="sheet-characteristic" name="attr_npcDex" style="width: 36px; margin: 0;" type="text" value=' ' />
 
@@ -20367,7 +20917,7 @@
 			<!-- Skills -->
 			<label style="display: inline-block; vertical-align: top; height: 18px; width: 260px; color: Black; margin:  12px 0px 2px 2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 18px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="skills-u">SKILLS</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1a" value="&{template:check} {{name=@{npcName} *uses* @{skillN1a}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1a}+@{skillTypeN1a}]]}}  {{Crit=[[floor((@{skillValueN1a}+@{skillTypeN1a})*0.05)]]}} {{Special=[[floor((@{skillValueN1a}+@{skillTypeN1a})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1a}+@{skillTypeN1a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1a" value="&{template:check} {{name=@{npcName} *uses* @{skillN1a}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1a}+@{skillTypeN1a}]]}}  {{Crit=[[ceil((@{skillValueN1a}+@{skillTypeN1a})*0.05)]]}} {{Special=[[ceil((@{skillValueN1a}+@{skillTypeN1a})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1a}+@{skillTypeN1a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1a' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1a' value=' ' />
@@ -20380,11 +20930,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1b" value="&{template:check} {{name=@{npcName} *uses* @{skillN1b}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1b}+@{skillTypeN1b}]]}}  {{Crit=[[floor((@{skillValueN1b}+@{skillTypeN1b})*0.05)]]}} {{Special=[[floor((@{skillValueN1b}+@{skillTypeN1b})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1b}+@{skillTypeN1b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1b" value="&{template:check} {{name=@{npcName} *uses* @{skillN1b}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1b}+@{skillTypeN1b}]]}}  {{Crit=[[ceil((@{skillValueN1b}+@{skillTypeN1b})*0.05)]]}} {{Special=[[ceil((@{skillValueN1b}+@{skillTypeN1b})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1b}+@{skillTypeN1b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1b' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1b' value=' ' />
@@ -20397,11 +20946,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1c" value="&{template:check} {{name=@{npcName} *uses* @{skillN1c}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1c}+@{skillTypeN1c}]]}}  {{Crit=[[floor((@{skillValueN1c}+@{skillTypeN1c})*0.05)]]}} {{Special=[[floor((@{skillValueN1c}+@{skillTypeN1c})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1c}+@{skillTypeN1c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1c" value="&{template:check} {{name=@{npcName} *uses* @{skillN1c}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1c}+@{skillTypeN1c}]]}}  {{Crit=[[ceil((@{skillValueN1c}+@{skillTypeN1c})*0.05)]]}} {{Special=[[ceil((@{skillValueN1c}+@{skillTypeN1c})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1c}+@{skillTypeN1c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1c' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1c' value=' ' />
@@ -20414,11 +20962,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1d" value="&{template:check} {{name=@{npcName} *uses* @{skillN1d}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1d}+@{skillTypeN1d}]]}}  {{Crit=[[floor((@{skillValueN1d}+@{skillTypeN1d})*0.05)]]}} {{Special=[[floor((@{skillValueN1d}+@{skillTypeN1d})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1d}+@{skillTypeN1d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1d" value="&{template:check} {{name=@{npcName} *uses* @{skillN1d}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1d}+@{skillTypeN1d}]]}}  {{Crit=[[ceil((@{skillValueN1d}+@{skillTypeN1d})*0.05)]]}} {{Special=[[ceil((@{skillValueN1d}+@{skillTypeN1d})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1d}+@{skillTypeN1d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1d' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1d' value=' ' />
@@ -20431,11 +20978,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1e" value="&{template:check} {{name=@{npcName} *uses* @{skillN1e}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1e}+@{skillTypeN1e}]]}}  {{Crit=[[floor((@{skillValueN1e}+@{skillTypeN1e})*0.05)]]}} {{Special=[[floor((@{skillValueN1e}+@{skillTypeN1e})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1e}+@{skillTypeN1e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1e" value="&{template:check} {{name=@{npcName} *uses* @{skillN1e}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1e}+@{skillTypeN1e}]]}}  {{Crit=[[ceil((@{skillValueN1e}+@{skillTypeN1e})*0.05)]]}} {{Special=[[ceil((@{skillValueN1e}+@{skillTypeN1e})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1e}+@{skillTypeN1e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1e' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1e' value=' ' />
@@ -20448,11 +20994,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1f" value="&{template:check} {{name=@{npcName} *uses* @{skillN1f}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1f}+@{skillTypeN1f}]]}}  {{Crit=[[floor((@{skillValueN1f}+@{skillTypeN1f})*0.05)]]}} {{Special=[[floor((@{skillValueN1f}+@{skillTypeN1f})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1f}+@{skillTypeN1f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1f" value="&{template:check} {{name=@{npcName} *uses* @{skillN1f}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1f}+@{skillTypeN1f}]]}}  {{Crit=[[ceil((@{skillValueN1f}+@{skillTypeN1f})*0.05)]]}} {{Special=[[ceil((@{skillValueN1f}+@{skillTypeN1f})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1f}+@{skillTypeN1f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1f' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1f' value=' ' />
@@ -20465,11 +21010,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1g" value="&{template:check} {{name=@{npcName} *uses* @{skillN1g}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1g}+@{skillTypeN1g}]]}}  {{Crit=[[floor((@{skillValueN1g}+@{skillTypeN1g})*0.05)]]}} {{Special=[[floor((@{skillValueN1g}+@{skillTypeN1g})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1g}+@{skillTypeN1g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1g" value="&{template:check} {{name=@{npcName} *uses* @{skillN1g}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1g}+@{skillTypeN1g}]]}}  {{Crit=[[ceil((@{skillValueN1g}+@{skillTypeN1g})*0.05)]]}} {{Special=[[ceil((@{skillValueN1g}+@{skillTypeN1g})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1g}+@{skillTypeN1g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1g' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1g' value=' ' />
@@ -20482,11 +21026,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1h" value="&{template:check} {{name=@{npcName} *uses* @{skillN1h}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1h}+@{skillTypeN1h}]]}}  {{Crit=[[floor((@{skillValueN1h}+@{skillTypeN1h})*0.05)]]}} {{Special=[[floor((@{skillValueN1h}+@{skillTypeN1h})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1h}+@{skillTypeN1h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1h" value="&{template:check} {{name=@{npcName} *uses* @{skillN1h}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1h}+@{skillTypeN1h}]]}}  {{Crit=[[ceil((@{skillValueN1h}+@{skillTypeN1h})*0.05)]]}} {{Special=[[ceil((@{skillValueN1h}+@{skillTypeN1h})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1h}+@{skillTypeN1h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1h' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1h' value=' ' />
@@ -20499,7 +21042,6 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
@@ -20541,7 +21083,7 @@
 		</div>
 
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -322px 0px 0px 400px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>
 
 	<!-- Follower One -->
@@ -20567,37 +21109,69 @@
 
 			<div style="height: 12px"></div>
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Str}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Str}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Str}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Str}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerStrRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Str}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Str}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Str}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Str}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerStrRoll-c">
 				<label class="sheet-charName" data-i18n="str-u">STR</label></button>
 			<input class="sheet-characteristic" style="width: 46px; margin: 0" name="attr_follower1Str" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Siz}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Siz}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Siz}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Siz}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerSizRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Siz}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Siz}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Siz}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Siz}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerSizRoll-c">
 				<label class="sheet-charName" data-i18n="siz-u">SIZ</label></button>
 			<input class="sheet-characteristic" name="attr_follower1Siz" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Pow}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Pow}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Pow}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Pow}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerPowRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Pow}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Pow}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Pow}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Pow}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerPowRoll-c">
 				<label class="sheet-charName" data-i18n="pow-u">POW</label></button>
 			<input class="sheet-characteristic" name="attr_follower1Pow" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Cha}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Cha}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Cha}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Cha}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerChaRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Cha}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Cha}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Cha}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Cha}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerChaRoll-c">
 				<label class="sheet-charName" data-i18n="cha-u">CHA</label></button>
 			<input class="sheet-characteristic" name="attr_follower1Cha" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Con}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Con}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Con}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Con}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerConRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Con}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Con}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Con}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Con}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerConRoll-c">
 				<label class="sheet-charName" data-i18n="con-u">CON</label></button>
 			<input class="sheet-characteristic" name="attr_follower1Con" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Int}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Int}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Int}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Int}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerIntRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Int}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Int}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Int}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Int}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerIntRoll-c">
 				<label class="sheet-charName" data-i18n="int-u">INT</label></button>
 			<input class="sheet-characteristic" name="attr_follower1Int" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Dex}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[floor(@{follower1Dex}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[floor(@{follower1Dex}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower1Dex}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerDexRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{follower1Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{follower1Dex}*@{circumstanceMultiplierFollower1})]]}} {{Crit=[[ceil(@{follower1Dex}*@{circumstanceMultiplierFollower1}*0.05)]]}} {{Special=[[ceil(@{follower1Dex}*@{circumstanceMultiplierFollower1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower1Dex}*@{circumstanceMultiplierFollower1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower1}x}}" data-i18n-title="followerDexRoll-c">
 				<label class="sheet-charName" data-i18n="dex-u">DEX</label></button>
 			<input class="sheet-characteristic" name="attr_follower1Dex" style="width: 46px; margin: 0;" type="text" value=' ' />
 
 			<label class="sheet-charNameNoHover" style="width: 46px;" data-i18n="mov-u">MOV</label>
 			<input class="sheet-characteristic" name="attr_follower1Mov" style="width: 46px; margin: 0;" type="text" value='10' />
-			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 6px 0px 0px 12px; border: 0px solid Red; " data-i18n="circumstance-multiplier-c">Circumstance Multiplier</label>
+				
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 10px 0px 0px 12px; border: 0px solid Red; " data-i18n="spirit-animal-c">Spirit Animal</label>
+				<input type="hidden"  name="attr_follower1_spirit_animal_flag"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_agility"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_communication"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_knowledge"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_manipulation"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_mythic"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_perception"  value="0" />
+				<input type="hidden"  name="attr_follower1_spirit_animal_stealth"  value="0" />
+				
+			<select class="sheet-personal" style="width: 160px; text-align: center; margin: 6px 0px 0px 12px;" name='attr_follower1_spirit_animal'>
+				<option value="" selected></option>
+				<option value="Bear" data-i18n="bear-c" data-i18n-title="mightyDef">Bear</option>
+				<option value="Bull" data-i18n="bull-c" data-i18n-title="mightyDef">Bull</option>
+				<option value="Eagle" data-i18n="eagle-c" data-i18n-title="mightyDef">Eagle</option>
+				<option value="Beaver" data-i18n="beaver-c" data-i18n-title="steadfastDef">Beaver</option>
+				<option value="Gyr Falcon" data-i18n="gyrFalcon-c" data-i18n-title="steadfastDef">Gyr Falcon</option>
+				<option value="Seal" data-i18n="seal-c" data-i18n-title="steadfastDef">Seal</option>
+				<option value="Cat" data-i18n="cat-c" data-i18n-title="spiritualDef">Cat</option>
+				<option value="Golden Plover" data-i18n="goldenPlover-c" data-i18n-title="spiritualDef">Golden Plover</option>
+				<option value="Raven" data-i18n="raven-c" data-i18n-title="spiritualDef">Raven</option>
+				<option value="Goose" data-i18n="goose-c" data-i18n-title="wandererDef">Goose</option>
+				<option value="Horse" data-i18n="horse-c" data-i18n-title="wandererDef">Horse</option>
+				<option value="Wolf" data-i18n="wolf-c" data-i18n-title="wandererDef">Wolf</option>
+				<option value="Owl" data-i18n="owl-c" data-i18n-title="cunningDef">Owl</option>
+				<option value="Snow Fox" data-i18n="snowFox-c" data-i18n-title="cunningDef">Snow Fox</option>
+				<option value="Weasel" data-i18n="weasel-c" data-i18n-title="cunningDef">Weasel</option>
+				<option value="Arctic Tern" data-i18n="arcticTern-c" data-i18n-title="manipulativeDef">Arctic Tern</option>
+				<option value="Dog" data-i18n="dog-c" data-i18n-title="manipulativeDef">Dog</option>
+				<option value="Mouse" data-i18n="mouse-c" data-i18n-title="manipulativeDef">Mouse</option>
+			</select>
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 2px 0px 0px 12px; border: 0px solid Red; " data-i18n="circumstance-multiplier-c">Circumstance Multiplier</label>
 			<select style="display: inline-block; vertical-align: top; width: 160px; height: 26px; margin: 2px 0px 0px 12px;" name="attr_circumstanceMultiplierFollower1">
 				<option value="5" selected data-i18n="simple-c">Simple 5x</option>
 				<option value="4"   data-i18n="easy-c">Easy 4x </option>
@@ -20692,25 +21266,25 @@
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 30px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: right; border: 0px solid Orange;">%</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 114px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon1Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon1}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill1}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage1}+@{follower1DamageMod}]]}}  {{Crit=[[floor((@{follower1WeaponSkill1}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[floor((@{follower1WeaponSkill1}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower1WeaponSkill1}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon1Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon1}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill1}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage1}+@{follower1DamageMod}]]}}  {{Crit=[[ceil((@{follower1WeaponSkill1}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[ceil((@{follower1WeaponSkill1}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower1WeaponSkill1}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; padding: 1px;  border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower1Weapon1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponSkill1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponDamage1' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon2Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon2}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill2}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage2}+@{follower1DamageMod}]]}}  {{Crit=[[floor((@{follower1WeaponSkill2}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[floor((@{follower1WeaponSkill2}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower1WeaponSkill2}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon2Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon2}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill2}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage2}+@{follower1DamageMod}]]}}  {{Crit=[[ceil((@{follower1WeaponSkill2}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[ceil((@{follower1WeaponSkill2}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower1WeaponSkill2}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower1Weapon2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponSkill2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponDamage2' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon3Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon3}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill3}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage3}+@{follower1DamageMod}]]}}  {{Crit=[[floor((@{follower1WeaponSkill3}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[floor((@{follower1WeaponSkill3}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower1WeaponSkill3}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon3Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon3}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill3}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage3}+@{follower1DamageMod}]]}}  {{Crit=[[ceil((@{follower1WeaponSkill3}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[ceil((@{follower1WeaponSkill3}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower1WeaponSkill3}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower1Weapon3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponSkill3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponDamage3' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon4Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon4}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill4}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage4}+@{follower1DamageMod}]]}}  {{Crit=[[floor((@{follower1WeaponSkill4}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[floor((@{follower1WeaponSkill4}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower1WeaponSkill4}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1Weapon4Check" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Weapon4}}} {{Check=[[1]]}} {{DL=[[@{follower1WeaponSkill4}+@{meleeWeaponsModF1}]]}}{{Damage=[[@{follower1WeaponDamage4}+@{follower1DamageMod}]]}}  {{Crit=[[ceil((@{follower1WeaponSkill4}+@{meleeWeaponsModF1})*0.05)]]}} {{Special=[[ceil((@{follower1WeaponSkill4}+@{meleeWeaponsModF1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower1WeaponSkill4}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower1Weapon4' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1WeaponSkill4' value=' ' />
@@ -20727,7 +21301,7 @@
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 90px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 26px;  color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1ShieldCheck" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Shield}}} {{Check=[[1]]}} {{DL=[[@{follower1ShieldValue}]]}} {{Damage=[[@{follower1ShieldDamage}+@{follower1DamageMod}]]}}  {{Crit=[[floor(@{follower1ShieldValue}*0.05)]]}} {{Special=[[floor(@{follower1ShieldValue}*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower1ShieldValue}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerShieldRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower1ShieldCheck" value="&{template:check} {{name=@{follower1Name} *attacks with* @{follower1Shield}}} {{Check=[[1]]}} {{DL=[[@{follower1ShieldValue}]]}} {{Damage=[[@{follower1ShieldDamage}+@{follower1DamageMod}]]}}  {{Crit=[[ceil(@{follower1ShieldValue}*0.05)]]}} {{Special=[[ceil(@{follower1ShieldValue}*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower1ShieldValue}+@{meleeWeaponsModF1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="followerShieldRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:  82px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower1Shield' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower1ShieldValue' value=' ' />
@@ -20736,7 +21310,7 @@
 			<!-- Skills -->
 				<label style="display: inline-block; vertical-align: top; height: 18px; width: 265px; color: Black; margin:  12px 0px 2px 2px; font-family: 'Noto Serif'; font-weight: 400; font-size: 16px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="skills-u">SKILLS</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1a" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1a}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1a}+@{skillTypeF1a}]]}}  {{Crit=[[floor((@{skillValueF1a}+@{skillTypeF1a})*0.05)]]}} {{Special=[[floor((@{skillValueF1a}+@{skillTypeF1a})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1a}+@{skillTypeF1a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1a" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1a}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1a}+@{skillTypeF1a}]]}}  {{Crit=[[ceil((@{skillValueF1a}+@{skillTypeF1a})*0.05)]]}} {{Special=[[ceil((@{skillValueF1a}+@{skillTypeF1a})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1a}+@{skillTypeF1a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1a' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1a' value=' ' />
@@ -20749,11 +21323,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1b" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1b}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1b}+@{skillTypeF1b}]]}}  {{Crit=[[floor((@{skillValueF1b}+@{skillTypeF1b})*0.05)]]}} {{Special=[[floor((@{skillValueF1b}+@{skillTypeF1b})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1b}+@{skillTypeF1b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1b" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1b}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1b}+@{skillTypeF1b}]]}}  {{Crit=[[ceil((@{skillValueF1b}+@{skillTypeF1b})*0.05)]]}} {{Special=[[ceil((@{skillValueF1b}+@{skillTypeF1b})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1b}+@{skillTypeF1b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1b' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1b' value=' ' />
@@ -20766,11 +21339,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1c" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1c}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1c}+@{skillTypeF1c}]]}}  {{Crit=[[floor((@{skillValueF1c}+@{skillTypeF1c})*0.05)]]}} {{Special=[[floor((@{skillValueF1c}+@{skillTypeF1c})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1c}+@{skillTypeF1c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1c" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1c}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1c}+@{skillTypeF1c}]]}}  {{Crit=[[ceil((@{skillValueF1c}+@{skillTypeF1c})*0.05)]]}} {{Special=[[ceil((@{skillValueF1c}+@{skillTypeF1c})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1c}+@{skillTypeF1c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1c' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1c' value=' ' />
@@ -20783,11 +21355,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1d" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1d}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1d}+@{skillTypeF1d}]]}}  {{Crit=[[floor((@{skillValueF1d}+@{skillTypeF1d})*0.05)]]}} {{Special=[[floor((@{skillValueF1d}+@{skillTypeF1d})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1d}+@{skillTypeF1d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1d" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1d}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1d}+@{skillTypeF1d}]]}}  {{Crit=[[ceil((@{skillValueF1d}+@{skillTypeF1d})*0.05)]]}} {{Special=[[ceil((@{skillValueF1d}+@{skillTypeF1d})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1d}+@{skillTypeF1d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1d' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1d' value=' ' />
@@ -20800,11 +21371,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1e" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1e}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1e}+@{skillTypeF1e}]]}}  {{Crit=[[floor((@{skillValueF1e}+@{skillTypeF1e})*0.05)]]}} {{Special=[[floor((@{skillValueF1e}+@{skillTypeF1e})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1e}+@{skillTypeF1e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1e" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1e}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1e}+@{skillTypeF1e}]]}}  {{Crit=[[ceil((@{skillValueF1e}+@{skillTypeF1e})*0.05)]]}} {{Special=[[ceil((@{skillValueF1e}+@{skillTypeF1e})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1e}+@{skillTypeF1e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1e' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1e' value=' ' />
@@ -20817,11 +21387,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1f" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1f}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1f}+@{skillTypeF1f}]]}}  {{Crit=[[floor((@{skillValueF1f}+@{skillTypeF1f})*0.05)]]}} {{Special=[[floor((@{skillValueF1f}+@{skillTypeF1f})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1f}+@{skillTypeF1f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1f" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1f}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1f}+@{skillTypeF1f}]]}}  {{Crit=[[ceil((@{skillValueF1f}+@{skillTypeF1f})*0.05)]]}} {{Special=[[ceil((@{skillValueF1f}+@{skillTypeF1f})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1f}+@{skillTypeF1f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1f' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1f' value=' ' />
@@ -20834,11 +21403,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1g" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1g}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1g}+@{skillTypeF1g}]]}}  {{Crit=[[floor((@{skillValueF1g}+@{skillTypeF1g})*0.05)]]}} {{Special=[[floor((@{skillValueF1g}+@{skillTypeF1g})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1g}+@{skillTypeF1g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1g" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1g}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1g}+@{skillTypeF1g}]]}}  {{Crit=[[ceil((@{skillValueF1g}+@{skillTypeF1g})*0.05)]]}} {{Special=[[ceil((@{skillValueF1g}+@{skillTypeF1g})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1g}+@{skillTypeF1g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1g' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1g' value=' ' />
@@ -20851,11 +21419,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1h" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1h}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1h}+@{skillTypeF1h}]]}}  {{Crit=[[floor((@{skillValueF1h}+@{skillTypeF1h})*0.05)]]}} {{Special=[[floor((@{skillValueF1h}+@{skillTypeF1h})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1h}+@{skillTypeF1h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1h" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1h}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1h}+@{skillTypeF1h}]]}}  {{Crit=[[ceil((@{skillValueF1h}+@{skillTypeF1h})*0.05)]]}} {{Special=[[ceil((@{skillValueF1h}+@{skillTypeF1h})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1h}+@{skillTypeF1h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1h' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1h' value=' ' />
@@ -20868,11 +21435,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1i" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1i}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1i}+@{skillTypeF1i}]]}}  {{Crit=[[floor((@{skillValueF1i}+@{skillTypeF1i})*0.05)]]}} {{Special=[[floor((@{skillValueF1i}+@{skillTypeF1i})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1i}+@{skillTypeF1i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1i" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1i}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1i}+@{skillTypeF1i}]]}}  {{Crit=[[ceil((@{skillValueF1i}+@{skillTypeF1i})*0.05)]]}} {{Special=[[ceil((@{skillValueF1i}+@{skillTypeF1i})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1i}+@{skillTypeF1i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1i' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1i' value=' ' />
@@ -20885,11 +21451,10 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1j" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1j}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1j}+@{skillTypeF1j}]]}}  {{Crit=[[floor((@{skillValueF1j}+@{skillTypeF1j})*0.05)]]}} {{Special=[[floor((@{skillValueF1j}+@{skillTypeF1j})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF1j}+@{skillTypeF1j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF1j" value="&{template:check} {{name=@{follower1Name} *uses* @{skillF1j}}} {{Check=[[1]]}} {{DL=[[@{skillValueF1j}+@{skillTypeF1j}]]}}  {{Crit=[[ceil((@{skillValueF1j}+@{skillTypeF1j})*0.05)]]}} {{Special=[[ceil((@{skillValueF1j}+@{skillTypeF1j})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF1j}+@{skillTypeF1j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF1j' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF1j' value=' ' />
@@ -20902,7 +21467,6 @@
 					<option value="@{mythicModF1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 			</div>
@@ -20973,37 +21537,69 @@
 
 			<div style="height: 12px"></div>
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Str}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Str}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Str}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Str}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerStrRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Str}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Str}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Str}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Str}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerStrRoll-c">
 				<label class="sheet-charName" data-i18n="str-u">STR</label></button>
 			<input class="sheet-characteristic" style="width: 46px; margin: 0" name="attr_follower2Str" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Siz}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Siz}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Siz}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Siz}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerSizRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Siz}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Siz}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Siz}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Siz}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerSizRoll-c">
 				<label class="sheet-charName" data-i18n="siz-u">SIZ</label></button>
 			<input class="sheet-characteristic" name="attr_follower2Siz" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Pow}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Pow}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Pow}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Pow}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerPowRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Pow}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Pow}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Pow}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Pow}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerPowRoll-c">
 				<label class="sheet-charName" data-i18n="pow-u">POW</label></button>
 			<input class="sheet-characteristic" name="attr_follower2Pow" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Cha}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Cha}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Cha}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Cha}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerChaRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Cha}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Cha}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Cha}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Cha}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerChaRoll-c">
 				<label class="sheet-charName" data-i18n="cha-u">CHA</label></button>
 			<input class="sheet-characteristic" name="attr_follower2Cha" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Con}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Con}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Con}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Con}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerConRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Con}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Con}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Con}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Con}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerConRoll-c">
 				<label class="sheet-charName" data-i18n="con-u">CON</label></button>
 			<input class="sheet-characteristic" name="attr_follower2Con" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Int}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Int}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Int}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Int}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerIntRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Int}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Int}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Int}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Int}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerIntRoll-c">
 				<label class="sheet-charName" data-i18n="int-u">INT</label></button>
 			<input class="sheet-characteristic" name="attr_follower2Int" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Dex}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[floor(@{follower2Dex}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[floor(@{follower2Dex}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{follower2Dex}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerDexRoll-c">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{follower2Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{follower2Dex}*@{circumstanceMultiplierFollower2})]]}} {{Crit=[[ceil(@{follower2Dex}*@{circumstanceMultiplierFollower2}*0.05)]]}} {{Special=[[ceil(@{follower2Dex}*@{circumstanceMultiplierFollower2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{follower2Dex}*@{circumstanceMultiplierFollower2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierFollower2}x}}" data-i18n-title="followerDexRoll-c">
 				<label class="sheet-charName" data-i18n="dex-u">DEX</label></button>
 			<input class="sheet-characteristic" name="attr_follower2Dex" style="width: 46px; margin: 0;" type="text" value=' ' />
 
 			<label class="sheet-charNameNoHover" style="width: 46px;" data-i18n="mov-u">MOV</label>
 			<input class="sheet-characteristic" name="attr_follower2Mov" style="width: 46px; margin: 0;" type="text" value='10' />
-			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 6px 0px 0px 12px; border: 0px solid Red;" data-i18n="circumstance-multiplier-c">Circumstance Multiplier</label>
+				
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 10px 0px 0px 12px; border: 0px solid Red; " data-i18n="spirit-animal-c">Spirit Animal</label>
+				<input type="hidden"  name="attr_follower2_spirit_animal_agility"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_communication"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_knowledge"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_manipulation"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_mythic"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_perception"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_stealth"  value="0" />
+				<input type="hidden"  name="attr_follower2_spirit_animal_flag"  value="0" />
+				
+			<select class="sheet-personal" style="width: 160px; text-align: center; margin: 6px 0px 0px 12px;" name='attr_follower2_spirit_animal'>
+				<option value="" selected></option>
+				<option value="Bear" data-i18n="bear-c" data-i18n-title="mightyDef">Bear</option>
+				<option value="Bull" data-i18n="bull-c" data-i18n-title="mightyDef">Bull</option>
+				<option value="Eagle" data-i18n="eagle-c" data-i18n-title="mightyDef">Eagle</option>
+				<option value="Beaver" data-i18n="beaver-c" data-i18n-title="steadfastDef">Beaver</option>
+				<option value="Gyr Falcon" data-i18n="gyrFalcon-c" data-i18n-title="steadfastDef">Gyr Falcon</option>
+				<option value="Seal" data-i18n="seal-c" data-i18n-title="steadfastDef">Seal</option>
+				<option value="Cat" data-i18n="cat-c" data-i18n-title="spiritualDef">Cat</option>
+				<option value="Golden Plover" data-i18n="goldenPlover-c" data-i18n-title="spiritualDef">Golden Plover</option>
+				<option value="Raven" data-i18n="raven-c" data-i18n-title="spiritualDef">Raven</option>
+				<option value="Goose" data-i18n="goose-c" data-i18n-title="wandererDef">Goose</option>
+				<option value="Horse" data-i18n="horse-c" data-i18n-title="wandererDef">Horse</option>
+				<option value="Wolf" data-i18n="wolf-c" data-i18n-title="wandererDef">Wolf</option>
+				<option value="Owl" data-i18n="owl-c" data-i18n-title="cunningDef">Owl</option>
+				<option value="Snow Fox" data-i18n="snowFox-c" data-i18n-title="cunningDef">Snow Fox</option>
+				<option value="Weasel" data-i18n="weasel-c" data-i18n-title="cunningDef">Weasel</option>
+				<option value="Arctic Tern" data-i18n="arcticTern-c" data-i18n-title="manipulativeDef">Arctic Tern</option>
+				<option value="Dog" data-i18n="dog-c" data-i18n-title="manipulativeDef">Dog</option>
+				<option value="Mouse" data-i18n="mouse-c" data-i18n-title="manipulativeDef">Mouse</option>
+			</select>
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 2px 0px 0px 12px; border: 0px solid Red; " data-i18n="circumstance-multiplier-c">Circumstance Multiplier</label>
 			<select style="display: inline-block; vertical-align: top; width: 160px; height: 26px; margin: 2px 0px 0px 12px;" name="attr_circumstanceMultiplierFollower2">
 				<option value="5" selected data-i18n="simple-c">Simple 5x</option>
 				<option value="4"   data-i18n="easy-c">Easy 4x </option>
@@ -21098,25 +21694,25 @@
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 30px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: right; border: 0px solid Orange;">%</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 114px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon1Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon1}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage1}+@{follower2DamageMod}]]}}  {{Crit=[[floor((@{follower2WeaponSkill1}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[floor((@{follower2WeaponSkill1}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower2WeaponSkill1}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon1Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon1}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage1}+@{follower2DamageMod}]]}}  {{Crit=[[ceil((@{follower2WeaponSkill1}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[ceil((@{follower2WeaponSkill1}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower2WeaponSkill1}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; padding: 1px;  border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower2Weapon1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponSkill1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponDamage1' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon2Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon2}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage2}+@{follower2DamageMod}]]}}  {{Crit=[[floor((@{follower2WeaponSkill2}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[floor((@{follower2WeaponSkill2}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower2WeaponSkill2}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon2Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon2}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage2}+@{follower2DamageMod}]]}}  {{Crit=[[ceil((@{follower2WeaponSkill2}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[ceil((@{follower2WeaponSkill2}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower2WeaponSkill2}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower2Weapon2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponSkill2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponDamage2' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon3Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon3}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage3}+@{follower2DamageMod}]]}}  {{Crit=[[floor((@{follower2WeaponSkill3}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[floor((@{follower2WeaponSkill3}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower2WeaponSkill3}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon3Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon3}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage3}+@{follower2DamageMod}]]}}  {{Crit=[[ceil((@{follower2WeaponSkill3}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[ceil((@{follower2WeaponSkill3}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower2WeaponSkill3}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower2Weapon3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponSkill3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponDamage3' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon4Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon4}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage4}+@{follower2DamageMod}]]}}  {{Crit=[[floor((@{follower2WeaponSkill4}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[floor((@{follower2WeaponSkill4}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower2WeaponSkill4}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2Weapon4Check" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Weapon4}}} {{Check=[[1]]}} {{DL=[[@{follower2WeaponSkill1}+@{meleeWeaponsModF2}]]}}{{Damage=[[@{follower2WeaponDamage4}+@{follower2DamageMod}]]}}  {{Crit=[[ceil((@{follower2WeaponSkill4}+@{meleeWeaponsModF2})*0.05)]]}} {{Special=[[ceil((@{follower2WeaponSkill4}+@{meleeWeaponsModF2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower2WeaponSkill4}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerWeaponSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower2Weapon4' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2WeaponSkill4' value=' ' />
@@ -21133,7 +21729,7 @@
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 90px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 26px;  color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2ShieldCheck" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Shield}}} {{Check=[[1]]}} {{DL=[[@{follower2ShieldValue}]]}} {{Damage=[[@{follower2ShieldDamage}+@{follower2DamageMod}]]}}  {{Crit=[[floor(@{follower2ShieldValue}*0.05)]]}} {{Special=[[floor(@{follower2ShieldValue}*0.2)]]}}  {{Fumble=[[100-floor((100-(@{follower2ShieldValue}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerShieldRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_follower2ShieldCheck" value="&{template:check} {{name=@{follower2Name} *attacks with* @{follower2Shield}}} {{Check=[[1]]}} {{DL=[[@{follower2ShieldValue}]]}} {{Damage=[[@{follower2ShieldDamage}+@{follower2DamageMod}]]}}  {{Crit=[[ceil(@{follower2ShieldValue}*0.05)]]}} {{Special=[[ceil(@{follower2ShieldValue}*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{follower2ShieldValue}+@{meleeWeaponsModF2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}"  data-i18n-title="followerShieldRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:  82px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_follower2Shield' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_follower2ShieldValue' value=' ' />
@@ -21142,7 +21738,7 @@
 			<!-- Skills -->
 				<label style="display: inline-block; vertical-align: top; height: 18px; width: 265px; color: Black; margin:  12px 0px 2px 2px; font-family: 'Noto Serif'; font-weight: 400; font-size: 16px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="skills-u">SKILLS</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2a" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2a}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2a}+@{skillTypeF2a}]]}}  {{Crit=[[floor((@{skillValueF2a}+@{skillTypeF2a})*0.05)]]}} {{Special=[[floor((@{skillValueF2a}+@{skillTypeF2a})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2a}+@{skillTypeF2a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2a" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2a}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2a}+@{skillTypeF2a}]]}}  {{Crit=[[ceil((@{skillValueF2a}+@{skillTypeF2a})*0.05)]]}} {{Special=[[ceil((@{skillValueF2a}+@{skillTypeF2a})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2a}+@{skillTypeF2a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2a' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2a' value=' ' />
@@ -21155,11 +21751,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2b" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2b}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2b}+@{skillTypeF2b}]]}}  {{Crit=[[floor((@{skillValueF2b}+@{skillTypeF2b})*0.05)]]}} {{Special=[[floor((@{skillValueF2b}+@{skillTypeF2b})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2b}+@{skillTypeF2b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2b" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2b}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2b}+@{skillTypeF2b}]]}}  {{Crit=[[ceil((@{skillValueF2b}+@{skillTypeF2b})*0.05)]]}} {{Special=[[ceil((@{skillValueF2b}+@{skillTypeF2b})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2b}+@{skillTypeF2b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2b' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2b' value=' ' />
@@ -21172,11 +21767,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2c" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2c}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2c}+@{skillTypeF2c}]]}}  {{Crit=[[floor((@{skillValueF2c}+@{skillTypeF2c})*0.05)]]}} {{Special=[[floor((@{skillValueF2c}+@{skillTypeF2c})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2c}+@{skillTypeF2c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2c" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2c}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2c}+@{skillTypeF2c}]]}}  {{Crit=[[ceil((@{skillValueF2c}+@{skillTypeF2c})*0.05)]]}} {{Special=[[ceil((@{skillValueF2c}+@{skillTypeF2c})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2c}+@{skillTypeF2c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2c' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2c' value=' ' />
@@ -21189,11 +21783,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2d" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2d}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2d}+@{skillTypeF2d}]]}}  {{Crit=[[floor((@{skillValueF2d}+@{skillTypeF2d})*0.05)]]}} {{Special=[[floor((@{skillValueF2d}+@{skillTypeF2d})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2d}+@{skillTypeF2d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2d" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2d}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2d}+@{skillTypeF2d}]]}}  {{Crit=[[ceil((@{skillValueF2d}+@{skillTypeF2d})*0.05)]]}} {{Special=[[ceil((@{skillValueF2d}+@{skillTypeF2d})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2d}+@{skillTypeF2d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2d' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2d' value=' ' />
@@ -21206,11 +21799,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2e" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2e}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2e}+@{skillTypeF2e}]]}}  {{Crit=[[floor((@{skillValueF2e}+@{skillTypeF2e})*0.05)]]}} {{Special=[[floor((@{skillValueF2e}+@{skillTypeF2e})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2e}+@{skillTypeF2e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2e" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2e}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2e}+@{skillTypeF2e}]]}}  {{Crit=[[ceil((@{skillValueF2e}+@{skillTypeF2e})*0.05)]]}} {{Special=[[ceil((@{skillValueF2e}+@{skillTypeF2e})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2e}+@{skillTypeF2e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2e' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2e' value=' ' />
@@ -21223,11 +21815,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2f" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2f}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2f}+@{skillTypeF2f}]]}}  {{Crit=[[floor((@{skillValueF2f}+@{skillTypeF2f})*0.05)]]}} {{Special=[[floor((@{skillValueF2f}+@{skillTypeF2f})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2f}+@{skillTypeF2f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2f" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2f}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2f}+@{skillTypeF2f}]]}}  {{Crit=[[ceil((@{skillValueF2f}+@{skillTypeF2f})*0.05)]]}} {{Special=[[ceil((@{skillValueF2f}+@{skillTypeF2f})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2f}+@{skillTypeF2f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2f' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2f' value=' ' />
@@ -21240,11 +21831,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2g" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2g}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2g}+@{skillTypeF2g}]]}}  {{Crit=[[floor((@{skillValueF2g}+@{skillTypeF2g})*0.05)]]}} {{Special=[[floor((@{skillValueF2g}+@{skillTypeF2g})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2g}+@{skillTypeF2g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2g" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2g}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2g}+@{skillTypeF2g}]]}}  {{Crit=[[ceil((@{skillValueF2g}+@{skillTypeF2g})*0.05)]]}} {{Special=[[ceil((@{skillValueF2g}+@{skillTypeF2g})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2g}+@{skillTypeF2g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2g' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2g' value=' ' />
@@ -21257,11 +21847,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2h" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2h}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2h}+@{skillTypeF2h}]]}}  {{Crit=[[floor((@{skillValueF2h}+@{skillTypeF2h})*0.05)]]}} {{Special=[[floor((@{skillValueF2h}+@{skillTypeF2h})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2h}+@{skillTypeF2h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2h" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2h}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2h}+@{skillTypeF2h}]]}}  {{Crit=[[ceil((@{skillValueF2h}+@{skillTypeF2h})*0.05)]]}} {{Special=[[ceil((@{skillValueF2h}+@{skillTypeF2h})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2h}+@{skillTypeF2h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2h' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2h' value=' ' />
@@ -21274,11 +21863,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2i" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2i}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2i}+@{skillTypeF2i}]]}}  {{Crit=[[floor((@{skillValueF2i}+@{skillTypeF2i})*0.05)]]}} {{Special=[[floor((@{skillValueF2i}+@{skillTypeF2i})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2i}+@{skillTypeF2i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2i" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2i}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2i}+@{skillTypeF2i}]]}}  {{Crit=[[ceil((@{skillValueF2i}+@{skillTypeF2i})*0.05)]]}} {{Special=[[ceil((@{skillValueF2i}+@{skillTypeF2i})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2i}+@{skillTypeF2i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2i' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2i' value=' ' />
@@ -21291,11 +21879,10 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2j" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2j}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2j}+@{skillTypeF2j}]]}}  {{Crit=[[floor((@{skillValueF2j}+@{skillTypeF2j})*0.05)]]}} {{Special=[[floor((@{skillValueF2j}+@{skillTypeF2j})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueF2j}+@{skillTypeF2j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillF2j" value="&{template:check} {{name=@{follower2Name} *uses* @{skillF2j}}} {{Check=[[1]]}} {{DL=[[@{skillValueF2j}+@{skillTypeF2j}]]}}  {{Crit=[[ceil((@{skillValueF2j}+@{skillTypeF2j})*0.05)]]}} {{Special=[[ceil((@{skillValueF2j}+@{skillTypeF2j})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueF2j}+@{skillTypeF2j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="followerSkillRoll-c">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillF2j' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueF2j' value=' ' />
@@ -21308,7 +21895,6 @@
 					<option value="@{mythicModF2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModF2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModF2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModF2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 			</div>
@@ -21354,9 +21940,10 @@
 			</div>	
 		</div>		
 		</div> <!-- Cat Herding -->
-		<div class="catHerding" style="width: 300px; height: 200px; margin: -170px 0px 0px 530px; transform: scale(-1, -1); opacity: 0.6;" >
+<!--		<div class="catHerding" style="width: 300px; height: 200px; margin: -170px 0px 0px 530px; transform: scale(-1, -1); opacity: 0.6;" > -->
+		<div class="catHerding" style="width: 300px; height: 200px; margin: -120px 0px 0px 530px; transform: scale(-1, -1); opacity: 0.6;" >
 <!--		<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true"> -->
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 			<!-- Disclaimer -->
 			<label style=" height: 9px; width: 846px; color: Black; margin: 10px 0px 10px 0px; font-family: Arial;  font-size: 6.9px; padding: 0px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="disclaimer">
@@ -21378,14 +21965,14 @@
 		</div>
 -->
 		<div class="catHerding" style="width: 300px; height: 200px; margin: 0px 0px 0px 0px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 		<label style="display: inline-block; vertical-align: top; height: 32px; width: 300px; color: rgb(69,109,91); margin: 46px 0px 0px -220px; font-family: Belleza; font-stretch: ultra-condensed; font-size: 30px; text-align: center; border: 0px solid Black;" data-i18n="opponent-sheet-u">OPPONENT SHEET</label>
 		<div class="catHerding" style="width: 250px; height: 110px; margin: 16px 0px 0px 100px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-logo.svg?raw=true">
 		</div>
 		<div class="catHerding" style="transform: rotate(90deg); width: 13.3px; height: 680px; margin: -216px 0px 0px -350px; border: 0px solid Red;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-rule-color.svg?raw=true">
 		</div>
 
 		<div style="width: 826px; height: 1500px; margin: -334px 0px 0px 6px; border: 0px solid Red;">
@@ -21414,36 +22001,69 @@
 
 			<div style="height: 12px"></div>
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Str}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Str}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Str}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Str}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcStrRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Str}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Str}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Str}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Str}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcStrRoll">
 				<label class="sheet-charName" data-i18n="str-u">STR</label></button>
 			<input class="sheet-characteristic" style="width: 46px; margin: 0" name="attr_npc1Str" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Siz}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Siz}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Siz}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Siz}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcSizRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Siz}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Siz}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Siz}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Siz}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcSizRoll">
 				<label class="sheet-charName" data-i18n="siz-u">SIZ</label></button>
 			<input class="sheet-characteristic" name="attr_npc1Siz" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Pow}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Pow}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Pow}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Pow}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcPowRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Pow}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Pow}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Pow}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Pow}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcPowRoll">
 				<label class="sheet-charName" data-i18n="pow-u">POW</label></button>
 			<input class="sheet-characteristic" name="attr_npc1Pow" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Cha}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Cha}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Cha}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Cha}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcChaRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Cha}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Cha}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Cha}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Cha}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcChaRoll">
 				<label class="sheet-charName" data-i18n="cha-u">CHA</label></button>
 			<input class="sheet-characteristic" name="attr_npc1Cha" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Con}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Con}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Con}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Con}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcConRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Con}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Con}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Con}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Con}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcConRoll">
 				<label class="sheet-charName" data-i18n="con-u">CON</label></button>
 			<input class="sheet-characteristic" name="attr_npc1Con" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Int}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Int}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Int}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Int}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcIntRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Int}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Int}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Int}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Int}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcIntRoll">
 				<label class="sheet-charName" data-i18n="int-u">INT</label></button>
 			<input class="sheet-characteristic" name="attr_npc1Int" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Dex}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[floor(@{npc1Dex}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[floor(@{npc1Dex}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc1Dex}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcDexRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{npc1Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{npc1Dex}*@{circumstanceMultiplierNPC1})]]}} {{Crit=[[ceil(@{npc1Dex}*@{circumstanceMultiplierNPC1}*0.05)]]}} {{Special=[[ceil(@{npc1Dex}*@{circumstanceMultiplierNPC1}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc1Dex}*@{circumstanceMultiplierNPC1})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC1}x}}" data-i18n-title="npcDexRoll">
 				<label class="sheet-charName" data-i18n="dex-u">DEX</label></button>
 			<input class="sheet-characteristic" name="attr_npc1Dex" style="width: 46px; margin: 0;" type="text" value=' ' />
 
 			<label class="sheet-charNameNoHover" style="width: 46px;" data-i18n="mov-u">MOV</label>
 			<input class="sheet-characteristic" name="attr_npc1Mov" style="width: 46px; margin: 0;" type="text" value='10' />
+				
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 10px 0px 0px 12px; border: 0px solid Red; " data-i18n="spirit-animal-c">Spirit Animal</label>
+				<input type="hidden"  name="attr_npc1_spirit_animal_agility"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_communication"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_knowledge"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_manipulation"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_mythic"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_perception"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_stealth"  value="0" />
+				<input type="hidden"  name="attr_npc1_spirit_animal_flag"  value="0" />
+				
+			<select class="sheet-personal" style="width: 160px; text-align: center; margin: 6px 0px 0px 12px;" name='attr_npc1_spirit_animal'>
+				<option value="" selected></option>
+				<option value="Bear" data-i18n="bear-c" data-i18n-title="mightyDef">Bear</option>
+				<option value="Bull" data-i18n="bull-c" data-i18n-title="mightyDef">Bull</option>
+				<option value="Eagle" data-i18n="eagle-c" data-i18n-title="mightyDef">Eagle</option>
+				<option value="Beaver" data-i18n="beaver-c" data-i18n-title="steadfastDef">Beaver</option>
+				<option value="Gyr Falcon" data-i18n="gyrFalcon-c" data-i18n-title="steadfastDef">Gyr Falcon</option>
+				<option value="Seal" data-i18n="seal-c" data-i18n-title="steadfastDef">Seal</option>
+				<option value="Cat" data-i18n="cat-c" data-i18n-title="spiritualDef">Cat</option>
+				<option value="Golden Plover" data-i18n="goldenPlover-c" data-i18n-title="spiritualDef">Golden Plover</option>
+				<option value="Raven" data-i18n="raven-c" data-i18n-title="spiritualDef">Raven</option>
+				<option value="Goose" data-i18n="goose-c" data-i18n-title="wandererDef">Goose</option>
+				<option value="Horse" data-i18n="horse-c" data-i18n-title="wandererDef">Horse</option>
+				<option value="Wolf" data-i18n="wolf-c" data-i18n-title="wandererDef">Wolf</option>
+				<option value="Owl" data-i18n="owl-c" data-i18n-title="cunningDef">Owl</option>
+				<option value="Snow Fox" data-i18n="snowFox-c" data-i18n-title="cunningDef">Snow Fox</option>
+				<option value="Weasel" data-i18n="weasel-c" data-i18n-title="cunningDef">Weasel</option>
+				<option value="Arctic Tern" data-i18n="arcticTern-c" data-i18n-title="manipulativeDef">Arctic Tern</option>
+				<option value="Dog" data-i18n="dog-c" data-i18n-title="manipulativeDef">Dog</option>
+				<option value="Mouse" data-i18n="mouse-c" data-i18n-title="manipulativeDef">Mouse</option>
+			</select>
+
 			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 6px 0px 0px 12px; border: 0px solid Red; " data-i18n="circumstance-multiplier-c">Circumstance Multiplier</label>
 			<select style="display: inline-block; vertical-align: top; width: 160px; height: 26px; margin: 2px 0px 0px 12px;" name="attr_circumstanceMultiplierNPC1">
 				<option value="5" selected data-i18n="simple-c">Simple 5x</option>
@@ -21471,26 +22091,26 @@
 				<label style="display: inline-block; vertical-align: top; height: 14px; width: 58px; color: Black; margin: 10px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="ap-u">AP</label>
 				<label style="display: inline-block; vertical-align: top; height: 14px; width: 58px; color: Black; margin: 10px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="head-u">HEAD</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">19-20</label>
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN1Loc' value='Head' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN1Roll' value='19-20' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apHeadMaxN1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpHeadN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpHeadMaxN1' value=' ' />
-	
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="left-arm-u">LEFT ARM</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">16-18</label>
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmN1Loc' value='Left Arm' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmN1Roll' value='16-18' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmMaxN1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftArmN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftArmMaxN1' value=' ' />
-	
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="right-arm-u">RIGHT ARM</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">13-15</label>
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmN1Loc' value='Right Arm' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmN1Roll' value='13-15' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmMaxN1' value=' ' />
@@ -21498,8 +22118,8 @@
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpRightArmMaxN1' value=' ' />
 	
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="chest-u">CHEST</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">12</label>
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apChestN1Loc' value='Chest' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apChestN1Roll' value='12' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apChestN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apChestMaxN1' value=' ' />
@@ -21507,8 +22127,8 @@
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpChestMaxN1' value=' ' />
 	
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="abdomen-u">ABDOMEN</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">09-11</label>
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenN1Loc' value='Abdomen' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenN1Roll' value='09-11' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenMaxN1' value=' ' />
@@ -21516,8 +22136,8 @@
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpAbdomenMaxN1' value=' ' />
 		
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="left-leg-u">LEFT LEG</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">05-08</label>
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegN1Loc' value='Left Leg' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegN1Roll' value='05-08' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegMaxN1' value=' ' />
@@ -21525,8 +22145,8 @@
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftLegMaxN1' value=' ' />
 	
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="right-leg-u">RIGHT LEG</label>
-				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">01-04</label>
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegN1Loc' value='Right Leg' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegN1Roll' value='01-04' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegN1' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegMaxN1' value=' ' />
@@ -21534,30 +22154,57 @@
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpRightLegMaxN1' value=' ' />
 
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1N1Loc' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1N1Roll' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1N1' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1MaxN1' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra1N1' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra1MaxN1' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2N1Loc' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2N1Roll' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2N1' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2MaxN1' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra2N1' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra2MaxN1' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3N1Loc' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3N1Roll' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3N1' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3MaxN1' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra3N1' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra3MaxN1' value=' ' />
+
 
 				<label style="display: inline-block; vertical-align: top; height: 16px; width:  90px; color: Black; margin: 6px 0px 2px 24px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="weapon-u">WEAPON</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 30px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: right; border: 0px solid Orange;">%</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 114px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon1Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon1}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage1}+@{npc1DamageMod}]]}}  {{Crit=[[floor((@{npc1WeaponSkill1}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npc1WeaponSkill1}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npc1WeaponSkill1}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon1Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon1}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage1}+@{npc1DamageMod}]]}}  {{Crit=[[ceil((@{npc1WeaponSkill1}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npc1WeaponSkill1}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npc1WeaponSkill1}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; padding: 1px;  border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc1Weapon1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponSkill1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponDamage1' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon2Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon2}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage2}+@{npc1DamageMod}]]}}  {{Crit=[[floor((@{npc1WeaponSkill2}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npc1WeaponSkill2}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npc1WeaponSkill2}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon2Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon2}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage2}+@{npc1DamageMod}]]}}  {{Crit=[[ceil((@{npc1WeaponSkill2}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npc1WeaponSkill2}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npc1WeaponSkill2}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc1Weapon2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponSkill2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponDamage2' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon3Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon3}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage3}+@{npc1DamageMod}]]}}  {{Crit=[[floor((@{npc1WeaponSkill3}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npc1WeaponSkill3}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npc1WeaponSkill3}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon3Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon3}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage3}+@{npc1DamageMod}]]}}  {{Crit=[[ceil((@{npc1WeaponSkill3}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npc1WeaponSkill3}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npc1WeaponSkill3}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc1Weapon3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponSkill3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponDamage3' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon4Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon4}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage4}+@{npc1DamageMod}]]}}  {{Crit=[[floor((@{npc1WeaponSkill4}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[floor((@{npc1WeaponSkill4}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npc1WeaponSkill4}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1Weapon4Check" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Weapon4}}} {{Check=[[1]]}} {{DL=[[@{npc1WeaponSkill1}+@{meleeWeaponsModN1}]]}}{{Damage=[[@{npc1WeaponDamage4}+@{npc1DamageMod}]]}}  {{Crit=[[ceil((@{npc1WeaponSkill4}+@{meleeWeaponsModN1})*0.05)]]}} {{Special=[[ceil((@{npc1WeaponSkill4}+@{meleeWeaponsModN1})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npc1WeaponSkill4}+@{meleeWeaponsModN1}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc1Weapon4' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1WeaponSkill4' value=' ' />
@@ -21574,7 +22221,7 @@
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 90px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 26px;  color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1ShieldCheck" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Shield}}} {{Check=[[1]]}} {{DL=[[@{npc1ShieldValue}]]}} {{Damage=[[@{npc1ShieldDamage}+@{npc1DamageMod}]]}}  {{Crit=[[floor(@{npc1ShieldValue}*0.05)]]}} {{Special=[[floor(@{npc1ShieldValue}*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npc1ShieldValue}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcShieldSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc1ShieldCheck" value="&{template:check} {{name=@{npc1Name} *attacks with* @{npc1Shield}}} {{Check=[[1]]}} {{DL=[[@{npc1ShieldValue}]]}} {{Damage=[[@{npc1ShieldDamage}+@{npc1DamageMod}]]}}  {{Crit=[[ceil(@{npc1ShieldValue}*0.05)]]}} {{Special=[[ceil(@{npc1ShieldValue}*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npc1ShieldValue}+@{meleeWeaponsModN1}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcShieldSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:  82px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc1Shield' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc1ShieldValue' value=' ' />
@@ -21583,7 +22230,7 @@
 			<!-- Skills -->
 				<label style="display: inline-block; vertical-align: top; height: 18px; width: 265px; color: Black; margin:  12px 0px 2px 2px; font-family: 'Noto Serif'; font-weight: 400; font-size: 16px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="skills-u">SKILLS</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1a" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1a}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1a}+@{skillTypeN1a}]]}}  {{Crit=[[floor((@{skillValueN1a}+@{skillTypeN1a})*0.05)]]}} {{Special=[[floor((@{skillValueN1a}+@{skillTypeN1a})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1a}+@{skillTypeN1a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1a" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1a}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1a}+@{skillTypeN1a}]]}}  {{Crit=[[ceil((@{skillValueN1a}+@{skillTypeN1a})*0.05)]]}} {{Special=[[ceil((@{skillValueN1a}+@{skillTypeN1a})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1a}+@{skillTypeN1a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1a' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1a' value=' ' />
@@ -21596,11 +22243,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1b" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1b}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1b}+@{skillTypeN1b}]]}}  {{Crit=[[floor((@{skillValueN1b}+@{skillTypeN1b})*0.05)]]}} {{Special=[[floor((@{skillValueN1b}+@{skillTypeN1b})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1b}+@{skillTypeN1b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1b" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1b}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1b}+@{skillTypeN1b}]]}}  {{Crit=[[ceil((@{skillValueN1b}+@{skillTypeN1b})*0.05)]]}} {{Special=[[ceil((@{skillValueN1b}+@{skillTypeN1b})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1b}+@{skillTypeN1b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1b' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1b' value=' ' />
@@ -21613,11 +22259,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1c" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1c}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1c}+@{skillTypeN1c}]]}}  {{Crit=[[floor((@{skillValueN1c}+@{skillTypeN1c})*0.05)]]}} {{Special=[[floor((@{skillValueN1c}+@{skillTypeN1c})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1c}+@{skillTypeN1c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1c" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1c}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1c}+@{skillTypeN1c}]]}}  {{Crit=[[ceil((@{skillValueN1c}+@{skillTypeN1c})*0.05)]]}} {{Special=[[ceil((@{skillValueN1c}+@{skillTypeN1c})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1c}+@{skillTypeN1c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1c' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1c' value=' ' />
@@ -21630,11 +22275,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1d" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1d}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1d}+@{skillTypeN1d}]]}}  {{Crit=[[floor((@{skillValueN1d}+@{skillTypeN1d})*0.05)]]}} {{Special=[[floor((@{skillValueN1d}+@{skillTypeN1d})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1d}+@{skillTypeN1d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1d" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1d}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1d}+@{skillTypeN1d}]]}}  {{Crit=[[ceil((@{skillValueN1d}+@{skillTypeN1d})*0.05)]]}} {{Special=[[ceil((@{skillValueN1d}+@{skillTypeN1d})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1d}+@{skillTypeN1d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1d' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1d' value=' ' />
@@ -21647,11 +22291,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1e" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1e}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1e}+@{skillTypeN1e}]]}}  {{Crit=[[floor((@{skillValueN1e}+@{skillTypeN1e})*0.05)]]}} {{Special=[[floor((@{skillValueN1e}+@{skillTypeN1e})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1e}+@{skillTypeN1e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1e" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1e}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1e}+@{skillTypeN1e}]]}}  {{Crit=[[ceil((@{skillValueN1e}+@{skillTypeN1e})*0.05)]]}} {{Special=[[ceil((@{skillValueN1e}+@{skillTypeN1e})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1e}+@{skillTypeN1e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1e' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1e' value=' ' />
@@ -21664,11 +22307,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1f" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1f}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1f}+@{skillTypeN1f}]]}}  {{Crit=[[floor((@{skillValueN1f}+@{skillTypeN1f})*0.05)]]}} {{Special=[[floor((@{skillValueN1f}+@{skillTypeN1f})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1f}+@{skillTypeN1f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1f" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1f}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1f}+@{skillTypeN1f}]]}}  {{Crit=[[ceil((@{skillValueN1f}+@{skillTypeN1f})*0.05)]]}} {{Special=[[ceil((@{skillValueN1f}+@{skillTypeN1f})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1f}+@{skillTypeN1f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1f' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1f' value=' ' />
@@ -21681,11 +22323,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1g" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1g}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1g}+@{skillTypeN1g}]]}}  {{Crit=[[floor((@{skillValueN1g}+@{skillTypeN1g})*0.05)]]}} {{Special=[[floor((@{skillValueN1g}+@{skillTypeN1g})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1g}+@{skillTypeN1g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1g" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1g}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1g}+@{skillTypeN1g}]]}}  {{Crit=[[ceil((@{skillValueN1g}+@{skillTypeN1g})*0.05)]]}} {{Special=[[ceil((@{skillValueN1g}+@{skillTypeN1g})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1g}+@{skillTypeN1g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1g' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1g' value=' ' />
@@ -21698,11 +22339,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1h" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1h}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1h}+@{skillTypeN1h}]]}}  {{Crit=[[floor((@{skillValueN1h}+@{skillTypeN1h})*0.05)]]}} {{Special=[[floor((@{skillValueN1h}+@{skillTypeN1h})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1h}+@{skillTypeN1h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1h" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1h}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1h}+@{skillTypeN1h}]]}}  {{Crit=[[ceil((@{skillValueN1h}+@{skillTypeN1h})*0.05)]]}} {{Special=[[ceil((@{skillValueN1h}+@{skillTypeN1h})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1h}+@{skillTypeN1h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1h' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1h' value=' ' />
@@ -21715,11 +22355,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1i" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1i}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1i}+@{skillTypeN1i}]]}}  {{Crit=[[floor((@{skillValueN1i}+@{skillTypeN1i})*0.05)]]}} {{Special=[[floor((@{skillValueN1i}+@{skillTypeN1i})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1i}+@{skillTypeN1i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1i" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1i}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1i}+@{skillTypeN1i}]]}}  {{Crit=[[ceil((@{skillValueN1i}+@{skillTypeN1i})*0.05)]]}} {{Special=[[ceil((@{skillValueN1i}+@{skillTypeN1i})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1i}+@{skillTypeN1i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1i' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1i' value=' ' />
@@ -21732,11 +22371,10 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1j" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1j}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1j}+@{skillTypeN1j}]]}}  {{Crit=[[floor((@{skillValueN1j}+@{skillTypeN1j})*0.05)]]}} {{Special=[[floor((@{skillValueN1j}+@{skillTypeN1j})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN1j}+@{skillTypeN1j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN1j" value="&{template:check} {{name=@{npc1Name} *uses* @{skillN1j}}} {{Check=[[1]]}} {{DL=[[@{skillValueN1j}+@{skillTypeN1j}]]}}  {{Crit=[[ceil((@{skillValueN1j}+@{skillTypeN1j})*0.05)]]}} {{Special=[[ceil((@{skillValueN1j}+@{skillTypeN1j})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN1j}+@{skillTypeN1j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN1j' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN1j' value=' ' />
@@ -21749,7 +22387,6 @@
 					<option value="@{mythicModN1}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN1}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN1}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN1}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 			</div>
@@ -21819,36 +22456,70 @@
 
 			<div style="height: 12px"></div>
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Str}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Str}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Str}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Str}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcStrRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_strNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* STR}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Str}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Str}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Str}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Str}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcStrRoll">
 				<label class="sheet-charName" data-i18n="str-u">STR</label></button>
 			<input class="sheet-characteristic" style="width: 46px; margin: 0" name="attr_npc2Str" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Siz}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Siz}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Siz}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Siz}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcSizRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_sizNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* SIZ}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Siz}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Siz}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Siz}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Siz}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcSizRoll">
 				<label class="sheet-charName" data-i18n="siz-u">SIZ</label></button>
 			<input class="sheet-characteristic" name="attr_npc2Siz" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Pow}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Pow}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Pow}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Pow}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcPowRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_powNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* POW}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Pow}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Pow}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Pow}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Pow}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcPowRoll">
 				<label class="sheet-charName" data-i18n="pow-u">POW</label></button>
 			<input class="sheet-characteristic" name="attr_npc2Pow" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Cha}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Cha}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Cha}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Cha}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcChaRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_chaNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* CHA}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Cha}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Cha}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Cha}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Cha}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcChaRoll">
 				<label class="sheet-charName" data-i18n="cha-u">CHA</label></button>
 			<input class="sheet-characteristic" name="attr_npc2Cha" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Con}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Con}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Con}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Con}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcConRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_conNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* CON}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Con}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Con}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Con}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Con}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcConRoll">
 				<label class="sheet-charName" data-i18n="con-u">CON</label></button>
 			<input class="sheet-characteristic" name="attr_npc2Con" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Int}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Int}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Int}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Int}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcIntRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_intNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* INT}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Int}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Int}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Int}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Int}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcIntRoll">
 				<label class="sheet-charName" data-i18n="int-u">INT</label></button>
 			<input class="sheet-characteristic" name="attr_npc2Int" style="width: 46px; margin: 0;" type="text" value=' ' />
 
-			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Dex}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[floor(@{npc2Dex}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[floor(@{npc2Dex}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-floor((100-@{npc2Dex}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcDexRoll">
+			<button class="btn sheet-skillName" style="margin: 0; padding: 0;" type="roll" name="roll_dexNpcCheck" value="&{template:check} {{name=@{npc2Name} *for* DEX}} {{Check=[[1]]}} {{DL=[[floor(@{npc2Dex}*@{circumstanceMultiplierNPC2})]]}} {{Crit=[[ceil(@{npc2Dex}*@{circumstanceMultiplierNPC2}*0.05)]]}} {{Special=[[ceil(@{npc2Dex}*@{circumstanceMultiplierNPC2}*0.2)]]}}  {{Fumble=[[100-ceil((100-@{npc2Dex}*@{circumstanceMultiplierNPC2})*0.05)]]}} {{Roll=[[1d100]]}} {{CircMod=@{circumstanceMultiplierNPC2}x}}" data-i18n-title="npcDexRoll">
 				<label class="sheet-charName" data-i18n="dex-u">DEX</label></button>
 			<input class="sheet-characteristic" name="attr_npc2Dex" style="width: 46px; margin: 0;" type="text" value=' ' />
 
 			<label class="sheet-charNameNoHover" style="width: 46px;" data-i18n="mov-u">MOV</label>
 			<input class="sheet-characteristic" name="attr_npc2Mov" style="width: 46px; margin: 0;" type="text" value='10' />
+				
+			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 10px 0px 0px 12px; border: 0px solid Red; " data-i18n="spirit-animal-c">Spirit Animal</label>
+				<input type="hidden"  name="attr_npc2_spirit_animal_agility"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_communication"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_knowledge"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_manipulation"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_mythic"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_perception"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_stealth"  value="0" />
+				<input type="hidden"  name="attr_npc2_spirit_animal_flag"  value="0" />
+				
+			<select class="sheet-personal" style="width: 160px; text-align: center; margin: 6px 0px 0px 12px;" name='attr_npc2_spirit_animal'>
+				<option value="" selected></option>
+				<option value="Bear" data-i18n="bear-c" data-i18n-title="mightyDef">Bear</option>
+				<option value="Bull" data-i18n="bull-c" data-i18n-title="mightyDef">Bull</option>
+				<option value="Eagle" data-i18n="eagle-c" data-i18n-title="mightyDef">Eagle</option>
+				<option value="Beaver" data-i18n="beaver-c" data-i18n-title="steadfastDef">Beaver</option>
+				<option value="Gyr Falcon" data-i18n="gyrFalcon-c" data-i18n-title="steadfastDef">Gyr Falcon</option>
+				<option value="Seal" data-i18n="seal-c" data-i18n-title="steadfastDef">Seal</option>
+				<option value="Cat" data-i18n="cat-c" data-i18n-title="spiritualDef">Cat</option>
+				<option value="Golden Plover" data-i18n="goldenPlover-c" data-i18n-title="spiritualDef">Golden Plover</option>
+				<option value="Raven" data-i18n="raven-c" data-i18n-title="spiritualDef">Raven</option>
+				<option value="Goose" data-i18n="goose-c" data-i18n-title="wandererDef">Goose</option>
+				<option value="Horse" data-i18n="horse-c" data-i18n-title="wandererDef">Horse</option>
+				<option value="Wolf" data-i18n="wolf-c" data-i18n-title="wandererDef">Wolf</option>
+				<option value="Owl" data-i18n="owl-c" data-i18n-title="cunningDef">Owl</option>
+				<option value="Snow Fox" data-i18n="snowFox-c" data-i18n-title="cunningDef">Snow Fox</option>
+				<option value="Weasel" data-i18n="weasel-c" data-i18n-title="cunningDef">Weasel</option>
+				<option value="Arctic Tern" data-i18n="arcticTern-c" data-i18n-title="manipulativeDef">Arctic Tern</option>
+				<option value="Dog" data-i18n="dog-c" data-i18n-title="manipulativeDef">Dog</option>
+				<option value="Mouse" data-i18n="mouse-c" data-i18n-title="manipulativeDef">Mouse</option>
+			</select>
+
+
 			<label class="sheet-skillName" style="display: inline-block; vertical-align: top; width: 190px; height: 20px; color: rgb(83,124,151); font-size: 14px; text-align: right; font-weight: 700; font-variant: small-caps; margin: 6px 0px 0px 12px; border: 0px solid Red; " data-i18n="circumstance-multiplier-c">Circumstance Multiplier</label>
 			<select style="display: inline-block; vertical-align: top; width: 160px; height: 26px; margin: 2px 0px 0px 12px;" name="attr_circumstanceMultiplierNPC2">
 				<option value="5" selected data-i18n="simple-c">Simple 5x</option>
@@ -21876,6 +22547,96 @@
 				<label style="display: inline-block; vertical-align: top; height: 14px; width: 58px; color: Black; margin: 10px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="ap-u">AP</label>
 				<label style="display: inline-block; vertical-align: top; height: 14px; width: 58px; color: Black; margin: 10px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 14px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN2Loc' value='Head' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN2Roll' value='19-20' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apHeadMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpHeadN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpHeadMaxN2' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmN2Loc' value='Left Arm' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmN2Roll' value='16-18' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apLeftArmMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftArmN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftArmMaxN2' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmN2Loc' value='Right Arm' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmN2Roll' value='13-15' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apRightArmMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpRightArmN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpRightArmMaxN2' value=' ' />
+	
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apChestN2Loc' value='Chest' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apChestN2Roll' value='12' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apChestN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apChestMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpChestN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpChestMaxN2' value=' ' />
+	
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenN2Loc' value='Abdomen' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenN2Roll' value='09-11' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apAbdomenMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpAbdomenN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpAbdomenMaxN2' value=' ' />
+		
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegN2Loc' value='Left Leg' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegN2Roll' value='05-08' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apLeftLegMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftLegN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpLeftLegMaxN2' value=' ' />
+	
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegN2Loc' value='Right Leg' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegN2Roll' value='01-04' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apRightLegMaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpRightLegN2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpRightLegMaxN2' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1N2Loc' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1N2Roll' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1N2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apExtra1MaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra1N2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra1MaxN2' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2N2Loc' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2N2Roll' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2N2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apExtra2MaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra2N2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra2MaxN2' value=' ' />
+
+				<input class="sheet-characteristic" type="text" style="width:  74px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 14px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3N2Loc' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  34px; height: 14px; margin: 0px 0px 0px 0px; padding: 1px; font-size: 12px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3N2Roll' value='' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3N2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_apExtra3MaxN2' value=' ' />
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra3N2' value=' ' />
+				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
+				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpExtra3MaxN2' value=' ' />
+<!--			
 				<label style="display: inline-block; vertical-align: top; height: 14px; width: 74px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Green;" data-i18n="head-u">HEAD</label>
 				<label style="display: inline-block; vertical-align: top; height: 14px; width: 34px; color: Black; margin: 2px 0px 0px 0px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 12px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Blue;">19-20</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_apHeadN2' value=' ' />
@@ -21938,31 +22699,31 @@
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px 0px; border: 1px solid rgb(129,71,57);" name='attr_hpRightLegN2' value=' ' />
 				<label style="display: inline-block; vertical-align: top; width: 4px; height: 16px; color: Black; margin: 0px 0px 0px -2px; font-family: 'Noto Serif'; font-stretch: ultra-condensed; font-size: 16px; padding: 1px 0px 0px 0px; text-align: center; border: 0px solid Red;">/</label>
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 14px; margin: 0px 0px 0px -2px; border: 1px solid rgb(129,71,57);" name='attr_hpRightLegMaxN2' value=' ' />
-
+-->
 
 				<label style="display: inline-block; vertical-align: top; height: 16px; width:  90px; color: Black; margin: 6px 0px 2px 24px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="weapon-u">WEAPON</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 30px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: right; border: 0px solid Orange;">%</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 114px; color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon1Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon1}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage1}+@{npc2DamageMod}]]}}  {{Crit=[[floor((@{npc2WeaponSkill1}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[floor((@{npc2WeaponSkill1}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeapon2Skill1}+@{meleeWeaponsModN2}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon1Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon1}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage1}+@{npc2DamageMod}]]}}  {{Crit=[[ceil((@{npc2WeaponSkill1}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[ceil((@{npc2WeaponSkill1}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeapon2Skill1}+@{meleeWeaponsModN2}))*0.05)]]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; padding: 1px;  border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc2Weapon1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponSkill1' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponDamage1' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon2Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon2}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage2}+@{npc2DamageMod}]]}}  {{Crit=[[floor((@{npc2WeaponSkill2}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[floor((@{npc2WeaponSkill2}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeapon2Skill2}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon2Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon2}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage2}+@{npc2DamageMod}]]}}  {{Crit=[[ceil((@{npc2WeaponSkill2}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[ceil((@{npc2WeaponSkill2}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeapon2Skill2}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc2Weapon2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponSkill2' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponDamage2' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon3Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon3}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage3}+@{npc2DamageMod}]]}}  {{Crit=[[floor((@{npc2WeaponSkill3}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[floor((@{npc2WeaponSkill3}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeapon2Skill3}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon3Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon3}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage3}+@{npc2DamageMod}]]}}  {{Crit=[[ceil((@{npc2WeaponSkill3}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[ceil((@{npc2WeaponSkill3}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeapon2Skill3}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc2Weapon3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponSkill3' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponDamage3' value=' ' />
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon4Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon4}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage4}+@{npc2DamageMod}]]}}  {{Crit=[[floor((@{npc2WeaponSkill4}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[floor((@{npc2WeaponSkill4}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npcWeapon2Skill4}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2Weapon4Check" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Weapon4}}} {{Check=[[1]]}} {{DL=[[@{npc2WeaponSkill1}+@{meleeWeaponsModN2}]]}}{{Damage=[[@{npc2WeaponDamage4}+@{npc2DamageMod}]]}}  {{Crit=[[ceil((@{npc2WeaponSkill4}+@{meleeWeaponsModN2})*0.05)]]}} {{Special=[[ceil((@{npc2WeaponSkill4}+@{meleeWeaponsModN2})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npcWeapon2Skill4}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcWeaponSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width: 100px; height: 19px; margin: 0px 0px 0px -2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc2Weapon4' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  30px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2WeaponSkill4' value=' ' />
@@ -21979,16 +22740,17 @@
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 90px;  color: Black; margin: 6px 0px 2px 0px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Red;" data-i18n="damage-u">DAMAGE</label>
 				<label style="display: inline-block; vertical-align: top; height: 16px; width: 26px;  color: Black; margin: 6px 0px 2px 4px; font-family: 'Noto Serif'; font-variant: small-caps; font-weight: 700; font-size: 14px; padding: 6px 0px 0px 0px; text-align: center; border: 0px solid Orange;" data-i18n="hp-u">HP</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2ShieldCheck" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Shield}}} {{Check=[[1]]}} {{DL=[[@{npc2ShieldValue}]]}} {{Damage=[[@{npc2ShieldDamage}+@{npc2DamageMod}]]}}  {{Crit=[[floor(@{npc2ShieldValue}*0.05)]]}} {{Special=[[floor(@{npc2ShieldValue}*0.2)]]}}  {{Fumble=[[100-floor((100-(@{npc2ShieldValue}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcShieldSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_npc2ShieldCheck" value="&{template:check} {{name=@{npc2Name} *attacks with* @{npc2Shield}}} {{Check=[[1]]}} {{DL=[[@{npc2ShieldValue}]]}} {{Damage=[[@{npc2ShieldDamage}+@{npc2DamageMod}]]}}  {{Crit=[[ceil(@{npc2ShieldValue}*0.05)]]}} {{Special=[[ceil(@{npc2ShieldValue}*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{npc2ShieldValue}+@{meleeWeaponsModN2}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="npcShieldSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:  82px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_npc2Shield' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2ShieldValue' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  82px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2ShieldDamage' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 19px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray;" name='attr_npc2ShieldHP' value=' ' />
+
 			<!-- Skills -->
 				<label style="display: inline-block; vertical-align: top; height: 18px; width: 265px; color: Black; margin:  12px 0px 2px 2px; font-family: 'Noto Serif'; font-weight: 400; font-size: 16px; padding: 6px 0px 0px 0px; text-align: left; border: 0px solid Red;" data-i18n="skills-u">SKILLS</label>
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2a" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2a}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2a}+@{skillTypeN2a}]]}}  {{Crit=[[floor((@{skillValueN2a}+@{skillTypeN2a})*0.05)]]}} {{Special=[[floor((@{skillValueN2a}+@{skillTypeN2a})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2a}+@{skillTypeN2a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2a" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2a}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2a}+@{skillTypeN2a}]]}}  {{Crit=[[ceil((@{skillValueN2a}+@{skillTypeN2a})*0.05)]]}} {{Special=[[ceil((@{skillValueN2a}+@{skillTypeN2a})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2a}+@{skillTypeN2a}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2a' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2a' value=' ' />
@@ -22001,11 +22763,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2b" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2b}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2b}+@{skillTypeN2b}]]}}  {{Crit=[[floor((@{skillValueN2b}+@{skillTypeN2b})*0.05)]]}} {{Special=[[floor((@{skillValueN2b}+@{skillTypeN2b})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2b}+@{skillTypeN2b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2b" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2b}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2b}+@{skillTypeN2b}]]}}  {{Crit=[[ceil((@{skillValueN2b}+@{skillTypeN2b})*0.05)]]}} {{Special=[[ceil((@{skillValueN2b}+@{skillTypeN2b})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2b}+@{skillTypeN2b}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2b' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2b' value=' ' />
@@ -22018,11 +22779,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2c" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2c}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2c}+@{skillTypeN2c}]]}}  {{Crit=[[floor((@{skillValueN2c}+@{skillTypeN2c})*0.05)]]}} {{Special=[[floor((@{skillValueN2c}+@{skillTypeN2c})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2c}+@{skillTypeN2c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2c" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2c}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2c}+@{skillTypeN2c}]]}}  {{Crit=[[ceil((@{skillValueN2c}+@{skillTypeN2c})*0.05)]]}} {{Special=[[ceil((@{skillValueN2c}+@{skillTypeN2c})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2c}+@{skillTypeN2c}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2c' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2c' value=' ' />
@@ -22035,11 +22795,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2d" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2d}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2d}+@{skillTypeN2d}]]}}  {{Crit=[[floor((@{skillValueN2d}+@{skillTypeN2d})*0.05)]]}} {{Special=[[floor((@{skillValueN2d}+@{skillTypeN2d})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2d}+@{skillTypeN2d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2d" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2d}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2d}+@{skillTypeN2d}]]}}  {{Crit=[[ceil((@{skillValueN2d}+@{skillTypeN2d})*0.05)]]}} {{Special=[[ceil((@{skillValueN2d}+@{skillTypeN2d})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2d}+@{skillTypeN2d}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2d' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2d' value=' ' />
@@ -22052,11 +22811,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2e" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2e}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2e}+@{skillTypeN2e}]]}}  {{Crit=[[floor((@{skillValueN2e}+@{skillTypeN2e})*0.05)]]}} {{Special=[[floor((@{skillValueN2e}+@{skillTypeN2e})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2e}+@{skillTypeN2e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2e" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2e}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2e}+@{skillTypeN2e}]]}}  {{Crit=[[ceil((@{skillValueN2e}+@{skillTypeN2e})*0.05)]]}} {{Special=[[ceil((@{skillValueN2e}+@{skillTypeN2e})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2e}+@{skillTypeN2e}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2e' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2e' value=' ' />
@@ -22069,11 +22827,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2f" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2f}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2f}+@{skillTypeN2f}]]}}  {{Crit=[[floor((@{skillValueN2f}+@{skillTypeN2f})*0.05)]]}} {{Special=[[floor((@{skillValueN2f}+@{skillTypeN2f})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2f}+@{skillTypeN2f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2f" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2f}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2f}+@{skillTypeN2f}]]}}  {{Crit=[[ceil((@{skillValueN2f}+@{skillTypeN2f})*0.05)]]}} {{Special=[[ceil((@{skillValueN2f}+@{skillTypeN2f})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2f}+@{skillTypeN2f}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2f' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2f' value=' ' />
@@ -22086,11 +22843,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2g" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2g}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2g}+@{skillTypeN2g}]]}}  {{Crit=[[floor((@{skillValueN2g}+@{skillTypeN2g})*0.05)]]}} {{Special=[[floor((@{skillValueN2g}+@{skillTypeN2g})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2g}+@{skillTypeN2g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2g" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2g}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2g}+@{skillTypeN2g}]]}}  {{Crit=[[ceil((@{skillValueN2g}+@{skillTypeN2g})*0.05)]]}} {{Special=[[ceil((@{skillValueN2g}+@{skillTypeN2g})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2g}+@{skillTypeN2g}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2g' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2g' value=' ' />
@@ -22103,11 +22859,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2h" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2h}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2h}+@{skillTypeN2h}]]}}  {{Crit=[[floor((@{skillValueN2h}+@{skillTypeN2h})*0.05)]]}} {{Special=[[floor((@{skillValueN2h}+@{skillTypeN2h})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2h}+@{skillTypeN2h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2h" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2h}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2h}+@{skillTypeN2h}]]}}  {{Crit=[[ceil((@{skillValueN2h}+@{skillTypeN2h})*0.05)]]}} {{Special=[[ceil((@{skillValueN2h}+@{skillTypeN2h})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2h}+@{skillTypeN2h}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2h' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2h' value=' ' />
@@ -22120,11 +22875,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2i" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2i}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2i}+@{skillTypeN2i}]]}}  {{Crit=[[floor((@{skillValueN2i}+@{skillTypeN2i})*0.05)]]}} {{Special=[[floor((@{skillValueN2i}+@{skillTypeN2i})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2i}+@{skillTypeN2i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2i" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2i}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2i}+@{skillTypeN2i}]]}}  {{Crit=[[ceil((@{skillValueN2i}+@{skillTypeN2i})*0.05)]]}} {{Special=[[ceil((@{skillValueN2i}+@{skillTypeN2i})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2i}+@{skillTypeN2i}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2i' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2i' value=' ' />
@@ -22137,11 +22891,10 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 
-				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2j" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2j}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2j}+@{skillTypeN2j}]]}}  {{Crit=[[floor((@{skillValueN2j}+@{skillTypeN2j})*0.05)]]}} {{Special=[[floor((@{skillValueN2j}+@{skillTypeN2j})*0.2)]]}}  {{Fumble=[[100-floor((100-(@{skillValueN2j}+@{skillTypeN2j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
+				<button class="btn sheet-skillName" type="roll" style="margin: 0px 0px 0px 0px; width: 14px; height: 19px; padding: 2px 0px 0px 2px; border: 0px solid Blue;" name="roll_skillN2j" value="&{template:check} {{name=@{npc2Name} *uses* @{skillN2j}}} {{Check=[[1]]}} {{DL=[[@{skillValueN2j}+@{skillTypeN2j}]]}}  {{Crit=[[ceil((@{skillValueN2j}+@{skillTypeN2j})*0.05)]]}} {{Special=[[ceil((@{skillValueN2j}+@{skillTypeN2j})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{skillValueN2j}+@{skillTypeN2j}))*0.05)]]}} {{Roll=[[1d100]]}}" data-i18n-title="npcSkillRoll">
 					<span style="font-family:dicefontd20;">t</span></button>
 				<input class="sheet-characteristic" type="text" style="width:   98px; height: 22px; margin: 0px 0px 0px -2px; border: 0; padding: 2px; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillN2j' value=' ' />
 				<input class="sheet-characteristic" type="text" style="width:  26px; height: 22px; margin: 0px 0px 0px 2px; border: 0; border-bottom: 2px solid DimGray; text-align: left;" name='attr_skillValueN2j' value=' ' />
@@ -22154,7 +22907,6 @@
 					<option value="@{mythicModN2}" data-i18n="mythic-u">MYTHIC</option>
 					<option value="@{perceptionModN2}" data-i18n="perception-u">PERCEPTION</option>
 					<option value="@{stealthModN2}" data-i18n="stealth-u">STEALTH</option>
-					<option value="@{spiritAnimalModN2}" data-i18n="spiritAnimal-u">SPIRIT ANIMAL</option>
 					<option value=" " selected data-i18n="none-c">None</option>
 				</select>			
 			</div>
@@ -22203,7 +22955,7 @@
 		</div> <!-- Cat Herding -->
 		<!--
 		<div class="catHerding" style="width: 300px; height: 200px; margin: -170px 0px 0px 530px;" >
-			<img src="https://github.com/Roll20/roll20-character-sheets/blob/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
+			<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Age%20Of%20Vikings/Graphics/aov-frame-corner-color.svg?raw=true">
 		</div>
 		-->
 		
@@ -22277,6 +23029,10 @@
 		{{#Damage}}
 			<div class="rowcolor"><span class="tcat" data-i18n="damage:-c">Damage: </span>{{Damage}}</div>
 		{{/Damage}}
+
+		{{#Impact}}
+			<div class="rowcolor"><span class="tcat" data-i18n="damage:-c">Damage: </span>{{computed::Impact}}</div>
+		{{/Impact}}
 		
 		{{#RS}}
 			<div class="rowcolor"><span class="tcat" data-i18n="script:-c">Script: </span><span style="font-size: 24px; color: rgb(129,71,57);">{{RS}}</span></div>
@@ -22290,18 +23046,49 @@
 		{{#Dimension}}
 			<div class="rowcolor"><span class="tcat" data-i18n="dimension:-c">Dimension: </span>{{Dimension}}MP</div>
 		{{/Dimension}}
-		
 		{{#Effects}}
 			<div class="rowcolor"><span class="tcat" data-i18n="effect:-c">Effect: </span>{{Effects}}</div>
 		{{/Effects}}
+		{{#MPCost}}
+			<div class="rowcolor"><span class="tcat" data-i18n="mpCost:">MP Cost: </span><span>{{MPCost}}MP</span></div>
+		{{/MPCost}}
 
     </div>
 </rolltemplate>
 
 	<script type="text/worker">
+			// Create a Map
+			const inventory = new Map([	]);
 
 				on('sheet:opened',function(){
 
+					// Create inventory Map
+					console.log(" Clear inventory at sheet open");
+					inventory.clear();
+					console.log(" Get inventory's size: " + inventory.size);
+					let text = "";
+					inventory.forEach(function(value, key) {
+						text += key + ' = ' + value;
+					});
+					console.log(" Walk through cleared inventory: " + text);
+					
+					buildEquipment();
+					text = "";
+					inventory.forEach(function(value, key) {
+						text += key + ' = ' + value;
+					});
+					console.log(" Walk through inventory after buildEquipment: " + text);
+					console.log(" Does inventory have knife?: " + inventory.has("knife"));
+
+					addWeapons();
+					text = "";
+					inventory.forEach(function(value, key) {
+						text += key + ' = ' + value;
+					});
+					console.log(" Walk through inventory after addWeapons: " + text);
+					console.log(" Does inventory have knife?: " + inventory.has("knife"));
+
+					
 					getAttrs(["setupDone","ReleaseNumber"], function(pvalue) {
 						console.log("hello there");
 
@@ -23540,9 +24327,844 @@
 				});
 			});
 		}
+//	<button name="act_weapon1Check" value="&{template:check} {{name=@{character_name} *@{weapon_action}* @{weapon_melee_1_name}}} {{Check=[[1]]}} {{DL=[[@{weapon_melee_1}+@{skill_melee_weapon_category_modifier}]]}}{{Damage=[[@{weapon_melee_1_damage}+@{attribute_damage_modifier}]]}}  {{Crit=[[ceil((@{weapon_melee_1}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{weapon_melee_1}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{weapon_melee_1}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}" data-i18n-title="weaponRoll-c">
+on("clicked:weapon1Check clicked:weapon2Check clicked:weapon3Check clicked:weapon4Check clicked:weapon5Check clicked:shieldCheck clicked:missile1Check clicked:missile2Check", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
 
 
-on("clicked:script1 clicked:script2 clicked:script3 clicked:script4  clicked:script5", function(eventInfo) {
+	console.log("  TriggerName: " + TriggerName);
+	console.log("  Name: " + Name);
+	console.log("  eventInfo: " + JSON.stringify(eventInfo));
+
+	getAttrs(["weapon_melee_1_damage_type","weapon_melee_2_damage_type","weapon_melee_3_damage_type","weapon_melee_4_damage_type","weapon_melee_5_damage_type","weapon_shield_damage_type","weapon_missile_1_damage_type","weapon_missile_2_damage_type",
+			  "weapon_melee_1_damage","weapon_melee_2_damage","weapon_melee_3_damage","weapon_melee_4_damage","weapon_melee_5_damage","shield_damage","weapon_missile_1_damage","weapon_missile_2_damage",
+			  "weapon_melee_1","weapon_melee_2","weapon_melee_3","weapon_melee_4","weapon_melee_5","weapon_shield","weapon_missile_1","weapon_missile_2",
+			  "attribute_damage_modifier"], function(values) {
+		let Melee1Type = values.weapon_melee_1_damage_type; 
+		let Melee2Type = values.weapon_melee_2_damage_type; 
+		let Melee3Type = values.weapon_melee_3_damage_type; 
+		let Melee4Type = values.weapon_melee_4_damage_type; 
+		let Melee5Type = values.weapon_melee_5_damage_type; 
+		let ShieldType = values.weapon_shield_damage_type; 
+		let Missile1Type = values.weapon_missile_1_damage_type; 
+		let Missile2Type = values.weapon_missile_2_damage_type; 
+		let Melee1Damage = values.weapon_melee_1_damage; 
+		let Melee2Damage = values.weapon_melee_2_damage; 
+		let Melee3Damage = values.weapon_melee_3_damage; 
+		let Melee4Damage = values.weapon_melee_4_damage; 
+		let Melee5Damage = values.weapon_melee_5_damage; 
+		let ShieldDamage = values.shield_damage;
+		
+		let Missile1Damage = values.weapon_missile_1_damage; 
+		let Missile2Damage = values.weapon_missile_2_damage; 
+		let Melee1 = parseInt(values.weapon_melee_1)||0; 
+		let Melee2 = parseInt(values.weapon_melee_2)||0; 
+		let Melee3 = parseInt(values.weapon_melee_3)||0; 
+		let Melee4 = parseInt(values.weapon_melee_4)||0; 
+		let Melee5 = parseInt(values.weapon_melee_5)||0; 
+		let Shield = parseInt(values.skill_melee_weapon_shield)||0; 
+		let Missile1 = parseInt(values.weapon_missile_1)||0; 
+		let Missile2 = parseInt(values.weapon_missile_2)||0; 
+		let DamageModifier = values.attribute_damage_modifier; 
+		
+		console.log("  Melee1Type: " + Melee1Type);
+		console.log("  Melee2Type: " + Melee2Type);
+		console.log("  Melee3Type: " + Melee3Type);
+		console.log("  Melee4Type: " + Melee4Type);
+		console.log("  Melee5Type: " + Melee5Type);
+		console.log("  ShieldType: " + ShieldType);
+		console.log("  Missile1Type: " + Missile1Type);
+		console.log("  Missile2Type: " + Missile2Type);
+		console.log("  Melee1Damage: " + Melee1Damage);
+		console.log("  Melee2Damage: " + Melee2Damage);
+		console.log("  Melee3Damage: " + Melee3Damage);
+		console.log("  Melee4Damage: " + Melee4Damage);
+		console.log("  Melee5Damage: " + Melee5Damage);
+		console.log("  ShieldDamage: " + ShieldDamage);
+		console.log("  Missile1Damage: " + Missile1Damage);
+		console.log("  Missile2Damage: " + Missile2Damage);
+		console.log("  Melee1: " + Melee1);
+		console.log("  Melee2: " + Melee2);
+		console.log("  Melee3: " + Melee3);
+		console.log("  Melee4: " + Melee4);
+		console.log("  Melee5: " + Melee5);
+		console.log("  Shield: " + Shield);
+		console.log("  Missile1: " + Missile1);
+		console.log("  Missile2: " + Missile2);
+		console.log("  DamageModifier: " + DamageModifier);
+		
+
+		let WeaponName = "";
+		let WeaponSkillName = ""; 
+		let WeaponDamage = ""; 
+		let WeaponSkill = "";
+		let DamageType = "";
+
+
+		switch (Name) {
+			case "weapon1check" : WeaponSkill = Melee1; DamageType = Melee1Type; WeaponName = "weapon_melee_1_name"; WeaponSkillName = "weapon_melee_1"; WeaponDamage = "weapon_melee_1_damage"; break;
+			case "weapon2check" : WeaponSkill = Melee2; DamageType = Melee2Type; WeaponName = "weapon_melee_2_name"; WeaponSkillName = "weapon_melee_2"; WeaponDamage = "weapon_melee_2_damage"; break;
+			case "weapon3check" : WeaponSkill = Melee3; DamageType = Melee3Type; WeaponName = "weapon_melee_3_name"; WeaponSkillName = "weapon_melee_3"; WeaponDamage = "weapon_melee_3_damage"; break;
+			case "weapon4check" : WeaponSkill = Melee4; DamageType = Melee4Type; WeaponName = "weapon_melee_4_name"; WeaponSkillName = "weapon_melee_4"; WeaponDamage = "weapon_melee_4_damage"; break;
+			case "weapon5check" : WeaponSkill = Melee5; DamageType = Melee5Type; WeaponName = "weapon_melee_5_name"; WeaponSkillName = "weapon_melee_5"; WeaponDamage = "weapon_melee_5_damage"; break;
+			case "shieldcheck"  : WeaponSkill = Shield; DamageType = ShieldType; WeaponName = "shield_name"; WeaponSkillName = "skill_melee_weapon_shield"; WeaponDamage = "shield_damage"; break;
+			case "missile1check" : WeaponSkill = Missile1; DamageType = Missile1Type; WeaponName = "weapon_missile_1_name"; WeaponSkillName = "weapon_missile_1"; WeaponDamage = "weapon_missile_1_damage"; break;
+			case "missile2check" : WeaponSkill = Missile2; DamageType = Missile2Type; WeaponName = "weapon_missile_2_name"; WeaponSkillName = "weapon_missile_2"; WeaponDamage = "weapon_missile_2_damage"; break;
+			default: console.log(" Unknown Weapon " + Name);
+		}
+
+		console.log("  WeaponName: " + WeaponName + " DamageType " + DamageType + " WeaponSkill: " + WeaponSkill+ " WeaponSkillName: " + WeaponSkillName + " WeaponDamage " + WeaponDamage);
+		
+
+//		const rollBase ="&{template:check} {{name=@{character_name} *@{weapon_action}* @{"+WeaponName+"}}} {{Check=[[1]]}} {{DL=[[@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier}]]}} {{Damage=[[@{"+WeaponDamage+"}+@{attribute_damage_modifier}]]}}  {{Crit=[[ceil((@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}";
+		const rollBase ="&{template:check} {{name=@{character_name} *@{weapon_action}* @{"+WeaponName+"}}} {{Check=[[1]]}} {{DL=[[@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier}]]}} {{Impact=[[@{"+WeaponDamage+"}+@{attribute_damage_modifier}]]}}  {{Crit=[[ceil((@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier})*0.05)]]}} {{Special=[[ceil((@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier})*0.2)]]}}  {{Fumble=[[100-ceil((100-(@{"+WeaponSkillName+"}+@{skill_melee_weapon_category_modifier}))*0.05)]]}} {{Roll=[[1d100]]}} {{Location=[[1d20]]}}";
+
+		console.log("  rollBase = " + rollBase); 
+/*
+		let rollBase = "&{template:check} {{name=@{character_name} *for* " +AttributeName+ "}} {{Check=[[1]]}} " +Crit+ " " +Fumble+ " {{Roll=[["+DieSize+Mod+Trait+Way+"]]}}";
+		console.log("\n  RollBase:\n" + rollBase );
+
+	    startRoll(rollBase, rollResult => {
+			console.log(" rollResult.results.Roll.rolls " + JSON.stringify(rollResult.results.Roll.rolls) );
+			console.log(" Roll Num Die " + rollResult.results.Roll.rolls[0].dice );
+			console.log(" Roll Sides Die " + rollResult.results.Roll.rolls[0].sides );
+			console.log(" Roll Die 1: " + rollResult.results.Roll.rolls[0].results[0] );
+			console.log(" Roll Dice " + rollResult.results.Roll.dice );
+			console.log("  Roll Dice 1 " + rollResult.results.Roll.dice[0] );
+			console.log("  Roll Dice 2 " + rollResult.results.Roll.dice[1] );
+			let Die1 = rollResult.results.Roll.dice[0];
+			let Die2 = rollResult.results.Roll.dice[1];
+
+*/
+	    startRoll(rollBase, rollResult => {
+			console.log(" rollResult " + JSON.stringify(rollResult) );
+			console.log("\n rollResult.results.Roll " + JSON.stringify(rollResult.results.Roll) );
+			let rolledResult = rollResult.results.Roll.result;
+			console.log("   rollResulted: " + rolledResult);
+			//console.log("\n rollResult.results.Damage " + JSON.stringify(rollResult.results.Damage) );
+			console.log("\n rollResult.results.Impact " + JSON.stringify(rollResult.results.Impact) );
+			console.log("\n rollResult.results.Crit " + JSON.stringify(rollResult.results.Crit) );
+			console.log("\n rollResult.results.Special " + JSON.stringify(rollResult.results.Special) );
+			let Damage = rollResult.results.Impact.result;
+			console.log("   Damage: " + Damage + " normal rolled unaltered Damage ");
+			let Crit = rollResult.results.Crit.result;
+			let Special = rollResult.results.Special.result;
+			let numDiceTypes = rollResult.results.Impact.rolls.length;
+			let Negative = (DamageModifier[0] == '-') ?  1 : 0;
+			let NotZero = (DamageModifier == '0') ?  0 : 1;
+			console.log("   numDiceTypes: " + numDiceTypes + " if not 1 then there is a extra damage component else zero ");
+			console.log("   Negative: " + Negative + " if not 1 then positive");
+			console.log("   NotZero: " + NotZero + " if  1 then there are die/dice damage modifiers.  DamageModifier " + DamageModifier);
+			
+			console.log("   Crit: " + Crit + " Special: " + Special);
+			
+			let normalDamage = 0;
+			for (let i = 0; i < (rollResult.results.Impact.dice.length - NotZero); i++) {
+				normalDamage += rollResult.results.Impact.dice[i];
+				//console.log("    i = " + i + " die " + rollResult.results.Impact.dice[i]);
+			}
+			let normalSum = 0;
+			for (let i = 0; i < rollResult.results.Impact.dice.length; i++) {
+				normalSum += rollResult.results.Impact.dice[i];
+				//console.log("    i = " + i + " die " + rollResult.results.Impact.dice[i]);
+			}
+			let rolledDamageModfier = normalSum - normalDamage;
+			console.log("  normalDamage: " + normalDamage + " normalSum " + normalSum + " rolledDamageModfier " + rolledDamageModfier);
+			let Remainder = Damage - normalSum;
+			console.log("   Damage: " + Damage + " normalSum: " + normalSum + " Remainder: " + Remainder);
+			let MaximumDamage = rollResult.results.Impact.rolls[0].sides * rollResult.results.Impact.rolls[0].dice + Remainder;
+			console.log("   MaximumDamage: " + MaximumDamage);
+			let SecondDamage = Remainder;
+			for (let i = 0; i < rollResult.results.Impact.rolls[0].dice; i++) {
+				let Second = Math.floor(Math.random() * rollResult.results.Impact.rolls[0].sides) + 1;
+				console.log("   Second: " + Second);
+				SecondDamage += Second;
+			}
+			console.log("   SecondDamage: " + SecondDamage);
+
+			let MaximumDamageModifier = 0;
+			if (NotZero) {
+				MaximumDamageModifier = rollResult.results.Impact.rolls[1].sides * rollResult.results.Impact.rolls[1].dice;
+			}
+			if (Negative) {
+				MaximumDamageModifier *= -1;			
+			}
+			console.log("  MaximumDamageModifier " + MaximumDamageModifier + "   NotZero: " + NotZero + " Negative: " + Negative);
+			
+			console.log("\n rollResult.results.Damage.rolls[0].sides " + rollResult.results.Impact.rolls[0].sides );
+			
+/*			Notes on Special and critical
+				Impaling: 
+					Special is Double Normal Damage plus Damage Modifier = normalDamage + SecondDamage +  rolledDamageModfier
+					Critical is Double Maximum Damage + rolledDamageModfier = 2 x MaximumDamage +  rolledDamageModfier
+				Slashing: 
+					Special is Double Normal Damage plus Damage Modifier = normalDamage + SecondDamage +  rolledDamageModfier
+					Critical is Double Maximum Damage + rolledDamageModfier = 2 x MaximumDamage +  rolledDamageModfier
+				Crushing: 
+					Special is  Normal Damage plus Damage Modifier + Maxmum Damage Modifier = normalDamage + rolledDamageModfier + MaximumDamageModifier
+					Critical is  Maximum Damage + Double Damage Modifier = MaximumDamage + 2 x MaximumDamageModifier
+*/	
+			let TotalDamage = "";
+			console.log("  rolledResult: " + rolledResult + " Crit: " + Crit + " Special: " + Special);
+			if (rolledResult <= Crit) {
+				if (DamageType == "impaling") {
+					let critImpale = 2 * MaximumDamage + rolledDamageModfier;
+					console.log(" critImpale = 2 * MaximumDamage " + MaximumDamage + " + rolledDamageModfier " + rolledDamageModfier);
+					TotalDamage = String(critImpale) + " Critical Impale";
+				} else if (DamageType == "slashing") {
+					let critSlash = 2 * MaximumDamage + rolledDamageModfier;
+					console.log(" critSlash = 2 * MaximumDamage " + MaximumDamage + " + rolledDamageModfier " + rolledDamageModfier);
+					TotalDamage = String(critSlash) + " Critical Slash";
+				} else if (DamageType == "crushing") {
+					let critCrush = MaximumDamage + 2 * MaximumDamageModifier;
+					console.log(" critCrush =  MaximumDamage " + MaximumDamage + " + 2 * MaximumDamageModifier " + MaximumDamageModifier);
+					TotalDamage = String(critCrush) + " Critical Crush";
+				} else {
+					let critUnknown = 2 * MaximumDamage + rolledDamageModfier;
+					console.log(" critUnknown = 2 * MaximumDamage " + MaximumDamage + " + rolledDamageModfier " + rolledDamageModfier);
+					TotalDamage = String(critUnknown) + " Critical Unknown Damage Type";
+					console.log("  Crit Unknown DamageType: " + DamageType);
+				}
+			} else if (rolledResult <= Special) {
+				if (DamageType == "impaling") {
+					let specialImpale = normalDamage + SecondDamage + rolledDamageModfier;
+					console.log(" specialImpale = normalDamage " + normalDamage + " + SecondDamage + " + SecondDamage + " + rolledDamageModfier " + rolledDamageModfier);
+					TotalDamage = String(specialImpale) + " Special Impale";
+				} else if (DamageType == "slashing") {
+					let specialSlash = normalDamage + SecondDamage + rolledDamageModfier;
+					console.log(" specialSlash = normalDamage " + normalDamage + " + SecondDamage + " + SecondDamage + " + rolledDamageModfier " + rolledDamageModfier);
+					TotalDamage = String(specialSlash) + " Special Slash";
+				} else if (DamageType == "crushing") {
+					let specialCrush = normalDamage + rolledDamageModfier + MaximumDamageModifier;
+					console.log(" specialCrush =  normalDamage " + normalDamage + " rolledDamageModfier " + rolledDamageModfier + " + MaximumDamageModifier " + MaximumDamageModifier);
+					TotalDamage = String(specialCrush) + " Special Crush";
+				} else {
+					let specialUnknown = normalDamage + SecondDamage + rolledDamageModfier;
+					console.log(" specialUnknown = normalDamage " + normalDamage + " + SecondDamage + " + SecondDamage + " + rolledDamageModfier " + rolledDamageModfier);
+					TotalDamage = String(specialUnknown) + " Special Unknown Damage Type";
+					console.log("  Special Unknown DamageType: " + DamageType);
+				}
+			} else  {
+				if (DamageType == "impaling") {
+					TotalDamage = String(Damage) + " Normal Impale";
+				} else if (DamageType == "slashing") {
+					TotalDamage = String(Damage) + " Normal Slash";
+				} else if (DamageType == "crushing") {
+					TotalDamage = String(Damage) + " Normal Crush";
+				} else {
+					TotalDamage = String(Damage) + " Normal Unknown Damage Type";
+				}
+			}
+			console.log("  TotalDamage: " + TotalDamage);
+			
+/*			console.log(" rollResult.results.Roll.rolls " + JSON.stringify(rollResult.results.Roll.rolls) );
+			console.log(" Roll Num Die " + rollResult.results.Roll.rolls[0].dice );
+			console.log(" Roll Sides Die " + rollResult.results.Roll.rolls[0].sides );
+
+			console.log(" rollResult.results.Damage.rolls " + JSON.stringify(rollResult.results.Damage.rolls) );
+			console.log(" Roll Num Damage Die " + rollResult.results.Damage.rolls[0].dice );
+			console.log(" Roll Sides Damage Die " + rollResult.results.Damage.rolls[0].sides );
+*/
+			finishRoll(
+				rollResult.rollId,
+				{
+					Impact: TotalDamage
+				}
+			);
+		});
+
+
+	});
+
+});
+
+on("change:magicScript1Rune1 change:magicScript1Rune2 change:magicScript1Rune3 change:magicScript1Rune4 change:magicScript1Rune5 change:magicScript1Rune6 change:magicScript1Rune7 change:magicScript1Rune8 change:magicScript1Rune9", function(eventInfo) {
+	let NewValue = eventInfo.newValue;
+	let OldValue = eventInfo.previousValue;
+	let SourceAttribute = eventInfo.sourceAttribute;
+			
+	console.log(" magicScript1 change: NewValue " + NewValue + " OldValue " + OldValue + " SourceAttribute " + SourceAttribute );
+
+	getAttrs(["magicScript1Rune1","magicScript1Rune2","magicScript1Rune3","magicScript1Rune4","magicScript1Rune5","magicScript1Rune6","magicScript1Rune7","magicScript1Rune8","magicScript1Rune9"], function(values) {
+		let Rune1 = values.magicScript1Rune1;
+		let Rune2 = values.magicScript1Rune2;
+		let Rune3 = values.magicScript1Rune3;
+		let Rune4 = values.magicScript1Rune4;
+		let Rune5 = values.magicScript1Rune5;
+		let Rune6 = values.magicScript1Rune6;
+		let Rune7 = values.magicScript1Rune7;
+		let Rune8 = values.magicScript1Rune8;
+		let Rune9 = values.magicScript1Rune9;
+		
+		let numActiveRunes = 0;
+		if (Rune1 > '~') { numActiveRunes += 1; console.log("  Rune1 active " + Rune1); }
+		if (Rune2 > '~') { numActiveRunes += 1; console.log("  Rune2 active " + Rune2); }
+		if (Rune3 > '~') { numActiveRunes += 1; console.log("  Rune3 active " + Rune3); }
+		if (Rune4 > '~') { numActiveRunes += 1; console.log("  Rune4 active " + Rune4); }
+		if (Rune5 > '~') { numActiveRunes += 1; console.log("  Rune5 active " + Rune5); }
+		if (Rune6 > '~') { numActiveRunes += 1; console.log("  Rune6 active " + Rune6); }
+		if (Rune7 > '~') { numActiveRunes += 1; console.log("  Rune7 active " + Rune7); }
+		if (Rune8 > '~') { numActiveRunes += 1; console.log("  Rune8 active " + Rune8); }
+		if (Rune9 > '~') { numActiveRunes += 1; console.log("  Rune9 active " + Rune9); }
+
+		console.log("  magicScript1 active runes: " + numActiveRunes);
+		setAttrs({ rune_script_1_active_runes: numActiveRunes });
+		
+	});
+});
+
+on("change:magicScript2Rune1 change:magicScript2Rune2 change:magicScript2Rune3 change:magicScript2Rune4 change:magicScript2Rune5 change:magicScript2Rune6 change:magicScript2Rune7 change:magicScript2Rune8 change:magicScript2Rune9", function(eventInfo) {
+	let NewValue = eventInfo.newValue;
+	let OldValue = eventInfo.previousValue;
+	let SourceAttribute = eventInfo.sourceAttribute;
+			
+	console.log(" magicScript2 change: NewValue " + NewValue + " OldValue " + OldValue + " SourceAttribute " + SourceAttribute );
+
+	getAttrs(["magicScript2Rune1","magicScript2Rune2","magicScript2Rune3","magicScript2Rune4","magicScript2Rune5","magicScript2Rune6","magicScript2Rune7","magicScript2Rune8","magicScript2Rune9"], function(values) {
+		let Rune1 = values.magicScript2Rune1;
+		let Rune2 = values.magicScript2Rune2;
+		let Rune3 = values.magicScript2Rune3;
+		let Rune4 = values.magicScript2Rune4;
+		let Rune5 = values.magicScript2Rune5;
+		let Rune6 = values.magicScript2Rune6;
+		let Rune7 = values.magicScript2Rune7;
+		let Rune8 = values.magicScript2Rune8;
+		let Rune9 = values.magicScript2Rune9;
+		
+		let numActiveRunes = 0;
+		if (Rune1 > '~') { numActiveRunes += 1; console.log("  Rune1 active " + Rune1); }
+		if (Rune2 > '~') { numActiveRunes += 1; console.log("  Rune2 active " + Rune2); }
+		if (Rune3 > '~') { numActiveRunes += 1; console.log("  Rune3 active " + Rune3); }
+		if (Rune4 > '~') { numActiveRunes += 1; console.log("  Rune4 active " + Rune4); }
+		if (Rune5 > '~') { numActiveRunes += 1; console.log("  Rune5 active " + Rune5); }
+		if (Rune6 > '~') { numActiveRunes += 1; console.log("  Rune6 active " + Rune6); }
+		if (Rune7 > '~') { numActiveRunes += 1; console.log("  Rune7 active " + Rune7); }
+		if (Rune8 > '~') { numActiveRunes += 1; console.log("  Rune8 active " + Rune8); }
+		if (Rune9 > '~') { numActiveRunes += 1; console.log("  Rune9 active " + Rune9); }
+
+		console.log("  magicScript2 active runes: " + numActiveRunes);
+		setAttrs({ rune_script_2_active_runes: numActiveRunes });
+		
+	});
+});
+
+on("change:magicScript3Rune1 change:magicScript3Rune2 change:magicScript3Rune3 change:magicScript3Rune4 change:magicScript3Rune5 change:magicScript3Rune6 change:magicScript3Rune7 change:magicScript3Rune8 change:magicScript3Rune9", function(eventInfo) {
+	let NewValue = eventInfo.newValue;
+	let OldValue = eventInfo.previousValue;
+	let SourceAttribute = eventInfo.sourceAttribute;
+			
+	console.log(" magicScript3 change: NewValue " + NewValue + " OldValue " + OldValue + " SourceAttribute " + SourceAttribute );
+
+	getAttrs(["magicScript3Rune1","magicScript3Rune2","magicScript3Rune3","magicScript3Rune4","magicScript3Rune5","magicScript3Rune6","magicScript3Rune7","magicScript3Rune8","magicScript3Rune9"], function(values) {
+		let Rune1 = values.magicScript3Rune1;
+		let Rune2 = values.magicScript3Rune2;
+		let Rune3 = values.magicScript3Rune3;
+		let Rune4 = values.magicScript3Rune4;
+		let Rune5 = values.magicScript3Rune5;
+		let Rune6 = values.magicScript3Rune6;
+		let Rune7 = values.magicScript3Rune7;
+		let Rune8 = values.magicScript3Rune8;
+		let Rune9 = values.magicScript3Rune9;
+		
+		let numActiveRunes = 0;
+		if (Rune1 > '~') { numActiveRunes += 1; console.log("  Rune1 active " + Rune1); }
+		if (Rune2 > '~') { numActiveRunes += 1; console.log("  Rune2 active " + Rune2); }
+		if (Rune3 > '~') { numActiveRunes += 1; console.log("  Rune3 active " + Rune3); }
+		if (Rune4 > '~') { numActiveRunes += 1; console.log("  Rune4 active " + Rune4); }
+		if (Rune5 > '~') { numActiveRunes += 1; console.log("  Rune5 active " + Rune5); }
+		if (Rune6 > '~') { numActiveRunes += 1; console.log("  Rune6 active " + Rune6); }
+		if (Rune7 > '~') { numActiveRunes += 1; console.log("  Rune7 active " + Rune7); }
+		if (Rune8 > '~') { numActiveRunes += 1; console.log("  Rune8 active " + Rune8); }
+		if (Rune9 > '~') { numActiveRunes += 1; console.log("  Rune9 active " + Rune9); }
+
+		console.log("  magicScript3 active runes: " + numActiveRunes);
+		setAttrs({ rune_script_3_active_runes: numActiveRunes });
+		
+	});
+});
+
+on("change:magicScript4Rune1 change:magicScript4Rune2 change:magicScript4Rune3 change:magicScript4Rune4 change:magicScript4Rune5 change:magicScript4Rune6 change:magicScript4Rune7 change:magicScript4Rune8 change:magicScript4Rune9", function(eventInfo) {
+	let NewValue = eventInfo.newValue;
+	let OldValue = eventInfo.previousValue;
+	let SourceAttribute = eventInfo.sourceAttribute;
+			
+	console.log(" magicScript4 change: NewValue " + NewValue + " OldValue " + OldValue + " SourceAttribute " + SourceAttribute );
+
+	getAttrs(["magicScript4Rune1","magicScript4Rune2","magicScript4Rune3","magicScript4Rune4","magicScript4Rune5","magicScript4Rune6","magicScript4Rune7","magicScript4Rune8","magicScript4Rune9"], function(values) {
+		let Rune1 = values.magicScript4Rune1;
+		let Rune2 = values.magicScript4Rune2;
+		let Rune3 = values.magicScript4Rune3;
+		let Rune4 = values.magicScript4Rune4;
+		let Rune5 = values.magicScript4Rune5;
+		let Rune6 = values.magicScript4Rune6;
+		let Rune7 = values.magicScript4Rune7;
+		let Rune8 = values.magicScript4Rune8;
+		let Rune9 = values.magicScript4Rune9;
+		
+		let numActiveRunes = 0;
+		if (Rune1 > '~') { numActiveRunes += 1; console.log("  Rune1 active " + Rune1); }
+		if (Rune2 > '~') { numActiveRunes += 1; console.log("  Rune2 active " + Rune2); }
+		if (Rune3 > '~') { numActiveRunes += 1; console.log("  Rune3 active " + Rune3); }
+		if (Rune4 > '~') { numActiveRunes += 1; console.log("  Rune4 active " + Rune4); }
+		if (Rune5 > '~') { numActiveRunes += 1; console.log("  Rune5 active " + Rune5); }
+		if (Rune6 > '~') { numActiveRunes += 1; console.log("  Rune6 active " + Rune6); }
+		if (Rune7 > '~') { numActiveRunes += 1; console.log("  Rune7 active " + Rune7); }
+		if (Rune8 > '~') { numActiveRunes += 1; console.log("  Rune8 active " + Rune8); }
+		if (Rune9 > '~') { numActiveRunes += 1; console.log("  Rune9 active " + Rune9); }
+
+		console.log("  magicScript1 active runes: " + numActiveRunes);
+		setAttrs({ rune_script_4_active_runes: numActiveRunes });
+		
+	});
+});
+
+on("clicked:script1_lock", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	console.log("  TriggerName: " + TriggerName);
+	console.log("  Name: " + Name);
+	console.log("  SN: " + SN);
+	console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points", "attribute_magic_points_current","attribute_magic_points_locked","rune_script_1_locked","rune_script_1_active_runes"], function(values) {
+		let MPMax = parseInt(values.attribute_magic_points)||0; 
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let MPLockActive = parseInt(values.rune_script_1_locked)||0; 
+		let runeScript1ActiveRunes = parseInt(values.rune_script_1_active_runes)||0; 
+		MPCost = 0;
+		if (runeScript1ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript1ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript1ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript1ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		console.log("  MPMax: " + MPMax + " MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		console.log("  MPLockActive:" + MPLockActive + " runeScript1ActiveRunes: " + runeScript1ActiveRunes);
+		
+		if (MPLockActive == 0) {
+			MPLocked += MPCost;
+			MPCur -= MPCost;
+			if (MPCur < 0) { MPCur = 0; }
+			MPLockActive = 1;
+		} else {
+			MPLocked -= MPCost;
+			if (MPLocked < 0) { MPLocked = 0; }
+			MPCur += MPCost;
+			if (MPCur > MPMax ) { MPCur = MPMax; }
+			MPLockActive = 0;
+		}
+
+		setAttrs({ attribute_magic_points_current: MPCur, rune_script_1_locked: MPLockActive, attribute_magic_points_locked: MPLocked });
+	});
+});
+
+on("clicked:script1", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	//console.log("  TriggerName: " + TriggerName);
+	//console.log("  Name: " + Name);
+	//console.log("  SN: " + SN);
+	//console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points_current","attribute_magic_points_locked","rune_script_1_active_runes","magicScript1Rune1","magicScript1Rune2","magicScript1Rune3","magicScript1Rune4","magicScript1Rune5","magicScript1Rune6","magicScript1Rune7","magicScript1Rune8","magicScript1Rune9"], function(values) {
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let runeScript1ActiveRunes = parseInt(values.rune_script_1_active_runes)||0; 
+		let Rune1 = values.magicScript1Rune1;
+		let Rune2 = values.magicScript1Rune2;
+		let Rune3 = values.magicScript1Rune3;
+		let Rune4 = values.magicScript1Rune4;
+		let Rune5 = values.magicScript1Rune5;
+		let Rune6 = values.magicScript1Rune6;
+		let Rune7 = values.magicScript1Rune7;
+		let Rune8 = values.magicScript1Rune8;
+		let Rune9 = values.magicScript1Rune9;
+
+		console.log("  runeScript1ActiveRunes: " + runeScript1ActiveRunes );
+		MPCost = 0;
+		if (runeScript1ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript1ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript1ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript1ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		MPCur -= MPCost;
+		MPLocked += MPCost;
+		if (MPCur < 0) {
+			MPCur = 0;
+		}
+		//console.log("  new MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		
+
+		const rollBase ="&{template:check} {{name=@{character_name} *casts* @{magicRuneMeaning"+SN+"a}}} {{Check=[[0]]}} {{RS=@{magicScript"+SN+"Rune1}@{magicScript"+SN+"Rune2}@{magicScript"+SN+"Rune3}@{magicScript"+SN+"Rune4}@{magicScript"+SN+"Rune5}@{magicScript"+SN+"Rune6}@{magicScript"+SN+"Rune7}@{magicScript"+SN+"Rune8}@{magicScript"+SN+"Rune9}}} {{Effects=@{magicRuneResult"+SN+"a} @{magicRuneResult"+SN+"b}  @{magicRuneResult"+SN+"c}  @{magicRuneResult"+SN+"d}}} {{MPCost="+MPCost+"}}";
+
+		//console.log("  rollBase = " + rollBase);
+
+	    startRoll(rollBase, rollResult => {
+		
+			setAttrs({ attribute_magic_points_current: MPCur, attribute_magic_points_locked: MPLocked, rune_script_1_locked: 1 });
+
+			finishRoll(
+				rollResult.rollId
+			);
+		});
+
+	});
+});
+
+on("clicked:script2_lock", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	console.log("  TriggerName: " + TriggerName);
+	console.log("  Name: " + Name);
+	console.log("  SN: " + SN);
+	console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points", "attribute_magic_points_current","attribute_magic_points_locked","rune_script_2_locked","rune_script_2_active_runes"], function(values) {
+		let MPMax = parseInt(values.attribute_magic_points)||0; 
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let MPLockActive = parseInt(values.rune_script_2_locked)||0; 
+		let runeScript2ActiveRunes = parseInt(values.rune_script_2_active_runes)||0; 
+		MPCost = 0;
+		if (runeScript2ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript2ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript2ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript2ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		console.log("  MPMax: " + MPMax + " MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		console.log("  MPLockActive:" + MPLockActive + " runeScript2ActiveRunes: " + runeScript2ActiveRunes);
+		
+		if (MPLockActive == 0) {
+			MPLocked += MPCost;
+			MPCur -= MPCost;
+			if (MPCur < 0) { MPCur = 0; }
+			MPLockActive = 1;
+		} else {
+			MPLocked -= MPCost;
+			if (MPLocked < 0) { MPLocked = 0; }
+			MPCur += MPCost;
+			if (MPCur > MPMax ) { MPCur = MPMax; }
+			MPLockActive = 0;
+		}
+
+		setAttrs({ attribute_magic_points_current: MPCur, rune_script_2_locked: MPLockActive, attribute_magic_points_locked: MPLocked });
+	});
+});
+
+on("clicked:script2", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	//console.log("  TriggerName: " + TriggerName);
+	//console.log("  Name: " + Name);
+	//console.log("  SN: " + SN);
+	//console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points_current","attribute_magic_points_locked","rune_script_2_active_runes","magicScript2Rune1","magicScript2Rune2","magicScript2Rune3","magicScript2Rune4","magicScript2Rune5","magicScript2Rune6","magicScript2Rune7","magicScript2Rune8","magicScript2Rune9"], function(values) {
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let runeScript2ActiveRunes = parseInt(values.rune_script_2_active_runes)||0; 
+		let Rune1 = values.magicScript2Rune1;
+		let Rune2 = values.magicScript2Rune2;
+		let Rune3 = values.magicScript2Rune3;
+		let Rune4 = values.magicScript2Rune4;
+		let Rune5 = values.magicScript2Rune5;
+		let Rune6 = values.magicScript2Rune6;
+		let Rune7 = values.magicScript2Rune7;
+		let Rune8 = values.magicScript2Rune8;
+		let Rune9 = values.magicScript2Rune9;
+
+		console.log("  runeScript2ActiveRunes: " + runeScript2ActiveRunes );
+		MPCost = 0;
+		if (runeScript2ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript2ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript2ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript2ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		MPCur -= MPCost;
+		MPLocked += MPCost;
+		if (MPCur < 0) {
+			MPCur = 0;
+		}
+		//console.log("  new MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		
+
+		const rollBase ="&{template:check} {{name=@{character_name} *casts* @{magicRuneMeaning"+SN+"a}}} {{Check=[[0]]}} {{RS=@{magicScript"+SN+"Rune1}@{magicScript"+SN+"Rune2}@{magicScript"+SN+"Rune3}@{magicScript"+SN+"Rune4}@{magicScript"+SN+"Rune5}@{magicScript"+SN+"Rune6}@{magicScript"+SN+"Rune7}@{magicScript"+SN+"Rune8}@{magicScript"+SN+"Rune9}}} {{Effects=@{magicRuneResult"+SN+"a} @{magicRuneResult"+SN+"b}  @{magicRuneResult"+SN+"c}  @{magicRuneResult"+SN+"d}}} {{MPCost="+MPCost+"}}";
+
+		//console.log("  rollBase = " + rollBase);
+
+	    startRoll(rollBase, rollResult => {
+		
+			setAttrs({ attribute_magic_points_current: MPCur, attribute_magic_points_locked: MPLocked, rune_script_2_locked: 1 });
+
+			finishRoll(
+				rollResult.rollId
+			);
+		});
+
+	});
+});
+
+on("clicked:script3_lock", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	console.log("  TriggerName: " + TriggerName);
+	console.log("  Name: " + Name);
+	console.log("  SN: " + SN);
+	console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points", "attribute_magic_points_current","attribute_magic_points_locked","rune_script_3_locked","rune_script_3_active_runes"], function(values) {
+		let MPMax = parseInt(values.attribute_magic_points)||0; 
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let MPLockActive = parseInt(values.rune_script_3_locked)||0; 
+		let runeScript3ActiveRunes = parseInt(values.rune_script_3_active_runes)||0; 
+		MPCost = 0;
+		if (runeScript3ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript3ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript3ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript3ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		console.log("  MPMax: " + MPMax + " MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		console.log("  MPLockActive:" + MPLockActive + " runeScript1ActiveRunes: " + runeScript3ActiveRunes);
+		
+		if (MPLockActive == 0) {
+			MPLocked += MPCost;
+			MPCur -= MPCost;
+			if (MPCur < 0) { MPCur = 0; }
+			MPLockActive = 1;
+		} else {
+			MPLocked -= MPCost;
+			if (MPLocked < 0) { MPLocked = 0; }
+			MPCur += MPCost;
+			if (MPCur > MPMax ) { MPCur = MPMax; }
+			MPLockActive = 0;
+		}
+
+		setAttrs({ attribute_magic_points_current: MPCur, rune_script_3_locked: MPLockActive, attribute_magic_points_locked: MPLocked });
+	});
+});
+
+on("clicked:script3", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	//console.log("  TriggerName: " + TriggerName);
+	//console.log("  Name: " + Name);
+	//console.log("  SN: " + SN);
+	//console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points_current","attribute_magic_points_locked","rune_script_3_active_runes","magicScript3Rune1","magicScript3Rune2","magicScript3Rune3","magicScript3Rune4","magicScript3Rune5","magicScript3Rune6","magicScript3Rune7","magicScript3Rune8","magicScript3Rune9"], function(values) {
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let runeScript3ActiveRunes = parseInt(values.rune_script_3_active_runes)||0; 
+		let Rune1 = values.magicScript3Rune1;
+		let Rune2 = values.magicScript3Rune2;
+		let Rune3 = values.magicScript3Rune3;
+		let Rune4 = values.magicScript3Rune4;
+		let Rune5 = values.magicScript3Rune5;
+		let Rune6 = values.magicScript3Rune6;
+		let Rune7 = values.magicScript3Rune7;
+		let Rune8 = values.magicScript3Rune8;
+		let Rune9 = values.magicScript3Rune9;
+
+		console.log("  runeScript3ActiveRunes: " + runeScript3ActiveRunes );
+		MPCost = 0;
+		if (runeScript3ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript3ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript3ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript3ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		MPCur -= MPCost;
+		MPLocked += MPCost;
+		if (MPCur < 0) {
+			MPCur = 0;
+		}
+		//console.log("  new MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		
+
+		const rollBase ="&{template:check} {{name=@{character_name} *casts* @{magicRuneMeaning"+SN+"a}}} {{Check=[[0]]}} {{RS=@{magicScript"+SN+"Rune1}@{magicScript"+SN+"Rune2}@{magicScript"+SN+"Rune3}@{magicScript"+SN+"Rune4}@{magicScript"+SN+"Rune5}@{magicScript"+SN+"Rune6}@{magicScript"+SN+"Rune7}@{magicScript"+SN+"Rune8}@{magicScript"+SN+"Rune9}}} {{Effects=@{magicRuneResult"+SN+"a} @{magicRuneResult"+SN+"b}  @{magicRuneResult"+SN+"c}  @{magicRuneResult"+SN+"d}}} {{MPCost="+MPCost+"}}";
+
+		//console.log("  rollBase = " + rollBase);
+
+	    startRoll(rollBase, rollResult => {
+		
+			setAttrs({ attribute_magic_points_current: MPCur, attribute_magic_points_locked: MPLocked, rune_script_3_locked: 1 });
+
+			finishRoll(
+				rollResult.rollId
+			);
+		});
+
+	});
+});
+
+on("clicked:script4_lock", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	console.log("  TriggerName: " + TriggerName);
+	console.log("  Name: " + Name);
+	console.log("  SN: " + SN);
+	console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points", "attribute_magic_points_current","attribute_magic_points_locked","rune_script_4_locked","rune_script_4_active_runes"], function(values) {
+		let MPMax = parseInt(values.attribute_magic_points)||0; 
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let MPLockActive = parseInt(values.rune_script_4_locked)||0; 
+		let runeScript4ActiveRunes = parseInt(values.rune_script_4_active_runes)||0; 
+		MPCost = 0;
+		if (runeScript4ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript4ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript4ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript4ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		console.log("  MPMax: " + MPMax + " MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		console.log("  MPLockActive:" + MPLockActive + " runeScript4ActiveRunes: " + runeScript4ActiveRunes);
+		
+		if (MPLockActive == 0) {
+			MPLocked += MPCost;
+			MPCur -= MPCost;
+			if (MPCur < 0) { MPCur = 0; }
+			MPLockActive = 1;
+		} else {
+			MPLocked -= MPCost;
+			if (MPLocked < 0) { MPLocked = 0; }
+			MPCur += MPCost;
+			if (MPCur > MPMax ) { MPCur = MPMax; }
+			MPLockActive = 0;
+		}
+
+		setAttrs({ attribute_magic_points_current: MPCur, rune_script_4_locked: MPLockActive, attribute_magic_points_locked: MPLocked });
+	});
+});
+
+on("clicked:script4", function(eventInfo) {
+	let TriggerName = eventInfo.triggerName;
+	let Name = eventInfo.triggerName.substring(8);
+	let SN = Name.substring(6); //Script Number
+
+
+	//console.log("  TriggerName: " + TriggerName);
+	//console.log("  Name: " + Name);
+	//console.log("  SN: " + SN);
+	//console.log("  eventInfo: " + JSON.stringify(eventInfo));
+	
+	getAttrs(["attribute_magic_points_current","attribute_magic_points_locked","rune_script_4_active_runes","magicScript4Rune1","magicScript4Rune2","magicScript4Rune3","magicScript4Rune4","magicScript4Rune5","magicScript4Rune6","magicScript4Rune7","magicScript4Rune8","magicScript4Rune9"], function(values) {
+		let MPCur = parseInt(values.attribute_magic_points_current)||0; 
+		let MPLocked = parseInt(values.attribute_magic_points_locked)||0; 
+		let runeScript4ActiveRunes = parseInt(values.rune_script_4_active_runes)||0; 
+		let Rune1 = values.magicScript4Rune1;
+		let Rune2 = values.magicScript4Rune2;
+		let Rune3 = values.magicScript4Rune3;
+		let Rune4 = values.magicScript4Rune4;
+		let Rune5 = values.magicScript4Rune5;
+		let Rune6 = values.magicScript4Rune6;
+		let Rune7 = values.magicScript4Rune7;
+		let Rune8 = values.magicScript4Rune8;
+		let Rune9 = values.magicScript4Rune9;
+
+		console.log("  runeScript4ActiveRunes: " + runeScript4ActiveRunes );
+		MPCost = 0;
+		if (runeScript4ActiveRunes == 9) {
+			MPCost = 18; 
+		} else if (runeScript4ActiveRunes > 6) {
+			MPCost = 14; 
+		} else if (runeScript4ActiveRunes > 4) {
+			MPCost = 10; 
+		} else if (runeScript4ActiveRunes > 0){
+			MPCost = 6; 
+		} else {
+			MPCost = 0;
+		}
+		MPCur -= MPCost;
+		MPLocked += MPCost;
+		if (MPCur < 0) {
+			MPCur = 0;
+		}
+		//console.log("  new MPCur: " + MPCur + " MPLocked: " + MPLocked);
+		
+
+		const rollBase ="&{template:check} {{name=@{character_name} *casts* @{magicRuneMeaning"+SN+"a}}} {{Check=[[0]]}} {{RS=@{magicScript"+SN+"Rune1}@{magicScript"+SN+"Rune2}@{magicScript"+SN+"Rune3}@{magicScript"+SN+"Rune4}@{magicScript"+SN+"Rune5}@{magicScript"+SN+"Rune6}@{magicScript"+SN+"Rune7}@{magicScript"+SN+"Rune8}@{magicScript"+SN+"Rune9}}} {{Effects=@{magicRuneResult"+SN+"a} @{magicRuneResult"+SN+"b}  @{magicRuneResult"+SN+"c}  @{magicRuneResult"+SN+"d}}} {{MPCost="+MPCost+"}}";
+
+		//console.log("  rollBase = " + rollBase);
+
+	    startRoll(rollBase, rollResult => {
+		
+			setAttrs({ attribute_magic_points_current: MPCur, attribute_magic_points_locked: MPLocked, rune_script_4_locked: 1 });
+
+			finishRoll(
+				rollResult.rollId
+			);
+		});
+
+	});
+});
+
+/*
+on("clicked:script2 clicked:script3 clicked:script4", function(eventInfo) {
 	let TriggerName = eventInfo.triggerName;
 	let Name = eventInfo.triggerName.substring(8);
 	let SN = Name.substring(6); //Script Number
@@ -23567,7 +25189,7 @@ on("clicked:script1 clicked:script2 clicked:script3 clicked:script4  clicked:scr
 		//console.log("  new MPCur: " + MPCur + " MPLocked: " + MPLocked);
 		
 
-		const rollBase ="&{template:check} {{name=@{character_name} *casts* @{magicRuneMeaning"+SN+"a}}} {{Check=[[0]]}} {{RS=  @{magicScript"+SN+"Rune1}@{magicScript"+SN+"Rune2}@{magicScript"+SN+"Rune3}@{magicScript"+SN+"Rune4}@{magicScript"+SN+"Rune5}@{magicScript"+SN+"Rune6}}} {{Effects=@{magicRuneResult"+SN+"a} @{magicRuneResult"+SN+"b}  @{magicRuneResult"+SN+"c}  @{magicRuneResult"+SN+"d}}}";
+		const rollBase ="&{template:check} {{name=@{character_name} *casts* @{magicRuneMeaning"+SN+"a}}} {{Check=[[0]]}} {{RS=@{magicScript"+SN+"Rune1}@{magicScript"+SN+"Rune2}@{magicScript"+SN+"Rune3}@{magicScript"+SN+"Rune4}@{magicScript"+SN+"Rune5}@{magicScript"+SN+"Rune6}@{magicScript"+SN+"Rune7}@{magicScript"+SN+"Rune8}@{magicScript"+SN+"Rune9}}} {{Effects=@{magicRuneResult"+SN+"a} @{magicRuneResult"+SN+"b}  @{magicRuneResult"+SN+"c}  @{magicRuneResult"+SN+"d}}}";
 
 		//console.log("  rollBase = " + rollBase);
 
@@ -23582,7 +25204,7 @@ on("clicked:script1 clicked:script2 clicked:script3 clicked:script4  clicked:scr
 
 	});
 });
-
+*/
 on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seidur5 clicked:seidur6", function(eventInfo) {
 	let TriggerName = eventInfo.triggerName;
 	let Name = eventInfo.triggerName.substring(8);
@@ -23800,8 +25422,18 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 
 		});
 
-			on("change:characteristic_str change:characteristic_con change:characteristic_siz change:characteristic_dex change:characteristic_int change:characteristic_pow change:characteristic_cha", function() {
-			   getAttrs(["characteristic_str","characteristic_con","characteristic_siz","characteristic_dex","characteristic_int","characteristic_pow","characteristic_cha"], function(values) {
+			on("change:characteristic_str change:characteristic_con change:characteristic_siz change:characteristic_dex change:characteristic_int change:characteristic_pow change:characteristic_cha change:character_personality_type change:character_encumbrance_penalty", function() {
+			   getAttrs(["characteristic_str","characteristic_con","characteristic_siz","characteristic_dex","characteristic_int","characteristic_pow","characteristic_cha",
+						"character_personality_type",
+						"character_encumbrance_penalty",
+						"character_spirit_animal_agility",
+						"character_spirit_animal_manipulation",
+						"character_spirit_animal_mythic",
+						"character_spirit_animal_knowledge",
+						"character_spirit_animal_perception",
+						"character_spirit_animal_stealth",
+						"character_spirit_animal_communication"
+						], function(values) {
 					let Str = parseInt(values.characteristic_str)||0;
 					let Con = parseInt(values.characteristic_con)||0;
 					let Siz = parseInt(values.characteristic_siz)||0;
@@ -23809,7 +25441,17 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let Int = parseInt(values.characteristic_int)||0;
 					let Pow = parseInt(values.characteristic_pow)||0;
 					let Cha = parseInt(values.characteristic_cha)||0;
-					//console.log(" Str: " + Str + " Con: " + Con + " Siz: " + Siz + " Dex " + Dex + " Int: " + Int + " Pow: " + Pow + " Cha: " + Cha);
+					let SA_agility = parseInt(values.character_spirit_animal_agility)||0;
+					let SA_manipulation = parseInt(values.character_spirit_animal_manipulation)||0;
+					let SA_mythic = parseInt(values.character_spirit_animal_mythic)||0;
+					let SA_knowledge = parseInt(values.character_spirit_animal_knowledge)||0;
+					let SA_perception = parseInt(values.character_spirit_animal_perception)||0;
+					let SA_stealth = parseInt(values.character_spirit_animal_stealth)||0;
+					let SA_communication = parseInt(values.character_spirit_animal_communication)||0;
+					let EncumbrancePenalty = parseInt(values.character_encumbrance_penalty)||0;
+					console.log(" Str: " + Str + " Con: " + Con + " Siz: " + Siz + " Dex " + Dex + " Int: " + Int + " Pow: " + Pow + " Cha: " + Cha);
+					console.log(" SA_agility: " + SA_agility + " SA_manipulation: " + SA_manipulation + " SA_mythic: " + SA_mythic + " SA_knowledge " + SA_knowledge + " SA_perception: " + SA_perception + " SA_stealth: " + SA_stealth + " SA_communication: " + SA_communication);
+					console.log(" EncumbrancePenalty: " + EncumbrancePenalty);
 					
 					// Calculate Attributes
 					let Healing = Math.ceil(Con/6);
@@ -23826,26 +25468,33 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					// Calculate Characteristic Modifiers
 					let StrMod = 0;
 					if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
+					
+					let DexMod = 0;
+					if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					
 					let SizMod = 0;
 					if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
-					let DexMod = 0;
-					if (Dex < 5) {DexMod = 10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					let SizStealthMod = 0;
+					if (Siz < 5) {SizStealthMod = 10;} else if (Siz < 9) {SizStealthMod = 5;} else if (Siz > 12) {SizStealthMod = Math.ceil((Siz-12)/4) * -5;}
+
 					// NOTE: PowMod is a NEGATIVE for Stealth
 					let PowMod = 0;
 					if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
 					// NOTE: PowMod DIFFERENT for Mythic
 					let PowMythMod = 0;
-					if (Pow < 5) {PowMythMod = 10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					
 					// NOTE: IntMod is DIFFERENT for Communications
 					let IntComMod = 0;
 					if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
 					let IntMod = 0;
-					if (Int < 5) {IntMod = 10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					
 					// NOTE: ChaMod is DIFFERENT for Communications
-					let ChaComMod = 0;
-					if (Cha < 5) {ChaComMod = -5;} else if (Cha > 16) {ChaComMod = Math.ceil((Cha-16)/4) * 5;}
 					let ChaMod = 0;
-					if (Cha < 5) {ChaMod = 10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
+					if (Cha < 5) {ChaMod = -5;} else if (Cha > 16) {ChaMod = Math.ceil((Cha-16)/4) * 5;}
+					let ChaComMod = 0;
+					if (Cha < 5) {ChaComMod = -10;} else if (Cha < 9) {ChaComMod = -5;} else if (Cha > 12) {ChaComMod = Math.ceil((Cha-12)/4) * 5;}
 
 					// Hit Point Modifiers
 					let SizHPMod = 0;
@@ -23867,16 +25516,20 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 
 
 					// Calculate Skill Modifiers
-					let AgilityValue = StrMod + DexMod + PowMod - SizMod;
-					let CommunicationsValue = ChaComMod + IntComMod + PowMod;					
-					let KnowledgeValue = IntMod + PowMod;
-					let ManipulationValue = StrMod + DexMod + PowMod + IntMod;
-					let PerceptionValue = IntMod + PowMod;
-					let StealthValue = StrMod + DexMod - PowMod + SizMod; //Note SizMod is negative
-					let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod;
-					let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod;
-					let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod;
-					let MythicValue = ChaMod + PowMythMod;
+					let AgilityValue = StrMod + SizMod + DexMod + PowMod + SA_agility - 5*EncumbrancePenalty;
+					console.log("  Agility Mod: " + AgilityValue + " from StrMod " + StrMod + " DexMod " + DexMod + " PowMod " + PowMod + " + SizMod " + SizMod + " SA_agility " + SA_agility + " EncumbrancePenalty " + -5*EncumbrancePenalty);
+					let CommunicationsValue = ChaComMod + IntComMod + PowMod + SA_communication;					
+					console.log("  Communications Mod: " + CommunicationsValue + " from ChaComMod " + ChaComMod + " IntComMod " + IntComMod + " PowMod " + PowMod + " SA_communication " + SA_communication);
+					let KnowledgeValue = IntMod + PowMod + SA_knowledge;
+					let ManipulationValue = StrMod + DexMod + IntMod + PowMod + SA_manipulation - 5*EncumbrancePenalty;
+					console.log("  Manipulation Mod: " + ManipulationValue + " from StrMod " + StrMod + " DexMod " + DexMod + " IntMod " + IntMod + " PowMod " + PowMod + " SA_manipulation " + SA_manipulation + " EncumbrancePenalty " + -5*EncumbrancePenalty);
+					let PerceptionValue = IntMod + PowMod + SA_perception;
+					let StealthValue = SizStealthMod + DexMod + IntMod - PowMod + SA_stealth - 5*EncumbrancePenalty;
+					console.log("  Stealth Mod: " + StealthValue + " from SizStealthMod " + SizStealthMod + " DexMod " + DexMod + " + IntMod " + IntMod + " - PowMod " + PowMod + " SA_stealth " + SA_stealth + " EncumbrancePenalty " + -5*EncumbrancePenalty);
+					let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod - 5*EncumbrancePenalty;
+					let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod - 5*EncumbrancePenalty;
+					let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod - 5*EncumbrancePenalty;
+					let MythicValue = ChaMod + PowMythMod + SA_mythic;
 					
 					//console.log(" Con: " + Con + " Healing: " + Healing + " Maximum Encumbrance" + Enc + " MP " + MP);
 
@@ -23928,8 +25581,11 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 			});	
 
 
-			on("change:npcStr change:npcCon change:npcSiz change:npcDex change:npcInt change:npcPow change:npcCha", function() {
-			   getAttrs(["npcStr","npcCon","npcSiz","npcDex","npcInt","npcPow","npcCha"], function(values) {
+			on("change:npcStr change:npcCon change:npcSiz change:npcDex change:npcInt change:npcPow change:npcCha change:npc_spirit_animal_flag", function() {
+			   getAttrs(["npcStr","npcCon","npcSiz","npcDex","npcInt","npcPow","npcCha",
+			   "npc_spirit_animal_agility","npc_spirit_animal_communication","npc_spirit_animal_knowledge",
+			   "npc_spirit_animal_manipulation","npc_spirit_animal_mythic","npc_spirit_animal_perception","npc_spirit_animal_stealth"
+			   ], function(values) {
 					let Str = parseInt(values.npcStr)||0;
 					let Con = parseInt(values.npcCon)||0;
 					let Siz = parseInt(values.npcSiz)||0;
@@ -23937,6 +25593,83 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let Int = parseInt(values.npcInt)||0;
 					let Pow = parseInt(values.npcPow)||0;
 					let Cha = parseInt(values.npcCha)||0;
+					let SA_agility = parseInt(values.npc_spirit_animal_agility)||0;
+					let SA_communication = parseInt(values.npc_spirit_animal_communication)||0;
+					let SA_knowledge = parseInt(values.npc_spirit_animal_knowledge)||0;
+					let SA_manipulation = parseInt(values.npc_spirit_animal_manipulation)||0;
+					let SA_mythic = parseInt(values.npc_spirit_animal_mythic)||0;
+					let SA_perception = parseInt(values.npc_spirit_animal_perception)||0;
+					let SA_stealth = parseInt(values.npc_spirit_animal_stealth)||0;
+					
+					console.log("Spirit Animal Mod: Agility " + SA_agility + " Com " + SA_communication + " Know " + SA_knowledge + " Manip " + SA_manipulation + " Myth " + SA_mythic + " Percep " + SA_perception + " Stealth " + SA_stealth);
+
+					// Calculate Characteristic Modifiers
+					let StrMod = 0;
+					if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
+					
+					let DexMod = 0;
+					if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					
+					let SizMod = 0;
+					if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
+					let SizStealthMod = 0;
+					if (Siz < 5) {SizStealthMod = 10;} else if (Siz < 9) {SizStealthMod = 5;} else if (Siz > 12) {SizStealthMod = Math.ceil((Siz-12)/4) * -5;}
+
+					// NOTE: PowMod is a NEGATIVE for Stealth
+					let PowMod = 0;
+					if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
+					// NOTE: PowMod DIFFERENT for Mythic
+					let PowMythMod = 0;
+					if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					
+					// NOTE: IntMod is DIFFERENT for Communications
+					let IntComMod = 0;
+					if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
+					let IntMod = 0;
+					if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					
+					// NOTE: ChaMod is DIFFERENT for Communications
+					let ChaMod = 0;
+					if (Cha < 5) {ChaMod = -5;} else if (Cha > 16) {ChaMod = Math.ceil((Cha-16)/4) * 5;}
+					let ChaComMod = 0;
+					if (Cha < 5) {ChaComMod = -10;} else if (Cha < 9) {ChaComMod = -5;} else if (Cha > 12) {ChaComMod = Math.ceil((Cha-12)/4) * 5;}
+
+					// Hit Point Modifiers
+					let SizHPMod = 0;
+					if (Siz < 5) {SizHPMod = -2;} else if (Siz < 9) {SizHPMod = -1;} else if (Siz > 12) {SizHPMod = Math.ceil((Siz-12)/4);}
+					let PowHPMod = 0;
+					if (Pow < 5) {PowHPMod = -1;} else if (Pow > 16) {PowHPMod = Math.ceil((Pow-16)/4);}
+					let HP = Con + SizHPMod + PowHPMod;
+					let CurHP = HP;
+					//console.log(" HP = " + HP + " as  Con " + Con + " + SizHPMod " + SizHPMod + " + PowHPMod " + PowHPMod);
+
+					// Hit Points per Location
+ 					let hpLeg = 2 + Math.ceil((HP-6)/3);
+					let hpAbdomen = hpLeg;
+					let hpChest = hpLeg + 1;
+					let hpArm = hpLeg - 1;
+					let hpHead = hpLeg;
+
+					//console.log(" Head/Abdomen/Leg " + hpLeg + " hpChest " + hpChest + " hpArm " + hpArm);
+
+
+					// Calculate Skill Modifiers
+					let AgilityValue = StrMod + SizMod + DexMod + PowMod + SA_agility;
+					console.log("  Agility Mod: " + AgilityValue + " from StrMod " + StrMod + " DexMod " + DexMod + " PowMod " + PowMod + " + SizMod " + SizMod + " SA_agility " + SA_agility);
+					let CommunicationsValue = ChaComMod + IntComMod + PowMod + SA_communication;					
+					console.log("  Communications Mod: " + CommunicationsValue + " from ChaComMod " + ChaComMod + " IntComMod " + IntComMod + " PowMod " + PowMod + " SA_communication " + SA_communication);
+					let KnowledgeValue = IntMod + PowMod + SA_knowledge;
+					let ManipulationValue = StrMod + DexMod + IntMod + PowMod + SA_manipulation;
+					console.log("  Manipulation Mod: " + ManipulationValue + " from StrMod " + StrMod + " DexMod " + DexMod + " IntMod " + IntMod + " PowMod " + PowMod + " SA_manipulation " + SA_manipulation);
+					let PerceptionValue = IntMod + PowMod + SA_perception;
+					let StealthValue = SizStealthMod + DexMod + IntMod - PowMod + SA_stealth;
+					console.log("  Stealth Mod: " + StealthValue + " from SizStealthMod " + SizStealthMod + " DexMod " + DexMod + " + IntMod " + IntMod + " - PowMod " + PowMod + " SA_stealth " + SA_stealth);
+					let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod;
+					let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod;
+					let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod;
+					let MythicValue = ChaMod + PowMythMod + SA_mythic;
+
+
 					
 					// Calculate Attributes
 					let Healing = Math.ceil(Con/6);
@@ -23949,30 +25682,30 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 						
 					//console.log("Follower - Str: " + Str + " Siz: " + Siz + " DamageModifier: " + DamageModifier + " missleDB if needed " + missileDamageModifier);
 
-
-					// Calculate Characteristic Modifiers
+/*
+					// Calculate Characteristic Modifiers 
 					let StrMod = 0;
 					if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
 					let SizMod = 0;
 					if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
 					let DexMod = 0;
-					if (Dex < 5) {DexMod = 10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
 					// NOTE: PowMod is a NEGATIVE for Stealth
 					let PowMod = 0;
 					if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
 					// NOTE: PowMod DIFFERENT for Mythic
 					let PowMythMod = 0;
-					if (Pow < 5) {PowMythMod = 10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
 					// NOTE: IntMod is DIFFERENT for Communications
 					let IntComMod = 0;
 					if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
 					let IntMod = 0;
-					if (Int < 5) {IntMod = 10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
 					// NOTE: ChaMod is DIFFERENT for Communications
 					let ChaComMod = 0;
 					if (Cha < 5) {ChaComMod = -5;} else if (Cha > 16) {ChaComMod = Math.ceil((Cha-16)/4) * 5;}
 					let ChaMod = 0;
-					if (Cha < 5) {ChaMod = 10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
+					if (Cha < 5) {ChaMod = -10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
 
 					// Hit Point Modifiers
 					let SizHPMod = 0;
@@ -24006,7 +25739,7 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let MythicValue = ChaMod + PowMythMod;
 					
 					//console.log(" Con: " + Con + " Healing: " + Healing + " Maximum Encumbrance" + Enc + " MP " + MP);
-
+*/
 					setAttrs({
 								npcDamageMod: DamageModifier,
 								npcMP: MP, 
@@ -24023,27 +25756,15 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 								mythicModN1: MythicValue,
 								meleeWeaponsModN1: MeleeWeaponsValue,
 								missileWeaponsModN1: MissileWeaponsValue,
-								naturalWeaponsModN1: NaturalWeaponsValue,
-								hpHeadN1: hpHead,
-								hpHeadMaxN1: hpHead,
-								hpAbdomenN1: hpAbdomen, 
-								hpAbdomenMaxN1: hpAbdomen,
-								hpChestN1: hpChest, 
-								hpChestMaxN1: hpChest,
-								hpRightArmN1: hpArm, 
-								hpRightArmMaxN1: hpArm,
-								hpLeftArmN1: hpArm, 
-								hpLeftArmMaxN1: hpArm,
-								hpRightLegN1: hpLeg, 
-								hpRightLegMaxN1: hpLeg,
-								hpLeftLegN1: hpLeg, 
-								hpLeftLegMaxN1: hpLeg
-							});
+								naturalWeaponsModN1: NaturalWeaponsValue
+					});
 			   });
 			})
 
-			on("change:follower1Str change:follower1Con change:follower1Siz change:follower1Dex change:follower1Int change:follower1Pow change:follower1Cha", function() {
-			   getAttrs(["follower1Str","follower1Con","follower1Siz","follower1Dex","follower1Int","follower1Pow","follower1Cha"], function(values) {
+			on("change:follower1Str change:follower1Con change:follower1Siz change:follower1Dex change:follower1Int change:follower1Pow change:follower1Cha change:follower1_spirit_animal_flag", function() {
+			   getAttrs(["follower1Str","follower1Con","follower1Siz","follower1Dex","follower1Int","follower1Pow","follower1Cha",
+			   			   "follower1_spirit_animal_agility","follower1_spirit_animal_communication","follower1_spirit_animal_knowledge",
+						   "follower1_spirit_animal_manipulation","follower1_spirit_animal_mythic","follower1_spirit_animal_perception","follower1_spirit_animal_stealth"], function(values) {
 					let Str = parseInt(values.follower1Str)||0;
 					let Con = parseInt(values.follower1Con)||0;
 					let Siz = parseInt(values.follower1Siz)||0;
@@ -24051,42 +25772,47 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let Int = parseInt(values.follower1Int)||0;
 					let Pow = parseInt(values.follower1Pow)||0;
 					let Cha = parseInt(values.follower1Cha)||0;
+					let SA_agility = parseInt(values.follower1_spirit_animal_agility)||0;
+					let SA_communication = parseInt(values.follower1_spirit_animal_communication)||0;
+					let SA_knowledge = parseInt(values.follower1_spirit_animal_knowledge)||0;
+					let SA_manipulation = parseInt(values.follower1_spirit_animal_manipulation)||0;
+					let SA_mythic = parseInt(values.follower1_spirit_animal_mythic)||0;
+					let SA_perception = parseInt(values.follower1_spirit_animal_perception)||0;
+					let SA_stealth = parseInt(values.follower1_spirit_animal_stealth)||0;
+					
+					console.log("Spirit Animal Mod: Agility " + SA_agility + " Com " + SA_communication + " Know " + SA_knowledge + " Manip " + SA_manipulation + " Myth " + SA_mythic + " Percep " + SA_perception + " Stealth " + SA_stealth);
 					
-					// Calculate Attributes
-					let Healing = Math.ceil(Con/6);
-					let Enc = Math.ceil((Con + Str)/2);
-					let MP = Pow;
-					//     Calculate Damage Bonus, returns damage bonus in [0] and missle damage bonus in [1]
-					let dbValues = getDamageBonus(Str, Siz, Str + Siz);
-					let DamageModifier = dbValues[0];
-					let missileDamageModifier = dbValues[1];
-						
-					//console.log("Follower - Str: " + Str + " Siz: " + Siz + " DamageModifier: " + DamageModifier + " missleDB if needed " + missileDamageModifier);
-
 
 					// Calculate Characteristic Modifiers
 					let StrMod = 0;
 					if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
+					
+					let DexMod = 0;
+					if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					
 					let SizMod = 0;
 					if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
-					let DexMod = 0;
-					if (Dex < 5) {DexMod = 10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					let SizStealthMod = 0;
+					if (Siz < 5) {SizStealthMod = 10;} else if (Siz < 9) {SizStealthMod = 5;} else if (Siz > 12) {SizStealthMod = Math.ceil((Siz-12)/4) * -5;}
+
 					// NOTE: PowMod is a NEGATIVE for Stealth
 					let PowMod = 0;
 					if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
 					// NOTE: PowMod DIFFERENT for Mythic
 					let PowMythMod = 0;
-					if (Pow < 5) {PowMythMod = 10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					
 					// NOTE: IntMod is DIFFERENT for Communications
 					let IntComMod = 0;
 					if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
 					let IntMod = 0;
-					if (Int < 5) {IntMod = 10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					
 					// NOTE: ChaMod is DIFFERENT for Communications
-					let ChaComMod = 0;
-					if (Cha < 5) {ChaComMod = -5;} else if (Cha > 16) {ChaComMod = Math.ceil((Cha-16)/4) * 5;}
 					let ChaMod = 0;
-					if (Cha < 5) {ChaMod = 10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
+					if (Cha < 5) {ChaMod = -5;} else if (Cha > 16) {ChaMod = Math.ceil((Cha-16)/4) * 5;}
+					let ChaComMod = 0;
+					if (Cha < 5) {ChaComMod = -10;} else if (Cha < 9) {ChaComMod = -5;} else if (Cha > 12) {ChaComMod = Math.ceil((Cha-12)/4) * 5;}
 
 					// Hit Point Modifiers
 					let SizHPMod = 0;
@@ -24108,18 +25834,29 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 
 
 					// Calculate Skill Modifiers
-					let AgilityValue = StrMod + DexMod + PowMod - SizMod;
-					let CommunicationsValue = ChaComMod + IntComMod + PowMod;					
-					let KnowledgeValue = IntMod + PowMod;
-					let ManipulationValue = StrMod + DexMod + PowMod + IntMod;
-					let PerceptionValue = IntMod + PowMod;
-					let StealthValue = StrMod + DexMod - PowMod + SizMod; //Note SizMod is negative
+					let AgilityValue = StrMod + SizMod + DexMod + PowMod + SA_agility;
+					console.log("  Agility Mod: " + AgilityValue + " from StrMod " + StrMod + " DexMod " + DexMod + " PowMod " + PowMod + " + SizMod " + SizMod + " SA_agility " + SA_agility);
+					let CommunicationsValue = ChaComMod + IntComMod + PowMod + SA_communication;					
+					console.log("  Communications Mod: " + CommunicationsValue + " from ChaComMod " + ChaComMod + " IntComMod " + IntComMod + " PowMod " + PowMod + " SA_communication " + SA_communication);
+					let KnowledgeValue = IntMod + PowMod + SA_knowledge;
+					let ManipulationValue = StrMod + DexMod + IntMod + PowMod + SA_manipulation;
+					console.log("  Manipulation Mod: " + ManipulationValue + " from StrMod " + StrMod + " DexMod " + DexMod + " IntMod " + IntMod + " PowMod " + PowMod + " SA_manipulation " + SA_manipulation);
+					let PerceptionValue = IntMod + PowMod + SA_perception;
+					let StealthValue = SizStealthMod + DexMod + IntMod - PowMod + SA_stealth;
+					console.log("  Stealth Mod: " + StealthValue + " from SizStealthMod " + SizStealthMod + " DexMod " + DexMod + " + IntMod " + IntMod + " - PowMod " + PowMod + " SA_stealth " + SA_stealth);
 					let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod;
 					let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod;
 					let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod;
-					let MythicValue = ChaMod + PowMythMod;
-					
-					//console.log(" Con: " + Con + " Healing: " + Healing + " Maximum Encumbrance" + Enc + " MP " + MP);
+					let MythicValue = ChaMod + PowMythMod + SA_mythic;
+
+					// Calculate Attributes
+					let Healing = Math.ceil(Con/6);
+					let Enc = Math.ceil((Con + Str)/2);
+					let MP = Pow;
+					//     Calculate Damage Bonus, returns damage bonus in [0] and missle damage bonus in [1]
+					let dbValues = getDamageBonus(Str, Siz, Str + Siz);
+					let DamageModifier = dbValues[0];
+					let missileDamageModifier = dbValues[1];
 
 					setAttrs({
 								follower1DamageMod: DamageModifier,
@@ -24156,8 +25893,11 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 			   });
 			})
 
-			on("change:follower2Str change:follower2Con change:follower2Siz change:follower2Dex change:follower2Int change:follower2Pow change:follower2Cha", function() {
-			   getAttrs(["follower2Str","follower2Con","follower2Siz","follower2Dex","follower2Int","follower2Pow","follower2Cha"], function(values) {
+			on("change:follower2Str change:follower2Con change:follower2Siz change:follower2Dex change:follower2Int change:follower2Pow change:follower2Cha change:follower2_spirit_animal_flag", function() {
+			   getAttrs(["follower2Str","follower2Con","follower2Siz","follower2Dex","follower2Int","follower2Pow","follower2Cha",
+			   			 "follower2_spirit_animal_agility","follower2_spirit_animal_communication","follower2_spirit_animal_knowledge",
+						 "follower2_spirit_animal_manipulation","follower2_spirit_animal_mythic","follower2_spirit_animal_perception","follower2_spirit_animal_stealth"], function(values) {
+
 					let Str = parseInt(values.follower2Str)||0;
 					let Con = parseInt(values.follower2Con)||0;
 					let Siz = parseInt(values.follower2Siz)||0;
@@ -24165,6 +25905,15 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let Int = parseInt(values.follower2Int)||0;
 					let Pow = parseInt(values.follower2Pow)||0;
 					let Cha = parseInt(values.follower2Cha)||0;
+					let SA_agility = parseInt(values.follower2_spirit_animal_agility)||0;
+					let SA_communication = parseInt(values.follower2_spirit_animal_communication)||0;
+					let SA_knowledge = parseInt(values.follower2_spirit_animal_knowledge)||0;
+					let SA_manipulation = parseInt(values.follower2_spirit_animal_manipulation)||0;
+					let SA_mythic = parseInt(values.follower2_spirit_animal_mythic)||0;
+					let SA_perception = parseInt(values.follower2_spirit_animal_perception)||0;
+					let SA_stealth = parseInt(values.follower2_spirit_animal_stealth)||0;
+					
+					console.log("Spirit Animal Mod: Agility " + SA_agility + " Com " + SA_communication + " Know " + SA_knowledge + " Manip " + SA_manipulation + " Myth " + SA_mythic + " Percep " + SA_perception + " Stealth " + SA_stealth);
 					
 					// Calculate Attributes
 					let Healing = Math.ceil(Con/6);
@@ -24177,30 +25926,36 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 						
 					//console.log("Follower - Str: " + Str + " Siz: " + Siz + " DamageModifier: " + DamageModifier + " missleDB if needed " + missileDamageModifier);
 
-
 					// Calculate Characteristic Modifiers
 					let StrMod = 0;
 					if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
+					
+					let DexMod = 0;
+					if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					
 					let SizMod = 0;
 					if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
-					let DexMod = 0;
-					if (Dex < 5) {DexMod = 10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+					let SizStealthMod = 0;
+					if (Siz < 5) {SizStealthMod = 10;} else if (Siz < 9) {SizStealthMod = 5;} else if (Siz > 12) {SizStealthMod = Math.ceil((Siz-12)/4) * -5;}
+
 					// NOTE: PowMod is a NEGATIVE for Stealth
 					let PowMod = 0;
 					if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
 					// NOTE: PowMod DIFFERENT for Mythic
 					let PowMythMod = 0;
-					if (Pow < 5) {PowMythMod = 10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+					
 					// NOTE: IntMod is DIFFERENT for Communications
 					let IntComMod = 0;
 					if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
 					let IntMod = 0;
-					if (Int < 5) {IntMod = 10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+					
 					// NOTE: ChaMod is DIFFERENT for Communications
-					let ChaComMod = 0;
-					if (Cha < 5) {ChaComMod = -5;} else if (Cha > 16) {ChaComMod = Math.ceil((Cha-16)/4) * 5;}
 					let ChaMod = 0;
-					if (Cha < 5) {ChaMod = 10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
+					if (Cha < 5) {ChaMod = -5;} else if (Cha > 16) {ChaMod = Math.ceil((Cha-16)/4) * 5;}
+					let ChaComMod = 0;
+					if (Cha < 5) {ChaComMod = -10;} else if (Cha < 9) {ChaComMod = -5;} else if (Cha > 12) {ChaComMod = Math.ceil((Cha-12)/4) * 5;}
 
 					// Hit Point Modifiers
 					let SizHPMod = 0;
@@ -24222,18 +25977,20 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 
 
 					// Calculate Skill Modifiers
-					let AgilityValue = StrMod + DexMod + PowMod - SizMod;
-					let CommunicationsValue = ChaComMod + IntComMod + PowMod;					
-					let KnowledgeValue = IntMod + PowMod;
-					let ManipulationValue = StrMod + DexMod + PowMod + IntMod;
-					let PerceptionValue = IntMod + PowMod;
-					let StealthValue = StrMod + DexMod - PowMod + SizMod; //Note SizMod is negative
+					let AgilityValue = StrMod + SizMod + DexMod + PowMod + SA_agility;
+					console.log("  Agility Mod: " + AgilityValue + " from StrMod " + StrMod + " DexMod " + DexMod + " PowMod " + PowMod + " + SizMod " + SizMod + " SA_agility " + SA_agility);
+					let CommunicationsValue = ChaComMod + IntComMod + PowMod + SA_communication;					
+					console.log("  Communications Mod: " + CommunicationsValue + " from ChaComMod " + ChaComMod + " IntComMod " + IntComMod + " PowMod " + PowMod + " SA_communication " + SA_communication);
+					let KnowledgeValue = IntMod + PowMod + SA_knowledge;
+					let ManipulationValue = StrMod + DexMod + IntMod + PowMod + SA_manipulation;
+					console.log("  Manipulation Mod: " + ManipulationValue + " from StrMod " + StrMod + " DexMod " + DexMod + " IntMod " + IntMod + " PowMod " + PowMod + " SA_manipulation " + SA_manipulation);
+					let PerceptionValue = IntMod + PowMod + SA_perception;
+					let StealthValue = SizStealthMod + DexMod + IntMod - PowMod + SA_stealth;
+					console.log("  Stealth Mod: " + StealthValue + " from SizStealthMod " + SizStealthMod + " DexMod " + DexMod + " + IntMod " + IntMod + " - PowMod " + PowMod + " SA_stealth " + SA_stealth);
 					let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod;
 					let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod;
 					let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod;
-					let MythicValue = ChaMod + PowMythMod;
-					
-					//console.log(" Con: " + Con + " Healing: " + Healing + " Maximum Encumbrance" + Enc + " MP " + MP);
+					let MythicValue = ChaMod + PowMythMod + SA_mythic;
 
 					setAttrs({
 								follower2DamageMod: DamageModifier,
@@ -24271,8 +26028,8 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 
 
 
-
-			on("change:npcStr change:npcCon change:npcSiz change:npcDex change:npcInt change:npcPow change:npcCha", function() {
+/*
+			on("change:npcStr change:npcCon change:npcSiz change:npcDex change:npcInt change:npcPow change:npcCha change:npc_spirit_animal", function() {
 			   getAttrs(["npcStr","npcCon","npcSiz","npcDex","npcInt","npcPow","npcCha"], function(values) {
 					let Str = parseInt(values.npcStr)||0;
 					let Con = parseInt(values.npcCon)||0;
@@ -24349,31 +26106,320 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let MythicValue = ChaMod + PowMythMod;
 					
 					console.log(" Con: " + Con + " Healing: " + Healing + " Maximum Encumbrance " + Enc + " MP " + MP);
-/*
-					setAttrs({healing_rate: Healing, attribute_max_enc: Enc, damageModifier: DamageModifier, magicPoints: MP,
-								agilityValue: AgilityValue,
-								communicationValue: CommunicationsValue,
-								knowledgeValue: KnowledgeValue,
-								manipulationValue: ManipulationValue,
-								perceptionValue: PerceptionValue,
-								stealthValue: StealthValue,
-								mythicValue: MythicValue,
-								meleeWeaponsValue: MeleeWeaponsValue,
-								missileWeaponsValue: MissileWeaponsValue,
-								naturalWeaponsValue: NaturalWeaponsValue
-					});
-*/
+
 					setAttrs({npcDamageMod: DamageModifier, npcMP: MP, npcMaxHP: HP,
 							  npcHP: HP, npcCurHP: HP
 
 					});
 			   });
 			})
+*/
 
+			on("change:character_spirit_animal", function() {
+			   getAttrs(["character_spirit_animal"], function(values) {
+					let SA = values.character_spirit_animal;
+					console.log("  change spirit animal to: " + SA);
+					let SA_agility = 0; // Mighty
+					let SA_manipulation = 0;  //Steadfast
+					let SA_mythic = 0;  //Spiritual
+					let SA_knowledge = 0; //Wanderer
+					let SA_perception = 0; //Cunning
+					let SA_stealth = 0; //Cunning 
+					let SA_communication = 0; //Manipulative
+					let SA_flag = 0;
 
+					
+					let PersonalityType = "";
+					switch (SA.toLowerCase()) {
+							case "bear":
+							case "bull":
+							case "eagle": PersonalityType = "Mighty"; SA_agility = 20; SA_flag = 1; break;
+							case "beaver":
+							case "gyr falcon":
+							case "seal": PersonalityType = "Steadfast"; SA_manipulation = 20; SA_flag = 2; break;
+							case "cat":
+							case "golden plover":
+							case "raven": PersonalityType = "Spiritual"; SA_mythic = 20; SA_flag = 3; break;
+							case "goose":
+							case "horse":
+							case "wolf": PersonalityType = "Wanderer"; SA_knowledge = 20; SA_flag = 4; break;
+							case "owl":
+							case "snow fox":
+							case "weasel": PersonalityType = "Cunning"; SA_perception = 20; SA_stealth = 20; SA_flag = 5; break;
+							case "arctic tern":
+							case "dog":
+							case "mouse": PersonalityType = "Manipulative"; SA_communication = 20; SA_flag = 6; break;
+							default: console.log(" Unknown PersonalityType: " + SA.toLowerCase());
+					}
+					console.log(" PersonalityType: " + PersonalityType + " for " + SA + " SA flag " + SA_flag);
+
+					setAttrs({
+						character_personality_type: PersonalityType, 
+						character_spirit_animal_agility: SA_agility,
+						character_spirit_animal_manipulation: SA_manipulation,
+						character_spirit_animal_mythic: SA_mythic,
+						character_spirit_animal_knowledge: SA_knowledge,
+						character_spirit_animal_perception: SA_perception,
+						character_spirit_animal_stealth: SA_stealth,
+						character_spirit_animal_communication: SA_communication,
+						character_spirit_animal_flag: SA_flag
+					});
+			   });
+			})
+
+			on("change:npc_spirit_animal", function() {
+			   getAttrs(["npc_spirit_animal"], function(values) {
+					let SA = values.npc_spirit_animal;
+					console.log("  change spirit animal to: " + SA);
+					let SA_agility = 0; // Mighty
+					let SA_manipulation = 0;  //Steadfast
+					let SA_mythic = 0;  //Spiritual
+					let SA_knowledge = 0; //Wanderer
+					let SA_perception = 0; //Cunning
+					let SA_stealth = 0; //Cunning 
+					let SA_communication = 0; //Manipulative
+					let SA_flag = 0;
+
+					
+					switch (SA.toLowerCase()) {
+							case "bear":
+							case "bull":
+							case "eagle": SA_agility = 20; SA_flag = 1; break;
+							case "beaver":
+							case "gyr falcon":
+							case "seal": SA_manipulation = 20; SA_flag = 2; break;
+							case "cat":
+							case "golden plover":
+							case "raven": SA_mythic = 20; SA_flag = 3; break;
+							case "goose":
+							case "horse":
+							case "wolf": SA_knowledge = 20; SA_flag = 4; break;
+							case "owl":
+							case "snow fox":
+							case "weasel":  SA_perception = 20; SA_stealth = 20 ; SA_flag = 5; break;
+							case "arctic tern":
+							case "dog":
+							case "mouse":  SA_communication = 20; SA_flag = 6; break;
+							default: console.log(" Unknown SA: " + SA.toLowerCase());
+					}
+					console.log("  NPC SA flag: " + SA_flag);
+
+					setAttrs({
+						npc_spirit_animal_agility: SA_agility,
+						npc_spirit_animal_manipulation: SA_manipulation,
+						npc_spirit_animal_mythic: SA_mythic,
+						npc_spirit_animal_knowledge: SA_knowledge,
+						npc_spirit_animal_perception: SA_perception,
+						npc_spirit_animal_stealth: SA_stealth,
+						npc_spirit_animal_communication: SA_communication,
+						npc_spirit_animal_flag: SA_flag
+					});
+			   });
+			})
+
+			on("change:follower1_spirit_animal", function() {
+			   getAttrs(["follower1_spirit_animal"], function(values) {
+					let SA = values.follower1_spirit_animal;
+					console.log("  change follower1 spirit animal to: " + SA);
+					let SA_agility = 0; // Mighty
+					let SA_manipulation = 0;  //Steadfast
+					let SA_mythic = 0;  //Spiritual
+					let SA_knowledge = 0; //Wanderer
+					let SA_perception = 0; //Cunning
+					let SA_stealth = 0; //Cunning 
+					let SA_communication = 0; //Manipulative
+					let SA_flag = 0;
+
+					
+					switch (SA.toLowerCase()) {
+							case "bear":
+							case "bull":
+							case "eagle": SA_agility = 20; SA_flag = 1; break;
+							case "beaver":
+							case "gyr falcon":
+							case "seal": SA_manipulation = 20; SA_flag = 2; break;
+							case "cat":
+							case "golden plover":
+							case "raven": SA_mythic = 20; SA_flag = 3; break;
+							case "goose":
+							case "horse":
+							case "wolf": SA_knowledge = 20; SA_flag = 4; break;
+							case "owl":
+							case "snow fox":
+							case "weasel":  SA_perception = 20; SA_stealth = 20 ; SA_flag = 5; break;
+							case "arctic tern":
+							case "dog":
+							case "mouse":  SA_communication = 20; SA_flag = 6; break;
+							default: console.log(" Unknown SA: " + SA.toLowerCase());
+					}
+					console.log("  Follower1 SA flag: " + SA_flag);
+
+					setAttrs({
+						follower1_spirit_animal_agility: SA_agility,
+						follower1_spirit_animal_manipulation: SA_manipulation,
+						follower1_spirit_animal_mythic: SA_mythic,
+						follower1_spirit_animal_knowledge: SA_knowledge,
+						follower1_spirit_animal_perception: SA_perception,
+						follower1_spirit_animal_stealth: SA_stealth,
+						follower1_spirit_animal_communication: SA_communication,
+						follower1_spirit_animal_flag: SA_flag
+					});
+			   });
+			})
+
+			on("change:follower2_spirit_animal", function() {
+			   getAttrs(["follower2_spirit_animal"], function(values) {
+					let SA = values.follower2_spirit_animal;
+					console.log("  change follower2 spirit animal to: " + SA);
+					let SA_agility = 0; // Mighty
+					let SA_manipulation = 0;  //Steadfast
+					let SA_mythic = 0;  //Spiritual
+					let SA_knowledge = 0; //Wanderer
+					let SA_perception = 0; //Cunning
+					let SA_stealth = 0; //Cunning 
+					let SA_communication = 0; //Manipulative
+					let SA_flag = 0;
+
+					
+					switch (SA.toLowerCase()) {
+							case "bear":
+							case "bull":
+							case "eagle": SA_agility = 20; SA_flag = 1; break;
+							case "beaver":
+							case "gyr falcon":
+							case "seal": SA_manipulation = 20; SA_flag = 2; break;
+							case "cat":
+							case "golden plover":
+							case "raven": SA_mythic = 20; SA_flag = 3; break;
+							case "goose":
+							case "horse":
+							case "wolf": SA_knowledge = 20; SA_flag = 4; break;
+							case "owl":
+							case "snow fox":
+							case "weasel":  SA_perception = 20; SA_stealth = 20 ; SA_flag = 5; break;
+							case "arctic tern":
+							case "dog":
+							case "mouse":  SA_communication = 20; SA_flag = 6; break;
+							default: console.log(" Unknown SA: " + SA.toLowerCase());
+					}
+					console.log("  Follower2 SA flag: " + SA_flag);
+
+					setAttrs({
+						follower2_spirit_animal_agility: SA_agility,
+						follower2_spirit_animal_manipulation: SA_manipulation,
+						follower2_spirit_animal_mythic: SA_mythic,
+						follower2_spirit_animal_knowledge: SA_knowledge,
+						follower2_spirit_animal_perception: SA_perception,
+						follower2_spirit_animal_stealth: SA_stealth,
+						follower2_spirit_animal_communication: SA_communication
+					});
+			   });
+			})
+
+			on("change:repeating_npc:npc1_spirit_animal", function(eventInfo) {
+				let NewSA = eventInfo.newValue;
+				let OldSA = eventInfo.previousValue;
+				let SourceAttribute = eventInfo.sourceAttribute;
+				console.log("  change NPC1 spirit animal to: " + NewSA);
+
+					let SA_agility = 0; // Mighty
+					let SA_manipulation = 0;  //Steadfast
+					let SA_mythic = 0;  //Spiritual
+					let SA_knowledge = 0; //Wanderer
+					let SA_perception = 0; //Cunning
+					let SA_stealth = 0; //Cunning 
+					let SA_communication = 0; //Manipulative
+					let SA_flag = 0;
+
+					
+					switch (NewSA.toLowerCase()) {
+							case "bear":
+							case "bull":
+							case "eagle": SA_agility = 20; SA_flag = 1; break;
+							case "beaver":
+							case "gyr falcon":
+							case "seal": SA_manipulation = 20; SA_flag = 2; break;
+							case "cat":
+							case "golden plover":
+							case "raven": SA_mythic = 20; SA_flag = 3; break;
+							case "goose":
+							case "horse":
+							case "wolf": SA_knowledge = 20; SA_flag = 4; break;
+							case "owl":
+							case "snow fox":
+							case "weasel":  SA_perception = 20; SA_stealth = 20 ; SA_flag = 5; break;
+							case "arctic tern":
+							case "dog":
+							case "mouse":  SA_communication = 20; SA_flag = 6; break;
+							default: console.log(" Unknown SA: " + SA.toLowerCase());
+					}
+					console.log("  NPC1 SA flag: " + SA_flag);
+
+					setAttrs({
+						repeating_npc_npc1_spirit_animal_agility: SA_agility,
+						repeating_npc_npc1_spirit_animal_manipulation: SA_manipulation,
+						repeating_npc_npc1_spirit_animal_mythic: SA_mythic,
+						repeating_npc_npc1_spirit_animal_knowledge: SA_knowledge,
+						repeating_npc_npc1_spirit_animal_perception: SA_perception,
+						repeating_npc_npc1_spirit_animal_stealth: SA_stealth,
+						repeating_npc_npc1_spirit_animal_communication: SA_communication,
+						repeating_npc_npc1_spirit_animal_flag: SA_flag
+					});
+			})
+
+			on("change:repeating_npc:npc2_spirit_animal", function(eventInfo) {
+				let NewSA = eventInfo.newValue;
+				let OldSA = eventInfo.previousValue;
+				let SourceAttribute = eventInfo.sourceAttribute;
+				console.log("  change NPC2 spirit animal to: " + NewSA);
+
+					let SA_agility = 0; // Mighty
+					let SA_manipulation = 0;  //Steadfast
+					let SA_mythic = 0;  //Spiritual
+					let SA_knowledge = 0; //Wanderer
+					let SA_perception = 0; //Cunning
+					let SA_stealth = 0; //Cunning 
+					let SA_communication = 0; //Manipulative
+					let SA_flag = 0;
+
+					
+					switch (NewSA.toLowerCase()) {
+							case "bear":
+							case "bull":
+							case "eagle": SA_agility = 20; SA_flag = 1; break;
+							case "beaver":
+							case "gyr falcon":
+							case "seal": SA_manipulation = 20; SA_flag = 2; break;
+							case "cat":
+							case "golden plover":
+							case "raven": SA_mythic = 20; SA_flag = 3; break;
+							case "goose":
+							case "horse":
+							case "wolf": SA_knowledge = 20; SA_flag = 4; break;
+							case "owl":
+							case "snow fox":
+							case "weasel":  SA_perception = 20; SA_stealth = 20 ; SA_flag = 5; break;
+							case "arctic tern":
+							case "dog":
+							case "mouse":  SA_communication = 20; SA_flag = 6; break;
+							default: console.log(" Unknown SA: " + SA.toLowerCase());
+					}
+					console.log("  NPC2 SA flag: " + SA_flag);
+
+					setAttrs({
+						repeating_npc_npc2_spirit_animal_agility: SA_agility,
+						repeating_npc_npc2_spirit_animal_manipulation: SA_manipulation,
+						repeating_npc_npc2_spirit_animal_mythic: SA_mythic,
+						repeating_npc_npc2_spirit_animal_knowledge: SA_knowledge,
+						repeating_npc_npc2_spirit_animal_perception: SA_perception,
+						repeating_npc_npc2_spirit_animal_stealth: SA_stealth,
+						repeating_npc_npc2_spirit_animal_communication: SA_communication,
+						repeating_npc_npc2_spirit_animal_flag: SA_flag
+					});
+			})
 
 			//Walkthrough of repeating_npc to recalcuate all npc1 modifiers  						
-			on('change:repeating_npc:npc1Str change:repeating_npc:npc1Siz change:repeating_npc:npc1Pow change:repeating_npc:npc1Cha change:repeating_npc:npc1Con change:repeating_npc:npc1Int change:repeating_npc:npc1Dex', () => {
+			on('change:repeating_npc:npc1Str change:repeating_npc:npc1Siz change:repeating_npc:npc1Pow change:repeating_npc:npc1Cha change:repeating_npc:npc1Con change:repeating_npc:npc1Int change:repeating_npc:npc1Dex change:repeating_npc:npc1_spirit_animal_flag', () => {
 				console.log("In repeating_npc:npc1 characteristics");
 				getSectionIDs(`repeating_npc`, function(idArray) {
 					// create a variable to hold all the needed attribute names
@@ -24387,7 +26433,15 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							"repeating_npc_" + idArray[i] + "_npc1Cha",
 							"repeating_npc_" + idArray[i] + "_npc1Con",
 							"repeating_npc_" + idArray[i] + "_npc1Int",
-							"repeating_npc_" + idArray[i] + "_npc1Dex" 							
+							"repeating_npc_" + idArray[i] + "_npc1Dex", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_agility", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_communication", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_knowledge", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_manipulation", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_mythic", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_perception", 							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_stealth",							
+							"repeating_npc_" + idArray[i] + "_npc1_spirit_animal_flag"							
 						);
 					}
 					getAttrs(fieldnames, function(values) {
@@ -24400,8 +26454,19 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let Con = parseInt(values["repeating_npc_" + idArray[i] + "_npc1Con"]) ||0;
 							let Int = parseInt(values["repeating_npc_" + idArray[i] + "_npc1Int"]) ||0;
 							let Dex = parseInt(values["repeating_npc_" + idArray[i] + "_npc1Dex"]) ||0;
+							let SA_agility       = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_agility"]) ||0;
+							let SA_communication = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_communication"]) ||0;
+							let SA_knowledge     = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_knowledge"]) ||0;
+							let SA_manipulation  = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_manipulation"]) ||0;
+							let SA_mythic        = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_mythic"]) ||0;
+							let SA_perception    = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_perception"]) ||0;
+							let SA_stealth       = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_stealth"]) ||0;
+							let SA_flag          = parseInt(values["repeating_npc_" + idArray[i] + "_npc1_spirit_animal_flag"]) ||0;
 
 							console.log("Str : " + Str + " Siz : " + Siz + " Pow : " + Pow + " Cha : " + Cha + "Con : " + Con + " Int : " + Int + " Dex : " + Dex);
+							console.log("Spirit Animal flag: " + SA_flag + " Mods: Agility " + SA_agility + " Com " + SA_communication + " Know " + SA_knowledge + " Manip " + SA_manipulation + " Myth " + SA_mythic + " Percep " + SA_perception + " Stealth " + SA_stealth);
+
+
 							// Calculate Attributes
 							let Healing = Math.ceil(Con/6);
 							let Enc = Math.ceil((Con + Str)/2);
@@ -24411,32 +26476,38 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let DamageModifier = dbValues[0];
 							let missileDamageModifier = dbValues[1];
 								
-							//console.log(" Str: " + Str + " Siz: " + Siz + " DamageModifier: " + DamageModifier + " missleDB if needed " + missileDamageModifier);
-
-
 							// Calculate Characteristic Modifiers
 							let StrMod = 0;
 							if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
+
 							let SizMod = 0;
 							if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
+							let SizStealthMod = 0;
+							if (Siz < 5) {SizStealthMod = 10;} else if (Siz < 9) {SizStealthMod = 5;} else if (Siz > 12) {SizStealthMod = Math.ceil((Siz-12)/4) * -5;}
+
+
 							let DexMod = 0;
-							if (Dex < 5) {DexMod = 10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+							if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+
 							// NOTE: PowMod is a NEGATIVE for Stealth
 							let PowMod = 0;
 							if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
 							// NOTE: PowMod DIFFERENT for Mythic
 							let PowMythMod = 0;
-							if (Pow < 5) {PowMythMod = 10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+							if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+
 							// NOTE: IntMod is DIFFERENT for Communications
 							let IntComMod = 0;
 							if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
 							let IntMod = 0;
-							if (Int < 5) {IntMod = 10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+							if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+
 							// NOTE: ChaMod is DIFFERENT for Communications
 							let ChaComMod = 0;
-							if (Cha < 5) {ChaComMod = -5;} else if (Cha > 16) {ChaComMod = Math.ceil((Cha-16)/4) * 5;}
+							if (Cha < 5) {ChaComMod = -10;} else if (Cha < 9) {ChaComMod = -5;} else if (Cha > 12) {ChaComMod = Math.ceil((Cha-12)/4) * 5;}
 							let ChaMod = 0;
-							if (Cha < 5) {ChaMod = 10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
+							if (Cha < 5) {ChaMod = -5;} else if (Cha > 16) {ChaMod = Math.ceil((Cha-16)/4) * 5;}
+
 
 							// Hit Point Modifiers
 							let SizHPMod = 0;
@@ -24444,6 +26515,7 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let PowHPMod = 0;
 							if (Pow < 5) {PowHPMod = -1;} else if (Pow > 16) {PowHPMod = Math.ceil((Pow-16)/4);}
 							let HP = Con + SizHPMod + PowHPMod;
+							let CurHP = HP;
 							//console.log(" HP = " + HP + " as  Con " + Con + " + SizHPMod " + SizHPMod + " + PowHPMod " + PowHPMod);
 
 							// Hit Points per Location
@@ -24452,18 +26524,24 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let hpChest = hpLeg + 1;
 							let hpArm = hpLeg - 1;
 							let hpHead = hpLeg;
+							//console.log(" Head/Abdomen/Leg " + hpLeg + " hpChest " + hpChest + " hpArm " + hpArm);
 
 							// Calculate Skill Modifiers
-							let AgilityValue = StrMod + DexMod + PowMod - SizMod;
-							let CommunicationsValue = ChaComMod + IntComMod + PowMod;					
-							let KnowledgeValue = IntMod + PowMod;
-							let ManipulationValue = StrMod + DexMod + PowMod + IntMod;
-							let PerceptionValue = IntMod + PowMod;
-							let StealthValue = StrMod + DexMod - PowMod + SizMod; //Note SizMod is negative
+							let AgilityValue = StrMod + SizMod + DexMod + PowMod + SA_agility;
+							console.log("  Agility Mod: " + AgilityValue + " from StrMod " + StrMod + " DexMod " + DexMod + " PowMod " + PowMod + " + SizMod " + SizMod + " SA_agility " + SA_agility);
+							let CommunicationsValue = ChaComMod + IntComMod + PowMod + SA_communication;					
+							console.log("  Communications Mod: " + CommunicationsValue + " from ChaComMod " + ChaComMod + " IntComMod " + IntComMod + " PowMod " + PowMod + " SA_communication " + SA_communication);
+							let KnowledgeValue = IntMod + PowMod + SA_knowledge;
+							let ManipulationValue = StrMod + DexMod + IntMod + PowMod + SA_manipulation;
+							console.log("  Manipulation Mod: " + ManipulationValue + " from StrMod " + StrMod + " DexMod " + DexMod + " IntMod " + IntMod + " PowMod " + PowMod + " SA_manipulation " + SA_manipulation);
+							let PerceptionValue = IntMod + PowMod + SA_perception;
+							let StealthValue = SizStealthMod + DexMod + IntMod - PowMod + SA_stealth;
+							console.log("  Stealth Mod: " + StealthValue + " from SizStealthMod " + SizStealthMod + " DexMod " + DexMod + " + IntMod " + IntMod + " - PowMod " + PowMod + " SA_stealth " + SA_stealth);
+
 							let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod;
 							let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod;
 							let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod;
-							let MythicValue = ChaMod + PowMythMod;
+							let MythicValue = ChaMod + PowMythMod + SA_mythic;
 							
 							//console.log(" Con: " + Con + " Healing: " + Healing + " Maximum Encumbrance " + Enc + " MP " + MP);							
 							setAttrs({ 
@@ -24508,7 +26586,7 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 
 
 			//Walkthrough of repeating_npc to recalcuate all npc2 modifiers  						
-			on('change:repeating_npc:npc2Str change:repeating_npc:npc2Siz change:repeating_npc:npc2Pow change:repeating_npc:npc2Cha change:repeating_npc:npc2Con change:repeating_npc:npc2Int change:repeating_npc:npc2Dex', () => {
+			on('change:repeating_npc:npc2Str change:repeating_npc:npc2Siz change:repeating_npc:npc2Pow change:repeating_npc:npc2Cha change:repeating_npc:npc2Con change:repeating_npc:npc2Int change:repeating_npc:npc2Dex, change:repeating_npc:npc2_spirit_animal_flag', () => {
 				//console.log("In repeating_npc:npc2 characteristics");
 				getSectionIDs(`repeating_npc`, function(idArray) {
 					// create a variable to hold all the needed attribute names
@@ -24522,7 +26600,15 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							"repeating_npc_" + idArray[i] + "_npc2Cha",
 							"repeating_npc_" + idArray[i] + "_npc2Con",
 							"repeating_npc_" + idArray[i] + "_npc2Int",
-							"repeating_npc_" + idArray[i] + "_npc2Dex" 							
+							"repeating_npc_" + idArray[i] + "_npc2Dex", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_agility", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_communication", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_knowledge", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_manipulation", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_mythic", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_perception", 							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_stealth",							
+							"repeating_npc_" + idArray[i] + "_npc2_spirit_animal_flag"							
 						);
 					}
 					getAttrs(fieldnames, function(values) {
@@ -24535,8 +26621,18 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let Con = parseInt(values["repeating_npc_" + idArray[i] + "_npc2Con"]) ||0;
 							let Int = parseInt(values["repeating_npc_" + idArray[i] + "_npc2Int"]) ||0;
 							let Dex = parseInt(values["repeating_npc_" + idArray[i] + "_npc2Dex"]) ||0;
+							let SA_agility       = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_agility"]) ||0;
+							let SA_communication = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_communication"]) ||0;
+							let SA_knowledge     = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_knowledge"]) ||0;
+							let SA_manipulation  = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_manipulation"]) ||0;
+							let SA_mythic        = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_mythic"]) ||0;
+							let SA_perception    = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_perception"]) ||0;
+							let SA_stealth       = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_stealth"]) ||0;
+							let SA_flag          = parseInt(values["repeating_npc_" + idArray[i] + "_npc2_spirit_animal_flag"]) ||0;
 
 							console.log("Str : " + Str + " Siz : " + Siz + " Pow : " + Pow + " Cha : " + Cha + "Con : " + Con + " Int : " + Int + " Dex : " + Dex);
+							console.log("Spirit Animal flag: " + SA_flag + " Mods: Agility " + SA_agility + " Com " + SA_communication + " Know " + SA_knowledge + " Manip " + SA_manipulation + " Myth " + SA_mythic + " Percep " + SA_perception + " Stealth " + SA_stealth);
+
 							// Calculate Attributes
 							let Healing = Math.ceil(Con/6);
 							let Enc = Math.ceil((Con + Str)/2);
@@ -24552,26 +26648,35 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							// Calculate Characteristic Modifiers
 							let StrMod = 0;
 							if (Str < 5) {StrMod = -5;} else if (Str > 16) {StrMod = Math.ceil((Str-16)/4) * 5;}
+
 							let SizMod = 0;
 							if (Siz < 5) {SizMod = +5;} else if (Siz > 16) {SizMod = Math.ceil((Siz-16)/4) * -5;}
+							let SizStealthMod = 0;
+							if (Siz < 5) {SizStealthMod = 10;} else if (Siz < 9) {SizStealthMod = 5;} else if (Siz > 12) {SizStealthMod = Math.ceil((Siz-12)/4) * -5;}
+
+
 							let DexMod = 0;
-							if (Dex < 5) {DexMod = 10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+							if (Dex < 5) {DexMod = -10;} else if (Dex < 9) {DexMod = -5;} else if (Dex > 12) {DexMod = Math.ceil((Dex-12)/4) * 5;}
+
 							// NOTE: PowMod is a NEGATIVE for Stealth
 							let PowMod = 0;
 							if (Pow < 5) {PowMod = -5;} else if (Pow > 16) {PowMod = Math.ceil((Pow-16)/4) * 5;}
 							// NOTE: PowMod DIFFERENT for Mythic
 							let PowMythMod = 0;
-							if (Pow < 5) {PowMythMod = 10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+							if (Pow < 5) {PowMythMod = -10;} else if (Pow < 9) {PowMythMod = -5;} else if (Pow > 12) {PowMythMod = Math.ceil((Pow-12)/4) * 5;}
+
 							// NOTE: IntMod is DIFFERENT for Communications
 							let IntComMod = 0;
 							if (Int < 5) {IntComMod = -5;} else if (Int > 16) {IntComMod = Math.ceil((Int-16)/4) * 5;}
 							let IntMod = 0;
-							if (Int < 5) {IntMod = 10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+							if (Int < 5) {IntMod = -10;} else if (Int < 9) {IntMod = -5;} else if (Int > 12) {IntMod = Math.ceil((Int-12)/4) * 5;}
+
 							// NOTE: ChaMod is DIFFERENT for Communications
 							let ChaComMod = 0;
-							if (Cha < 5) {ChaComMod = -5;} else if (Cha > 16) {ChaComMod = Math.ceil((Cha-16)/4) * 5;}
+							if (Cha < 5) {ChaComMod = -10;} else if (Cha < 9) {ChaComMod = -5;} else if (Cha > 12) {ChaComMod = Math.ceil((Cha-12)/4) * 5;}
 							let ChaMod = 0;
-							if (Cha < 5) {ChaMod = 10;} else if (Cha < 9) {ChaMod = -5;} else if (Cha > 12) {ChaMod = Math.ceil((Cha-12)/4) * 5;}
+							if (Cha < 5) {ChaMod = -5;} else if (Cha > 16) {ChaMod = Math.ceil((Cha-16)/4) * 5;}
+
 
 							// Hit Point Modifiers
 							let SizHPMod = 0;
@@ -24579,6 +26684,7 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let PowHPMod = 0;
 							if (Pow < 5) {PowHPMod = -1;} else if (Pow > 16) {PowHPMod = Math.ceil((Pow-16)/4);}
 							let HP = Con + SizHPMod + PowHPMod;
+							let CurHP = HP;
 							//console.log(" HP = " + HP + " as  Con " + Con + " + SizHPMod " + SizHPMod + " + PowHPMod " + PowHPMod);
 
 							// Hit Points per Location
@@ -24587,14 +26693,20 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 							let hpChest = hpLeg + 1;
 							let hpArm = hpLeg - 1;
 							let hpHead = hpLeg;
+							//console.log(" Head/Abdomen/Leg " + hpLeg + " hpChest " + hpChest + " hpArm " + hpArm);
 
 							// Calculate Skill Modifiers
-							let AgilityValue = StrMod + DexMod + PowMod - SizMod;
-							let CommunicationsValue = ChaComMod + IntComMod + PowMod;					
-							let KnowledgeValue = IntMod + PowMod;
-							let ManipulationValue = StrMod + DexMod + PowMod + IntMod;
-							let PerceptionValue = IntMod + PowMod;
-							let StealthValue = StrMod + DexMod - PowMod + SizMod; //Note SizMod is negative
+							let AgilityValue = StrMod + SizMod + DexMod + PowMod + SA_agility;
+							console.log("  Agility Mod: " + AgilityValue + " from StrMod " + StrMod + " DexMod " + DexMod + " PowMod " + PowMod + " + SizMod " + SizMod + " SA_agility " + SA_agility);
+							let CommunicationsValue = ChaComMod + IntComMod + PowMod + SA_communication;					
+							console.log("  Communications Mod: " + CommunicationsValue + " from ChaComMod " + ChaComMod + " IntComMod " + IntComMod + " PowMod " + PowMod + " SA_communication " + SA_communication);
+							let KnowledgeValue = IntMod + PowMod + SA_knowledge;
+							let ManipulationValue = StrMod + DexMod + IntMod + PowMod + SA_manipulation;
+							console.log("  Manipulation Mod: " + ManipulationValue + " from StrMod " + StrMod + " DexMod " + DexMod + " IntMod " + IntMod + " PowMod " + PowMod + " SA_manipulation " + SA_manipulation);
+							let PerceptionValue = IntMod + PowMod + SA_perception;
+							let StealthValue = SizStealthMod + DexMod + IntMod - PowMod + SA_stealth;
+							console.log("  Stealth Mod: " + StealthValue + " from SizStealthMod " + SizStealthMod + " DexMod " + DexMod + " + IntMod " + IntMod + " - PowMod " + PowMod + " SA_stealth " + SA_stealth);
+
 							let MeleeWeaponsValue   = StrMod + DexMod + PowMod + IntMod;
 							let MissileWeaponsValue = StrMod + DexMod + PowMod + IntMod;
 							let NaturalWeaponsValue = StrMod + DexMod + PowMod + IntMod;
@@ -24638,9 +26750,11 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 			});
 
 
-			//Calculate total encumberance - pedantic but so is skill level of coder
-			on("change:character_equipment_1_enc change:character_equipment_2_enc change:character_equipment_3_enc change:character_equipment_4_enc change:character_equipment_5_enc change:character_equipment_6_enc change:character_equipment_7_enc change:character_equipment_8_enc change:character_equipment_9_enc change:character_equipment_10_enc change:character_equipment_11_enc change:character_equipment_12_enc change:character_equipment_13_enc change:character_equipment_14_enc change:character_equipment_15_enc change:character_equipment_16_enc change:character_equipment_17_enc change:character_equipment_18_enc change:character_equipment_19_enc change:character_equipment_20_enc", function() {
-			   getAttrs(["character_equipment_1_enc","character_equipment_2_enc","character_equipment_3_enc","character_equipment_4_enc","character_equipment_5_enc","character_equipment_6_enc","character_equipment_7_enc","character_equipment_8_enc","character_equipment_9_enc","character_equipment_10_enc","character_equipment_11_enc","character_equipment_12_enc","character_equipment_13_enc","character_equipment_14_enc","character_equipment_15_enc","character_equipment_16_enc","character_equipment_17_enc","character_equipment_18_enc","character_equipment_19_enc","character_equipment_20_enc"], function(values) {
+			//Calculate total encumbrance - pedantic but so is skill level of coder
+			on("change:attribute_max_enc change:character_equipment_1_enc change:character_equipment_2_enc change:character_equipment_3_enc change:character_equipment_4_enc change:character_equipment_5_enc change:character_equipment_6_enc change:character_equipment_7_enc change:character_equipment_8_enc change:character_equipment_9_enc change:character_equipment_10_enc change:character_equipment_11_enc change:character_equipment_12_enc change:character_equipment_13_enc change:character_equipment_14_enc change:character_equipment_15_enc change:character_equipment_16_enc change:character_equipment_17_enc change:character_equipment_18_enc change:character_equipment_19_enc change:character_equipment_20_enc", function() {
+			   getAttrs(["characteristic_str","attribute_max_enc","character_equipment_1_enc","character_equipment_2_enc","character_equipment_3_enc","character_equipment_4_enc","character_equipment_5_enc","character_equipment_6_enc","character_equipment_7_enc","character_equipment_8_enc","character_equipment_9_enc","character_equipment_10_enc","character_equipment_11_enc","character_equipment_12_enc","character_equipment_13_enc","character_equipment_14_enc","character_equipment_15_enc","character_equipment_16_enc","character_equipment_17_enc","character_equipment_18_enc","character_equipment_19_enc","character_equipment_20_enc"], function(values) {
+					let Strength = parseInt(values.characteristic_str)||0;
+					let Capacity = parseInt(values.attribute_max_enc)||0;
 					let e1 = parseInt(values.character_equipment_1_enc)||0;
 					let e2 = parseInt(values.character_equipment_2_enc)||0;
 					let e3 = parseInt(values.character_equipment_3_enc)||0;
@@ -24662,9 +26776,25 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					let e19 = parseInt(values.character_equipment_19_enc)||0;
 					let e20 = parseInt(values.character_equipment_20_enc)||0;
 					
-					let total = e1 + e2 + e3 + e4 + e5 + e6 + e7 + e8 + e9 + e10 + e11 + e12 + e13 + e14 + e15 + e16 + e17 + e18 + e19 + e20;
-					//console.log("total encumbrance: " + total);
-					setAttrs({character_equipment_total_enc: total});
+					let Total = e1 + e2 + e3 + e4 + e5 + e6 + e7 + e8 + e9 + e10 + e11 + e12 + e13 + e14 + e15 + e16 + e17 + e18 + e19 + e20;
+					console.log("total encumbrance: " + Total);
+					let TotalNumber = ((e1 >= 1) ? 1 : 0) + ((e2 >= 1) ? 1 : 0) + ((e3 >= 1) ? 1 : 0) + ((e4 >= 1) ? 1 : 0) + ((e5 >= 1) ? 1 : 0) + ((e6 >= 1) ? 1 : 0) + ((e7 >= 1) ? 1 : 0) + ((e8 >= 1) ? 1 : 0) + ((e9 >= 1) ? 1 : 0) + ((e10 >= 1) ? 1 : 0) + ((e11 >= 1) ? 1 : 0) + ((e12 >= 1) ? 1 : 0) + ((e13 >= 1) ? 1 : 0) + ((e14 >= 1) ? 1 : 0) + ((e15 >= 1) ? 1 : 0) + ((e16 >= 1) ? 1 : 0) + ((e17 >= 1) ? 1 : 0) + ((e18 >= 1) ? 1 : 0) + ((e19 >= 1) ? 1 : 0) + ((e20 >= 1) ? 1 : 0);
+					console.log("total number of things: " + TotalNumber + " Strength " + Strength);
+					let Encumbered = "";
+					let EncumbrancePenalty = 0;
+					let MovementRate = 10
+			
+					if ((Total > Capacity) || (TotalNumber > Strength))
+						{ Encumbered = "⊘"; EncumbrancePenalty = Total - Capacity; MovementRate -= EncumbrancePenalty; if (MovementRate < 0) { MovementRate = 0; }}
+			
+					console.log ( " Total: " + Total + " Capacity: " + Capacity + " Encumbered: " + Encumbered + " EncumbrancePenalty " +  EncumbrancePenalty); 
+					text = "";
+					inventory.forEach(function(value, key) {
+						text += key + ' = ' + value;
+					});
+					console.log(" Walk through inventory after altering Equipment encumbrance: " + text);
+
+					setAttrs({character_equipment_total_enc: Total, encumbered: Encumbered, character_encumbrance_penalty: EncumbrancePenalty, attribute_movement_rate: MovementRate });
 			   });
 			});
 
@@ -24704,5 +26834,886 @@ on("clicked:seidur1 clicked:seidur2 clicked:seidur3 clicked:seidur4 clicked:seid
 					}
 					return [DBonus,mDBonus];
 			}
+			
+			on("change:weapon_melee_1_name change:weapon_melee_1_enc change:weapon_melee_2_name change:weapon_melee_2_enc change:weapon_melee_3_name change:weapon_melee_3_enc change:weapon_melee_4_name change:weapon_melee_4_enc change:weapon_melee_5_name change:weapon_melee_5_enc change:shield_name change:shield_enc change:weapon_missile_1_name change:weapon_missile_1_enc change:weapon_missile_2_name change:weapon_missile_2_enc", function(eventInfo) {
+				let NewValue = eventInfo.newValue;
+				let OldValue = eventInfo.previousValue;
+				let SourceAttribute = eventInfo.sourceAttribute;
+				
+				console.log("  SourceAttribute: " + SourceAttribute + " NewValue " + NewValue + " OldValue " + OldValue);
+				
+				let UpdateType = "";
+				if (SourceAttribute.search("_name") == -1) {
+					UpdateType = "enc";
+				} else {
+					UpdateType = "name";
+				}
+				console.log("  UpdateType: " + UpdateType);
+			
+				getAttrs(["weapon_melee_1_name","weapon_melee_1_enc","weapon_melee_2_name","weapon_melee_2_enc","weapon_melee_3_name","weapon_melee_3_enc",
+						 "weapon_melee_4_name","weapon_melee_4_enc","weapon_melee_5_name","weapon_melee_5_enc","shield_name","shield_enc",
+			   			 "weapon_missile_1_name","weapon_missile_1_enc","weapon_missile_2_name","weapon_missile_2_enc",
+						 "character_equipment_1","character_equipment_2","character_equipment_3","character_equipment_4","character_equipment_5",
+						 "character_equipment_6","character_equipment_7","character_equipment_8","character_equipment_9","character_equipment_10",
+						 "character_equipment_11","character_equipment_12","character_equipment_13","character_equipment_14","character_equipment_15",
+						 "character_equipment_16","character_equipment_17","character_equipment_18","character_equipment_19","character_equipment_20",
+						 "character_equipment_1_enc","character_equipment_2_enc","character_equipment_3_enc","character_equipment_4_enc","character_equipment_5_enc",
+						 "character_equipment_6_enc","character_equipment_7_enc","character_equipment_8_enc","character_equipment_9_enc","character_equipment_10_enc",
+						 "character_equipment_11_enc","character_equipment_12_enc","character_equipment_13_enc","character_equipment_14_enc","character_equipment_15_enc",
+						 "character_equipment_16_enc","character_equipment_17_enc","character_equipment_18_enc","character_equipment_19_enc","character_equipment_20_enc"], function(values) {
+					let Melee1Enc = values.weapon_melee_1_enc;
+					let Melee2Enc = values.weapon_melee_2_enc;
+					let Melee3Enc = values.weapon_melee_3_enc;
+					let Melee4Enc = values.weapon_melee_4_enc;
+					let Melee5Enc = values.weapon_melee_5_enc;
+					let ShieldEnc = values.shield_enc;
+					let Missile1Enc = values.weapon_missile_1_enc;
+					let Missile2Enc = values.weapon_missile_2_enc;
+					let Melee1 = values.weapon_melee_1_name;
+					let Melee2 = values.weapon_melee_2_name;
+					let Melee3 = values.weapon_melee_3_name;
+					let Melee4 = values.weapon_melee_4_name;
+					let Melee5 = values.weapon_melee_5_name;
+					let Shield = values.shield_name;
+					let Missile1 = values.weapon_missile_1_name;
+					let Missile2 = values.weapon_missile_2_name;
+					let e1 = values.character_equipment_1_enc;
+					let e2 = values.character_equipment_2_enc;
+					let e3 = values.character_equipment_3_enc;
+					let e4 = values.character_equipment_4_enc;
+					let e5 = values.character_equipment_5_enc;
+					let e6 = values.character_equipment_6_enc;
+					let e7 = values.character_equipment_7_enc;
+					let e8 = values.character_equipment_8_enc;
+					let e9 = values.character_equipment_9_enc;
+					let e10 = values.character_equipment_10_enc;
+					let e11 = values.character_equipment_11_enc;
+					let e12 = values.character_equipment_12_enc;
+					let e13 = values.character_equipment_13_enc;
+					let e14 = values.character_equipment_14_enc;
+					let e15 = values.character_equipment_15_enc;
+					let e16 = values.character_equipment_16_enc;
+					let e17 = values.character_equipment_17_enc;
+					let e18 = values.character_equipment_18_enc;
+					let e19 = values.character_equipment_19_enc;
+					let e20 = values.character_equipment_20_enc;
+					let n1 = values.character_equipment_1;
+					let n2 = values.character_equipment_2;
+					let n3 = values.character_equipment_3;
+					let n4 = values.character_equipment_4;
+					let n5 = values.character_equipment_5;
+					let n6 = values.character_equipment_6;
+					let n7 = values.character_equipment_7;
+					let n8 = values.character_equipment_8;
+					let n9 = values.character_equipment_9;
+					let n10 = values.character_equipment_10;
+					let n11 = values.character_equipment_11;
+					let n12 = values.character_equipment_12;
+					let n13 = values.character_equipment_13;
+					let n14 = values.character_equipment_14;
+					let n15 = values.character_equipment_15;
+					let n16 = values.character_equipment_16;
+					let n17 = values.character_equipment_17;
+					let n18 = values.character_equipment_18;
+					let n19 = values.character_equipment_19;
+					let n20 = values.character_equipment_20;
 
+					// This is where it gets complicted, may have to do a variable number of updates
+					// But for now, just do what has changed
+
+					// Sanity checks
+					// Encumbrance with No Name
+					let encumbrance = 0;
+					// Cases: 
+					// Weapon name has been added but no encumbrance
+					//   Effect: none - await encumbrance being added
+					if ((UpdateType == "name") && ((OldValue == "") || (OldValue == " ") || (OldValue == undefined))) {
+						console.log("  Weapon " + NewValue + " has been added but OldValue is null, so not yet ready to add to table");
+						return;
+					}
+					// Encumbrance has been added but no weapon Name
+					//   Effect: remove encumbrance and return
+					if (UpdateType == "enc") {
+						switch (SourceAttribute) {
+							case "weapon_melee_1_enc": if (Melee1 == "" || Melee1 == " ") {
+								setAttrs({weapon_melee_1_enc: " " });
+								console.log("  Melee1Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_melee_2_enc": if (Melee2 == "" || Melee2 == " ") {
+								setAttrs({weapon_melee_2_enc: " " });
+								console.log("  Melee2Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_melee_3_enc": if (Melee3 == "" || Melee3 == " ") {
+								setAttrs({weapon_melee_3_enc: " " });
+								console.log("  Melee3Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_melee_4_enc": if (Melee4 == "" || Melee4 == " ") {
+								setAttrs({weapon_melee_4_enc: " " });
+								console.log("  Melee4Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_melee_5_enc": if (Melee5 == "" || Melee5 == " ") {
+								setAttrs({weapon_melee_5_enc: " " });
+								console.log("  Melee5Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_missile_1_enc": if (Missile1 == "" || Missile1 == " ") {
+								setAttrs({weapon_missile_1_enc: " " });
+								console.log("  Missile1Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_missile_2_enc": if (Missile2 == "" || Missile2 == " ") {
+								setAttrs({weapon_missile_2_enc: " " });
+								console.log("  Missile2Enc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							case "weapon_shield_enc": if (Sheild == "" || Sheild == " ") {
+								setAttrs({weapon_shield_enc: " " });
+								console.log("  SheildEnc set but no name - delete and return"); return;}; break; //break is proably superfluous
+							default: console.log(" Unknown SourceAttribute in check for enc but no name: " + SourceAttribute);
+						}
+					}
+					
+					// Weapon name has been changed 
+					//   Effect: update index and equipment
+					if ((UpdateType == "name") && (NewValue != undefined) && (NewValue != "") && (OldValue != "") && (NewValue != " ") && (OldValue != " ") && (NewValue != OldValue)) {
+						console.log("  Weapon " + OldValue + " has been changed to " + NewValue);
+						let OldEnc = inventory.get(OldValue);
+						inventory.delete(OldValue);
+						inventory.set(NewValue, OldEnc);
+						if (n1 == OldValue) { 
+							n1 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot1");
+						} else if (n2 == OldValue) {
+							n2 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot2");
+						} else if (n3 == OldValue) {
+							n3 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot3");
+						} else if (n4 == OldValue) {
+							n4 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot4");
+						} else if (n5 == OldValue) {
+							n5 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot5");
+						} else if (n6 == OldValue) {
+							n6 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot6");
+						} else if (n7 == OldValue) {
+							n7 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot7");
+						} else if (n8 == OldValue) {
+							n8 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot8");
+						} else if (n9 == OldValue) {
+							n9 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot9");
+						} else if (n10 == OldValue) {
+							n10 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot10");
+						} else if (n11 == OldValue) {
+							n11 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot11");
+						} else if (n12 == OldValue) {
+							n12 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot12");
+						} else if (n13 == OldValue) {
+							n13 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot13");
+						} else if (n14 == OldValue) {
+							n14 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot14");
+						} else if (n15 == OldValue) {
+							n15 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot15");
+						} else if (n16 == OldValue) {
+							n16 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot16");
+						} else if (n17 == OldValue) {
+							n17 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot17");
+						} else if (n18 == OldValue) {
+							n18 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot18");
+						} else if (n19 == OldValue) {
+							n19 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot19");
+						} else if (n20 == OldValue) {
+							n20 = NewValue;
+							console.log("  Change " + OldValue + " to " + NewValue + " for slot20");
+						} else {
+							console.log("  Unable to find slot for " + OldValue);
+						}
+					}
+					
+					// Weapon name has been removed
+					//   Effect: remove encumbrance and remove from equipment
+					if ((UpdateType == "name") && ((NewValue == "") || (NewValue == " ") || (NewValue == undefined))) {
+						console.log("  Weapon " + OldValue + " has been removed");
+						switch (SourceAttribute) {
+							case "weapon_melee_1_name": Melee1Enc = 0; break;
+							case "weapon_melee_2_name": Melee2Enc = 0; break;
+							case "weapon_melee_3_name": Melee3Enc = 0; break;
+							case "weapon_melee_4_name": Melee4Enc = 0; break;
+							case "weapon_melee_5_name": Melee5Enc = 0; break;
+							case "shield_name": ShieldEnc = 0; break;
+							case "weapon_missile_1_name": Missile1Enc = 0; break;
+							case "weapon_missile_2_name": Missile2Enc = 0; break;
+							default: console.log(" Unknown SourceAttribute: " + SourceAttribute);
+						}
+						if (n1 == OldValue) { 
+							console.log("  Remove " + OldValue + " encumbrance from slot1");
+							n1 = ""; e1 = "";
+							//setAttrs({character_equipment_1: "", character_equipment_1_enc: "" }); 
+						} else if (n2 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot2"); 
+							n2 = ""; e2 = "";
+							//setAttrs({character_equipment_2: "", character_equipment_2_enc: "" }); 
+						} else if (n3 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot3"); 
+							n3 = ""; e3 = "";
+							//setAttrs({character_equipment_3: "", character_equipment_3_enc: "" }); 
+						} else if (n4 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot4"); 
+							n4 = ""; e4 = "";
+							//setAttrs({character_equipment_4: "", character_equipment_4_enc: "" }); 
+						} else if (n5 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot5"); 
+							n5 = ""; e5 = "";
+							//setAttrs({character_equipment_5: "", character_equipment_5_enc: "" }); 
+						} else if (n6 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot6"); 
+							n6 = ""; e6 = "";
+							//setAttrs({character_equipment_6: "", character_equipment_6_enc: "" }); 
+						} else if (n7 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot7"); 
+							n7 = ""; e7 = "";
+							//setAttrs({character_equipment_7: "", character_equipment_7_enc: "" }); 
+						} else if (n8 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot8"); 
+							n8 = ""; e8 = "";
+							//setAttrs({character_equipment_8: "", character_equipment_8_enc: "" }); 
+						} else if (n9 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot9"); 
+							n9 = ""; e9 = "";
+							//setAttrs({character_equipment_9: "", character_equipment_9_enc: "" }); 
+						} else if (n10 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot10"); 
+							n10 = ""; e10 = "";
+							//setAttrs({character_equipment_10: "", character_equipment_10_enc: "" }); 
+						} else if (n11 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot11"); 
+							n11 = ""; e11 = "";
+							//setAttrs({character_equipment_11: "", character_equipment_11_enc: "" }); 
+						} else if (n12 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot12"); 
+							n12 = ""; e12 = "";
+							//setAttrs({character_equipment_12: "", character_equipment_12_enc: "" }); 
+						} else if (n13 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot13"); 
+							n13 = ""; e13 = "";
+							//setAttrs({character_equipment_13: "", character_equipment_13_enc: "" }); 
+						} else if (n14 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot14"); 
+							n14 = ""; e14 = "";
+							//setAttrs({character_equipment_14: "", character_equipment_14_enc: "" }); 
+						} else if (n15 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot15"); 
+							n15 = ""; e15 = "";
+							//setAttrs({character_equipment_15: "", character_equipment_15_enc: "" }); 
+						} else if (n16 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot16"); 
+							n16 = ""; e16 = "";
+							//setAttrs({character_equipment_16: "", character_equipment_16_enc: "" }); 
+						} else if (n17 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot17"); 
+							n17 = ""; e17 = "";
+							//setAttrs({character_equipment_17: "", character_equipment_17_enc: "" }); 
+						} else if (n18 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot18"); 
+							n18 = ""; e18 = "";
+							//setAttrs({character_equipment_18: "", character_equipment_18_enc: "" }); 
+						} else if (n19 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot19"); 
+							n19 = ""; e19 = "";
+							//setAttrs({character_equipment_19: "", character_equipment_19_enc: "" }); 
+						} else if (n20 == OldValue) {
+							console.log("  Remove " + OldValue + " encumbrance from slot20"); 
+							n20 = ""; e20 = "";
+							//setAttrs({character_equipment_20: "", character_equipment_20_enc: "" }); 
+						} else {
+							console.log("  Unable to find slot for " + OldValue);
+						}
+						inventory.delete(OldValue);
+					}
+					
+					// New Weapon - Encumbrance has been added (not changed) and a Name is present 
+					//   Effect: Add to inventory and equipment
+					if ((UpdateType == "enc") && ((OldValue == "") || (OldValue == " "))) {
+						let NewWeaponName = "";
+						let NewWeaponEnc = "";
+						switch (SourceAttribute) {
+							case "weapon_melee_1_enc": NewWeaponName = Melee1; NewWeaponEnc = Melee1Enc; break;
+							case "weapon_melee_2_enc": NewWeaponName = Melee2; NewWeaponEnc = Melee2Enc; break;
+							case "weapon_melee_3_enc": NewWeaponName = Melee3; NewWeaponEnc = Melee3Enc; break;
+							case "weapon_melee_4_enc": NewWeaponName = Melee4; NewWeaponEnc = Melee4Enc; break;
+							case "weapon_melee_5_enc": NewWeaponName = Melee5; NewWeaponEnc = Melee5Enc; break;
+							case "shield_enc": NewWeaponName = Shield; NewWeaponEnc = ShieldEnc; break;
+							case "weapon_missile_1_enc": NewWeaponName = Missile1; NewWeaponEnc = Missile1Enc; break;
+							case "weapon_missile_2_enc": NewWeaponName = Missile2; NewWeaponEnc = Missile2Enc; break;
+							default: console.log(" Unknown SourceAttribute for NewWeapon: " + SourceAttribute);
+						}
+						console.log("  New Weapon: " + NewWeaponName + " Enc: " + NewWeaponEnc);
+						// Double check that it is not aready in the equipment
+						let Duplicate = inventory.get(NewWeaponName);
+						if (Duplicate == undefined) {
+							console.log("  The key " + NewWeaponName + " is not found - undefined");
+						} else {
+							console.log("  The key " + NewWeaponName + " is found");
+						}
+						if (n1 == " " || n1 == "") { 
+							n1 = NewWeaponName; e1 = NewWeaponEnc;
+							console.log("  Empty slot1 now " + n1 + " enc " + e1);
+						} else if (n2 == " " || n2 == "") {
+							n2 = NewWeaponName; e2 = NewWeaponEnc;
+							console.log("  Empty slot2 now " + n2 + " enc " + e2);
+						} else if (n3 == " " || n3 == "") {
+							console.log("  Empty slot3");
+							n3 = NewWeaponName; e3 = NewWeaponEnc;
+							console.log("  Empty slot3 now " + n3 + " enc " + e3);
+						} else if (n4 == " " || n4 == "") {
+							n4 = NewWeaponName; e4 = NewWeaponEnc;
+							console.log("  Empty slot4 now " + n4 + " enc " + e4);
+						} else if (n5 == " " || n5 == "") {
+							n5 = NewWeaponName; e5 = NewWeaponEnc;
+							console.log("  Empty slot5 now " + n5 + " enc " + e5);
+						} else if (n6 == " " || n6 == "") {
+							n6 = NewWeaponName; e6 = NewWeaponEnc;
+							console.log("  Empty slot6 now " + n6 + " enc " + e6);
+						} else if (n7 == " " || n7 == "") {
+							n7 = NewWeaponName; e7 = NewWeaponEnc;
+							console.log("  Empty slot7 now " + n7 + " enc " + e7);
+						} else if (n8 == " " || n8 == "") {
+							n8 = NewWeaponName; e8 = NewWeaponEnc;
+							console.log("  Empty slot8 now " + n8 + " enc " + e8);
+						} else if (n9 == " " || n9 == "") {
+							n9 = NewWeaponName; e9 = NewWeaponEnc;
+							console.log("  Empty slot9 now " + n9 + " enc " + e9);
+						} else if (n10 == " " || n10 == "") {
+							n10 = NewWeaponName; e10 = NewWeaponEnc;
+							console.log("  Empty slot10 now " + n10 + " enc " + e10);
+						} else if (n11 == " " || n11 == "") {
+							n11 = NewWeaponName; e11 = NewWeaponEnc;
+							console.log("  Empty slot11 now " + n11 + " enc " + e11);
+						} else if (n12 == " " || n12 == "") {
+							n12 = NewWeaponName; e12 = NewWeaponEnc;
+							console.log("  Empty slot12 now " + n12 + " enc " + e12);
+						} else if (n13 == " " || n13 == "") {
+							n13 = NewWeaponName; e13 = NewWeaponEnc;
+							console.log("  Empty slot13 now " + n13 + " enc " + e13);
+						} else if (n14 == " " || n14 == "") {
+							n14 = NewWeaponName; e14 = NewWeaponEnc;
+							console.log("  Empty slot14 now " + n14 + " enc " + e14);
+						} else if (n15 == " " || n15 == "") {
+							n15 = NewWeaponName; e15 = NewWeaponEnc;
+							console.log("  Empty slot15 now " + n15 + " enc " + e15);
+						} else if (n16 == " " || n16 == "") {
+							n16 = NewWeaponName; e16 = NewWeaponEnc;
+							console.log("  Empty slot16 now " + n16 + " enc " + e16);
+						} else if (n17 == " " || n17 == "") {
+							n17 = NewWeaponName; e17 = NewWeaponEnc;
+							console.log("  Empty slot17 now " + n17 + " enc " + e17);
+						} else if (n18 == " " || n18 == "") {
+							n18 = NewWeaponName; e18 = NewWeaponEnc;
+							console.log("  Empty slot18 now " + n18 + " enc " + e18);
+						} else if (n19 == " " || n19 == "") {
+							n19 = NewWeaponName; e19 = NewWeaponEnc;
+							console.log("  Empty slot19 now " + n19 + " enc " + e19);
+						} else if (n20 == " " || n20 == "") {
+							n20 = NewWeaponName; e20 = NewWeaponEnc;
+							console.log("  Empty slot20 now " + n20 + " enc " + e20);
+						} else {
+							console.log("  Unable to find slot for " + NewWeaponName);
+						}						
+					}
+					
+					
+					setAttrs({
+						weapon_melee_1_enc: Melee1Enc,
+						weapon_melee_2_enc: Melee2Enc,
+						weapon_melee_3_enc: Melee3Enc,
+						weapon_melee_4_enc: Melee4Enc,
+						weapon_melee_5_enc: Melee5Enc,
+						shield_enc: ShieldEnc,
+						weapon_missile_1_enc: Missile1Enc,
+						weapon_missile_2_enc: Missile2Enc,
+						weapon_melee_1_name: Melee1,
+						weapon_melee_2_name: Melee2,
+						weapon_melee_3_name: Melee3,
+						weapon_melee_4_name: Melee4,
+						weapon_melee_5_name: Melee5,
+						shield_name: Shield,
+						weapon_missile_1_name: Missile1,
+						weapon_missile_2_name: Missile2,
+						character_equipment_1: n1, character_equipment_1_enc: e1,
+						character_equipment_2: n2, character_equipment_2_enc: e2,
+						character_equipment_3: n3, character_equipment_3_enc: e3,
+						character_equipment_4: n4, character_equipment_4_enc: e4,
+						character_equipment_5: n5, character_equipment_5_enc: e5,
+						character_equipment_6: n6, character_equipment_6_enc: e6,
+						character_equipment_7: n7, character_equipment_7_enc: e7,
+						character_equipment_8: n8, character_equipment_8_enc: e8,
+						character_equipment_9: n9, character_equipment_9_enc: e9,
+						character_equipment_10: n10, character_equipment_10_enc: e10,
+						character_equipment_11: n11, character_equipment_11_enc: e11,
+						character_equipment_12: n12, character_equipment_12_enc: e12,
+						character_equipment_13: n13, character_equipment_13_enc: e13,
+						character_equipment_14: n14, character_equipment_14_enc: e14,
+						character_equipment_15: n15, character_equipment_15_enc: e15,
+						character_equipment_16: n16, character_equipment_16_enc: e16,
+						character_equipment_17: n17, character_equipment_17_enc: e17,
+						character_equipment_18: n18, character_equipment_18_enc: e18,
+						character_equipment_19: n19, character_equipment_19_enc: e19,
+						character_equipment_20: n20, character_equipment_20_enc: e20
+					 });	
+
+
+					//setAttrs({character_equipment_total_enc: Total, encumbered: Encumbered });
+			   });
+			});
+			
+			// Find next available slot in the equipment section
+			function findAvailable(n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20) {
+
+				let Available = 20; // Past end of table
+
+				if (n1 == " " || n1 == "" || n1 == undefined) { 
+					Available = 0;
+					console.log("  Available = slot0");
+				} else if (n2 == " " || n2 == ""|| n2 == undefined) {
+					Available = 1;
+					console.log("  Available = slot1");
+				} else if (n3 == " " || n3 == ""|| n3 == undefined) {
+					Available = 2;
+					console.log("  Available = slot2");
+				} else if (n4 == " " || n4 == ""|| n4 == undefined) {
+					Available = 3;
+				} else if (n5 == " " || n5 == ""|| n5 == undefined) {
+					Available = 4;
+				} else if (n6 == " " || n6 == ""|| n6 == undefined) {
+					Available = 5;
+				} else if (n7 == " " || n7 == ""|| n7 == undefined) {
+					Available = 6;
+				} else if (n8 == " " || n8 == ""|| n8 == undefined) {
+					Available = 7;
+				} else if (n9 == " " || n9 == ""|| n9 == undefined) {
+					Available = 8;
+				} else if (n10 == " " || n10 == ""|| n10 == undefined) {
+					Available = 9;
+				} else if (n11 == " " || n11 == ""|| n11 == undefined) {
+					Available = 10;
+				} else if (n12 == " " || n12 == ""|| n12 == undefined) {
+					Available = 11;
+				} else if (n13 == " " || n13 == ""|| n13 == undefined) {
+					Available = 12;
+				} else if (n14 == " " || n14 == "" || n14 == undefined) {
+					Available = 13;
+				} else if (n15 == " " || n15 == "" || n15 == undefined) {
+					Available = 14;
+				} else if (n16 == " " || n16 == "" || n16 == undefined) {
+					Available = 15;
+				} else if (n17 == " " || n17 == "" || n17 == undefined) {
+					Available = 16;
+				} else if (n18 == " " || n18 == "" || n18 == undefined) {
+					Available = 17;
+				} else if (n19 == " " || n19 == "" || n19 == undefined) {
+					Available = 18;
+				} else if (n20 == " " || n20 == "" || n20 == undefined) {
+					Available = 19;
+				} else {
+					Available = 20;
+					console.log("  Unable to find free slot");
+				}						
+
+				console.log("  Slot found: " + Available + " Table ends at 19");
+				return(Available);
+			}
+			
+			function addEquipment(item, encumbrance, slot) {
+
+				console.log("  Inventory size: " + inventory.size + " New item " + item + " encumbrance " + encumbrance + " at slot " + slot);
+
+				switch (slot) {
+						case 0: setAttrs({character_equipment_1: item, character_equipment_1_enc: encumbrance }); break;
+						case 1: setAttrs({character_equipment_2: item, character_equipment_2_enc: encumbrance }); break;
+						case 2: setAttrs({character_equipment_3: item, character_equipment_3_enc: encumbrance }); break;
+						case 3: setAttrs({character_equipment_4: item, character_equipment_4_enc: encumbrance }); break;
+						case 4: setAttrs({character_equipment_5: item, character_equipment_5_enc: encumbrance }); break;
+						case 5: setAttrs({character_equipment_6: item, character_equipment_6_enc: encumbrance }); break;
+						case 6: setAttrs({character_equipment_7: item, character_equipment_7_enc: encumbrance }); break;
+						case 7: setAttrs({character_equipment_8: item, character_equipment_8_enc: encumbrance }); break;
+						case 8: setAttrs({character_equipment_9: item, character_equipment_9_enc: encumbrance }); break;
+						case 9: setAttrs({character_equipment_10: item, character_equipment_10_enc: encumbrance }); break;
+						case 10: setAttrs({character_equipment_11: item, character_equipment_11_enc: encumbrance }); break;
+						case 11: setAttrs({character_equipment_12: item, character_equipment_12_enc: encumbrance }); break;
+						case 12: setAttrs({character_equipment_13: item, character_equipment_13_enc: encumbrance }); break;
+						case 13: setAttrs({character_equipment_14: item, character_equipment_14_enc: encumbrance }); break;
+						case 14: setAttrs({character_equipment_15: item, character_equipment_15_enc: encumbrance }); break;
+						case 15: setAttrs({character_equipment_16: item, character_equipment_16_enc: encumbrance }); break;
+						case 16: setAttrs({character_equipment_17: item, character_equipment_17_enc: encumbrance }); break;
+						case 17: setAttrs({character_equipment_18: item, character_equipment_18_enc: encumbrance }); break;
+						case 18: setAttrs({character_equipment_19: item, character_equipment_19_enc: encumbrance }); break;
+						case 19: setAttrs({character_equipment_20: item, character_equipment_20_enc: encumbrance }); break;
+						default: console.log(" Unknown Record row: " + Size);
+				}
+			}
+			
+			function buildEquipment(){
+				getAttrs([ "character_equipment_1","character_equipment_2","character_equipment_3","character_equipment_4","character_equipment_5",
+						 "character_equipment_6","character_equipment_7","character_equipment_8","character_equipment_9","character_equipment_10",
+						 "character_equipment_11","character_equipment_12","character_equipment_13","character_equipment_14","character_equipment_15",
+						 "character_equipment_16","character_equipment_17","character_equipment_18","character_equipment_19","character_equipment_20",
+						 "character_equipment_1_enc","character_equipment_2_enc","character_equipment_3_enc","character_equipment_4_enc","character_equipment_5_enc",
+						 "character_equipment_6_enc","character_equipment_7_enc","character_equipment_8_enc","character_equipment_9_enc","character_equipment_10_enc",
+						 "character_equipment_11_enc","character_equipment_12_enc","character_equipment_13_enc","character_equipment_14_enc","character_equipment_15_enc",
+						 "character_equipment_16_enc","character_equipment_17_enc","character_equipment_18_enc","character_equipment_19_enc","character_equipment_20_enc"], function(values) {
+					let e1 = parseInt(values.character_equipment_1_enc)||0;
+					let e2 = parseInt(values.character_equipment_2_enc)||0;
+					let e3 = parseInt(values.character_equipment_3_enc)||0;
+					let e4 = parseInt(values.character_equipment_4_enc)||0;
+					let e5 = parseInt(values.character_equipment_5_enc)||0;
+					let e6 = parseInt(values.character_equipment_6_enc)||0;
+					let e7 = parseInt(values.character_equipment_7_enc)||0;
+					let e8 = parseInt(values.character_equipment_8_enc)||0;
+					let e9 = parseInt(values.character_equipment_9_enc)||0;
+					let e10 = parseInt(values.character_equipment_10_enc)||0;
+					let e11 = parseInt(values.character_equipment_11_enc)||0;
+					let e12 = parseInt(values.character_equipment_12_enc)||0;
+					let e13 = parseInt(values.character_equipment_13_enc)||0;
+					let e14 = parseInt(values.character_equipment_14_enc)||0;
+					let e15 = parseInt(values.character_equipment_15_enc)||0;
+					let e16 = parseInt(values.character_equipment_16_enc)||0;
+					let e17 = parseInt(values.character_equipment_17_enc)||0;
+					let e18 = parseInt(values.character_equipment_18_enc)||0;
+					let e19 = parseInt(values.character_equipment_19_enc)||0;
+					let e20 = parseInt(values.character_equipment_20_enc)||0;
+					let n1 = values.character_equipment_1;
+					let n2 = values.character_equipment_2;
+					let n3 = values.character_equipment_3;
+					let n4 = values.character_equipment_4;
+					let n5 = values.character_equipment_5;
+					let n6 = values.character_equipment_6;
+					let n7 = values.character_equipment_7;
+					let n8 = values.character_equipment_8;
+					let n9 = values.character_equipment_9;
+					let n10 = values.character_equipment_10;
+					let n11 = values.character_equipment_11;
+					let n12 = values.character_equipment_12;
+					let n13 = values.character_equipment_13;
+					let n14 = values.character_equipment_14;
+					let n15 = values.character_equipment_15;
+					let n16 = values.character_equipment_16;
+					let n17 = values.character_equipment_17;
+					let n18 = values.character_equipment_18;
+					let n19 = values.character_equipment_19;
+					let n20 = values.character_equipment_20;
+					
+					console.log("  Build equipment:");
+					if (!(n1 == "") || (n1 == " ") || (n1 == undefined)) { console.log("    row1: '" + n1 + "' " + e1); }
+					if (!(n2 == "") || (n2 == " ") || (n2 == undefined)) { console.log("    row2: '" + n2 + "' " + e2); }
+					if (!(n3 == "") || (n3 == " ") || (n3 == undefined)) { console.log("    row3: '" + n3 + "' " + e3); }
+					if (!(n4 == "") || (n4 == " ") || (n4 == undefined)) { console.log("    row4: '" + n4 + "' " + e4); }
+					if (!(n5 == "") || (n5 == " ") || (n5 == undefined)) { console.log("    row5: '" + n5 + "' " + e5); }
+					if (!(n6 == "") || (n6 == " ") || (n6 == undefined)) { console.log("    row6: '" + n6 + "' " + e6); }
+					if (!(n7 == "") || (n7 == " ") || (n7 == undefined)) { console.log("    row7: '" + n7 + "' " + e7); }
+					if (!(n8 == "") || (n8 == " ") || (n8 == undefined)) { console.log("    row8: '" + n8 + "' " + e8); }
+					if (!(n9 == "") || (n9 == " ") || (n9 == undefined)) { console.log("    row9: '" + n9 + "' " + e9); }
+					if (!(n10 == "") || (n10 == " ") || (n10 == undefined)) { console.log("    row10: '" + n10 + "' " + e10); }
+					if (!(n11 == "") || (n11 == " ") || (n11 == undefined)) { console.log("    row11: '" + n11 + "' " + e11); }
+					if (!(n12 == "") || (n12 == " ") || (n12 == undefined)) { console.log("    row12: '" + n12 + "' " + e12); }
+					if (!(n13 == "") || (n13 == " ") || (n13 == undefined)) { console.log("    row13: '" + n13 + "' " + e13); }
+					if (!(n14 == "") || (n14 == " ") || (n14 == undefined)) { console.log("    row14: '" + n14 + "' " + e14); }
+					if (!(n15 == "") || (n15 == " ") || (n15 == undefined)) { console.log("    row15: '" + n15 + "' " + e15); }
+					if (!(n16 == "") || (n16 == " ") || (n16 == undefined)) { console.log("    row16: '" + n16 + "' " + e16); }
+					if (!(n17 == "") || (n17 == " ") || (n17 == undefined)) { console.log("    row17: '" + n17 + "' " + e17); }
+					if (!(n18 == "") || (n18 == " ") || (n18 == undefined)) { console.log("    row18: '" + n18 + "' " + e18); }
+					if (!(n19 == "") || (n19 == " ") || (n19 == undefined)) { console.log("    row19: '" + n19 + "' " + e19); }
+					if (!(n20 == "") || (n20 == " ") || (n20 == undefined)) { console.log("    row20: '" + n20 + "' " + e20); }
+					
+					// Check for encumbrances without names
+					if ((e1 != 0) && ((n1 == "")||(n1 == " "))) { setAttrs({character_equipment_1_enc: "" }); }
+					if ((e2 != 0) && ((n2 == "")||(n2 == " "))) { setAttrs({character_equipment_2_enc: "" }); }
+					if ((e3 != 0) && ((n3 == "")||(n3 == " "))) { setAttrs({character_equipment_3_enc: "" }); }
+					if ((e4 != 0) && ((n4 == "")||(n4 == " "))) { setAttrs({character_equipment_4_enc: "" }); }
+					if ((e5 != 0) && ((n5 == "")||(n5 == " "))) { setAttrs({character_equipment_5_enc: "" }); }
+					if ((e6 != 0) && ((n6 == "")||(n6 == " "))) { setAttrs({character_equipment_6_enc: "" }); }
+					if ((e7 != 0) && ((n7 == "")||(n7 == " "))) { setAttrs({character_equipment_7_enc: "" }); }
+					if ((e8 != 0) && ((n8 == "")||(n8 == " "))) { setAttrs({character_equipment_8_enc: "" }); }
+					if ((e9 != 0) && ((n9 == "")||(n9 == " "))) { setAttrs({character_equipment_9_enc: "" }); }
+					if ((e10 != 0) && ((n10 == "")||(n10 == " "))) { setAttrs({character_equipment_10_enc: "" }); }
+					if ((e11 != 0) && ((n11 == "")||(n11 == " "))) { setAttrs({character_equipment_11_enc: "" }); }
+					if ((e12 != 0) && ((n12 == "")||(n12 == " "))) { setAttrs({character_equipment_12_enc: "" }); }
+					if ((e13 != 0) && ((n13 == "")||(n13 == " "))) { setAttrs({character_equipment_13_enc: "" }); }
+					if ((e14 != 0) && ((n14 == "")||(n14 == " "))) { setAttrs({character_equipment_14_enc: "" }); }
+					if ((e15 != 0) && ((n15 == "")||(n15 == " "))) { setAttrs({character_equipment_15_enc: "" }); }
+					if ((e16 != 0) && ((n16 == "")||(n16 == " "))) { setAttrs({character_equipment_16_enc: "" }); }
+					if ((e17 != 0) && ((n17 == "")||(n17 == " "))) { setAttrs({character_equipment_17_enc: "" }); }
+					if ((e18 != 0) && ((n18 == "")||(n18 == " "))) { setAttrs({character_equipment_18_enc: "" }); }
+					if ((e19 != 0) && ((n19 == "")||(n19 == " "))) { setAttrs({character_equipment_19_enc: "" }); }
+					if ((e20 != 0) && ((n20 == "")||(n20 == " "))) { setAttrs({character_equipment_20_enc: "" }); }
+					
+					
+					if ((e1 != 0) && (n1 != "")) {inventory.set(n1, e1);}
+					if ((e2 != 0) && (n2 != "")) {inventory.set(n2, e2);}
+					if ((e3 != 0) && (n3 != "")) {inventory.set(n3, e3);}
+					if ((e4 != 0) && (n4 != "")) {inventory.set(n4, e4);}
+					if ((e5 != 0) && (n5 != "")) {inventory.set(n5, e5);}
+					if ((e6 != 0) && (n6 != "")) {inventory.set(n6, e6);}
+					if ((e7 != 0) && (n7 != "")) {inventory.set(n7, e7);}
+					if ((e8 != 0) && (n8 != "")) {inventory.set(n8, e8);}
+					if ((e9 != 0) && (n9 != "")) {inventory.set(n9, e9);}
+					if ((e10 != 0) && (n10 != "")) {inventory.set(n10, e10);}
+					if ((e11 != 0) && (n11 != "")) {inventory.set(n11, e11);}
+					if ((e12 != 0) && (n12 != "")) {inventory.set(n12, e12);}
+					if ((e13 != 0) && (n13 != "")) {inventory.set(n13, e13);}
+					if ((e14 != 0) && (n14 != "")) {inventory.set(n14, e14);}
+					if ((e15 != 0) && (n15 != "")) {inventory.set(n15, e15);}
+					if ((e16 != 0) && (n16 != "")) {inventory.set(n16, e16);}
+					if ((e17 != 0) && (n17 != "")) {inventory.set(n17, e17);}
+					if ((e18 != 0) && (n18 != "")) {inventory.set(n18, e18);}
+					if ((e19 != 0) && (n19 != "")) {inventory.set(n19, e19);}
+					if ((e20 != 0) && (n20 != "")) {inventory.set(n20, e20);}					
+			   });
+			}			
+			function addWeapons(){
+
+				getAttrs(["character_equipment_1","character_equipment_2","character_equipment_3","character_equipment_4","character_equipment_5",
+						 "character_equipment_6","character_equipment_7","character_equipment_8","character_equipment_9","character_equipment_10",
+						 "character_equipment_11","character_equipment_12","character_equipment_13","character_equipment_14","character_equipment_15",
+						 "character_equipment_16","character_equipment_17","character_equipment_18","character_equipment_19","character_equipment_20",
+						 "weapon_melee_1_name","weapon_melee_1_enc","weapon_melee_2_name","weapon_melee_2_enc","weapon_melee_3_name","weapon_melee_3_enc",
+						 "weapon_melee_4_name","weapon_melee_4_enc","weapon_melee_5_name","weapon_melee_5_enc","shield_name","shield_enc",
+			   			 "weapon_missile_1_name","weapon_missile_1_enc","weapon_missile_2_name","weapon_missile_2_enc"], function(values) {
+					let Melee1Enc = parseInt(values.weapon_melee_1_enc)||0;
+					let Melee2Enc = parseInt(values.weapon_melee_2_enc)||0;
+					let Melee3Enc = parseInt(values.weapon_melee_3_enc)||0;
+					let Melee4Enc = parseInt(values.weapon_melee_4_enc)||0;
+					let Melee5Enc = parseInt(values.weapon_melee_5_enc)||0;
+					let ShieldEnc = parseInt(values.shield_enc)||0;
+					let Missile1Enc = parseInt(values.weapon_missile_1_enc)||0;
+					let Missile2Enc = parseInt(values.weapon_missile_2_enc)||0;
+					let Melee1 = values.weapon_melee_1_name;
+					let Melee2 = values.weapon_melee_2_name;
+					let Melee3 = values.weapon_melee_3_name;
+					let Melee4 = values.weapon_melee_4_name;
+					let Melee5 = values.weapon_melee_5_name;
+					let Shield = values.shield_name;
+					let Missile1 = values.weapon_missile_1_name;
+					let Missile2 = values.weapon_missile_2_name;
+					let n1 = values.character_equipment_1;
+					let n2 = values.character_equipment_2;
+					let n3 = values.character_equipment_3;
+					let n4 = values.character_equipment_4;
+					let n5 = values.character_equipment_5;
+					let n6 = values.character_equipment_6;
+					let n7 = values.character_equipment_7;
+					let n8 = values.character_equipment_8;
+					let n9 = values.character_equipment_9;
+					let n10 = values.character_equipment_10;
+					let n11 = values.character_equipment_11;
+					let n12 = values.character_equipment_12;
+					let n13 = values.character_equipment_13;
+					let n14 = values.character_equipment_14;
+					let n15 = values.character_equipment_15;
+					let n16 = values.character_equipment_16;
+					let n17 = values.character_equipment_17;
+					let n18 = values.character_equipment_18;
+					let n19 = values.character_equipment_19;
+					let n20 = values.character_equipment_20;
+					
+					// Check for weapons encumbrances without names
+					if ((Melee1Enc != 0) && ((Melee1 == "")||(Melee1 == " "))) { setAttrs({weapon_melee_1_enc: "" }); }
+					if ((Melee2Enc != 0) && ((Melee2 == "")||(Melee2 == " "))) { setAttrs({weapon_melee_2_enc: "" }); }
+					if ((Melee3Enc != 0) && ((Melee3 == "")||(Melee3 == " "))) { setAttrs({weapon_melee_3_enc: "" }); }
+					if ((Melee4Enc != 0) && ((Melee4 == "")||(Melee4 == " "))) { setAttrs({weapon_melee_4_enc: "" }); }
+					if ((Melee5Enc != 0) && ((Melee5 == "")||(Melee5 == " "))) { setAttrs({weapon_melee_5_enc: "" }); }
+					if ((ShieldEnc != 0) && ((Shield == "")||(Shield == " "))) { setAttrs({shield_enc: "" }); }
+					if ((Missile1Enc != 0) && ((Missile1 == "")||(Missile1 == " "))) { setAttrs({weapon_missile_1_enc: "" }); }
+					if ((Missile2Enc != 0) && ((Missile2 == "")||(Missile2 == " "))) { setAttrs({weapon_missile_2_enc: "" }); }
+					
+					let Available  = findAvailable(n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20);
+					console.log("  Found Available slot at: " + Available);
+					console.log("  Add Weapons:");
+					console.log("   Melee: " + Melee1 + " " + Melee1Enc + "," + Melee2 + " " + Melee2Enc + "," + Melee3 + " " + Melee3Enc + "," + Melee4 + " " + Melee4Enc + "," + Melee5 + " " + Melee5Enc);
+					console.log("   Shield: " + Shield + " " + ShieldEnc);
+					console.log("   Missile: " + Missile1 + " " + Missile1Enc + "," + Missile2 + " " + Missile2Enc);
+					
+					
+					console.log(" Does inventory have " + Melee1 + " " + inventory.has(Melee1));
+					console.log("  Inventory size: " + inventory.size);
+					let text = "";
+					inventory.forEach(function(value, key) {
+						text += key + ' = ' + value;
+					});
+					console.log(" Walk through inventory [size: " + inventory.size + "] prior to adding Weapons: " + text);
+					
+					if ((Melee1Enc != 0) && ((Melee1 != "")||(Melee1 != " "))) {
+						if (!inventory.has(Melee1)) {
+							addEquipment(Melee1, Melee1Enc, Available);
+							Available += 1;
+							inventory.set(Melee1, Melee1Enc);
+						} else {
+							console.log("   Inventory already has " + Melee1)};
+					} //Need to check Encumbrance same
+					
+					if ((Melee2Enc != 0) && ((Melee2 != "")||(Melee2 != " "))) {
+						if (!inventory.has(Melee2)) {
+							addEquipment(Melee2, Melee2Enc, Available);
+							Available += 1;
+							inventory.set(Melee2, Melee2Enc);
+						} else {
+							console.log("   Inventory already has " + Melee2)};
+					} //Need to check Encumbrance same
+					
+					if ((Melee3Enc != 0) && ((Melee3 != "")||(Melee3 != " "))) {
+						if (!inventory.has(Melee3)) {
+							addEquipment(Melee3, Melee3Enc, Available);
+							Available += 1;
+							inventory.set(Melee3, Melee3Enc);
+						} else {
+							console.log("   Inventory already has " + Melee1)};
+					} //Need to check Encumbrance same
+					
+					if ((Melee4Enc != 0) && ((Melee4 != "")||(Melee4 != " "))) {
+						if (!inventory.has(Melee4)) {
+							addEquipment(Melee4, Melee4Enc, Available);
+							Available += 1;
+							inventory.set(Melee4, Melee4Enc);
+						} else {
+							console.log("   Inventory already has " + Melee4)};
+					} //Need to check Encumbrance same
+					
+					if ((Melee5Enc != 0) && ((Melee5 != "")||(Melee5 != " "))) {
+						if (!inventory.has(Melee5)) {
+							addEquipment(Melee5, Melee5Enc, Available);
+							Available += 1;
+							inventory.set(Melee5, Melee5Enc);
+						} else {
+							console.log("   Inventory already has " + Melee5)};
+					} //Need to check Encumbrance same
+					
+					if ((ShieldEnc != 0) && ((Shield != "")||(Shield != " "))) {
+						if (!inventory.has(Shield)) {
+							addEquipment(Shield, ShieldEnc, Available);
+							Available += 1;
+							inventory.set(Shield, ShieldEnc);
+						} else {
+							console.log("   Inventory already has " + Shield)};
+					} //Need to check Encumbrance same
+					
+					
+					if ((Missile1Enc != 0) && ((Missile1 != "")||(Missile1 != " "))) {
+						if (!inventory.has(Missile1)) {
+							addEquipment(Missile1, Missile1Enc, Available);
+							Available += 1;
+							inventory.set(Missile1, Missile1Enc);
+						} else {
+							console.log("   Inventory already has " + Missile1)};
+					} //Need to check Encumbrance same
+					
+					if ((Missile2Enc != 0) && ((Missile2 != "")||(Missile2 != " "))) {
+						if (!inventory.has(Missile2)) {
+							addEquipment(Missile2, Missile2Enc, Available);
+							Available += 1;
+							inventory.set(Missile2, Missile2Enc);
+						} else {
+							console.log("   Inventory already has " + Missile2)};
+					} //Need to check Encumbrance same
+					
+					console.log("  after AddWeapons");
+					text = "";
+					inventory.forEach(function(value, key) {
+						text += key + ' = ' + value;
+					});
+					console.log("  Walk through inventory [size: " + inventory.size + "] after adding Weapons: " + text);
+					
+
+			   });
+			   
+			}
+/*			
+			on("change:weapon_melee_1_name change:weapon_melee_1_enc change:weapon_melee_2_name change:weapon_melee_2_enc change:weapon_melee_3_name change:weapon_melee_3_enc change:weapon_melee_4_name change:weapon_melee_4_enc change:weapon_melee_5_name change:weapon_melee_5_enc change:shield_name change:shield_enc change:weapon_missile_1_name change:weapon_missile_1_enc change:weapon_missile_2_name change:weapon_missile_2_enc", function(eventInfo) {
+				let NewValue = eventInfo.newValue;
+				let OldValue = eventInfo.previousValue;
+				let SourceAttribute = eventInfo.sourceAttribute;
+				
+				console.log("  SourceAttribute: " + SourceAttribute + " NewValue " + NewValue + " OldValue " + OldValue);
+			
+				getAttrs(["weapon_melee_1_name","weapon_melee_1_enc","weapon_melee_2_name","weapon_melee_2_enc","weapon_melee_3_name","weapon_melee_3_enc",
+						 "weapon_melee_4_name","weapon_melee_4_enc","weapon_melee_5_name","weapon_melee_5_enc","shield_name","shield_enc",
+			   			 "weapon_missile_1_name","weapon_missile_1_enc","weapon_missile_2_name","weapon_missile_2_enc",
+						 "character_equipment_1","character_equipment_2","character_equipment_3","character_equipment_4","character_equipment_5",
+						 "character_equipment_6","character_equipment_7","character_equipment_8","character_equipment_9","character_equipment_10",
+						 "character_equipment_11","character_equipment_12","character_equipment_13","character_equipment_14","character_equipment_15",
+						 "character_equipment_16","character_equipment_17","character_equipment_18","character_equipment_19","character_equipment_20",
+						 "character_equipment_1_enc","character_equipment_2_enc","character_equipment_3_enc","character_equipment_4_enc","character_equipment_5_enc",
+						 "character_equipment_6_enc","character_equipment_7_enc","character_equipment_8_enc","character_equipment_9_enc","character_equipment_10_enc",
+						 "character_equipment_11_enc","character_equipment_12_enc","character_equipment_13_enc","character_equipment_14_enc","character_equipment_15_enc",
+						 "character_equipment_16_enc","character_equipment_17_enc","character_equipment_18_enc","character_equipment_19_enc","character_equipment_20_enc"], function(values) {
+					let Melee1Enc = parseInt(values.weapon_melee_1_enc)||0;
+					let Melee2Enc = parseInt(values.weapon_melee_2_enc)||0;
+					let Melee3Enc = parseInt(values.weapon_melee_3_enc)||0;
+					let Melee4Enc = parseInt(values.weapon_melee_4_enc)||0;
+					let Melee5Enc = parseInt(values.weapon_melee_5_enc)||0;
+					let ShieldEnc = parseInt(values.shield_enc)||0;
+					let Missile1Enc = parseInt(values.weapon_missile_1_enc)||0;
+					let Missile2Enc = parseInt(values.weapon_missile_2_enc)||0;
+					let Melee1 = values.weapon_melee_1_enc;
+					let Melee2 = values.weapon_melee_2_enc;
+					let Melee3 = values.weapon_melee_3_enc;
+					let Melee4 = values.weapon_melee_4_enc;
+					let Melee5 = values.weapon_melee_5_enc;
+					let Shield = values.shield_enc;
+					let Missile1 = values.weapon_missile_1_enc;
+					let Missile2 = values.weapon_missile_2_enc;
+					let e1 = parseInt(values.character_equipment_1_enc)||0;
+					let e2 = parseInt(values.character_equipment_2_enc)||0;
+					let e3 = parseInt(values.character_equipment_3_enc)||0;
+					let e4 = parseInt(values.character_equipment_4_enc)||0;
+					let e5 = parseInt(values.character_equipment_5_enc)||0;
+					let e6 = parseInt(values.character_equipment_6_enc)||0;
+					let e7 = parseInt(values.character_equipment_7_enc)||0;
+					let e8 = parseInt(values.character_equipment_8_enc)||0;
+					let e9 = parseInt(values.character_equipment_9_enc)||0;
+					let e10 = parseInt(values.character_equipment_10_enc)||0;
+					let e11 = parseInt(values.character_equipment_11_enc)||0;
+					let e12 = parseInt(values.character_equipment_12_enc)||0;
+					let e13 = parseInt(values.character_equipment_13_enc)||0;
+					let e14 = parseInt(values.character_equipment_14_enc)||0;
+					let e15 = parseInt(values.character_equipment_15_enc)||0;
+					let e16 = parseInt(values.character_equipment_16_enc)||0;
+					let e17 = parseInt(values.character_equipment_17_enc)||0;
+					let e18 = parseInt(values.character_equipment_18_enc)||0;
+					let e19 = parseInt(values.character_equipment_19_enc)||0;
+					let e20 = parseInt(values.character_equipment_20_enc)||0;
+					let n1 = values.character_equipment_1_enc;
+					let n2 = values.character_equipment_2_enc;
+					let n3 = values.character_equipment_3_enc;
+					let n4 = values.character_equipment_4_enc;
+					let n5 = values.character_equipment_5_enc;
+					let n6 = values.character_equipment_6_enc;
+					let n7 = values.character_equipment_7_enc;
+					let n8 = values.character_equipment_8_enc;
+					let n9 = values.character_equipment_9_enc;
+					let n10 = values.character_equipment_10_enc;
+					let n11 = values.character_equipment_11_enc;
+					let n12 = values.character_equipment_12_enc;
+					let n13 = values.character_equipment_13_enc;
+					let n14 = values.character_equipment_14_enc;
+					let n15 = values.character_equipment_15_enc;
+					let n16 = values.character_equipment_16_enc;
+					let n17 = values.character_equipment_17_enc;
+					let n18 = values.character_equipment_18_enc;
+					let n19 = values.character_equipment_19_enc;
+					let n20 = values.character_equipment_20_enc;
+
+					// This is where it gets complicted, may have to do a variable number of updates
+					// But for now, just do what has changed
+
+					// Sanity checks
+					// Encumbrance with No Name
+
+					//setAttrs({character_equipment_total_enc: Total, encumbered: Encumbered });
+			   });
+			});
+			*/
 	</script>
\ No newline at end of file
diff --git a/Age Of Vikings/translation.json b/Age Of Vikings/translation.json
index 23ae71bdc8..54ca336fa2 100644
--- a/Age Of Vikings/translation.json	
+++ b/Age Of Vikings/translation.json	
@@ -122,6 +122,31 @@
 	"name-meaning-c":"Name Meaning",
 	"personality-type-c":"Personality Type",	
 	"spirit-animal-c":"Spirit Animal",
+	"mightyDef":"Mighty: Your hero attempts to solve problems first by means of physical force and brawn",
+	"bear-c":"Bear",
+	"bull-c":"Bull",
+	"eagle-c":"Eagle",
+	"steadfastDef":"Steadfast: Your hero believes that technique, craft, and expertise are the secrets of success",
+	"beaver-c":"Beaver",
+	"gyrFalcon-c":"Gyr Falcon",
+	"seal-c":"Seal",
+	"spiritualDef":"Spiritual: Your hero is attuned to the world of spirits, magic, and nature",
+	"cat-c":"Cat",
+	"goldenPlover-c":"Golden Plover",
+	"raven-c":"Raven",
+	"wandererDef":"Wanderer: Your hero has a drive to know every corner of Iceland and of the world beyond",
+	"goose-c":"Goose",
+	"horse-c":"Horse",
+	"wolf-c":"Wolf",
+	"cunningDef":"Cunning: Your hero first tries to outsmart an opponent to gain an advantage",
+	"owl-c":"Owl",
+	"snowFox-c":"Snow Fox",
+	"weasel-c":"Weasel",
+	"manipulativeDef":"Manipulative: Your hero enjoys making decisions while persuading other people to carry out their work",
+	"arcticTern-c":"Arctic Tern",
+	"dog-c":"Dog",
+	"mouse-c":"Mouse",
+
 	"gender-c":"Gender",
 	"age-c":"Age",
 	"birth-year-c":"Birth Year",	
@@ -150,10 +175,17 @@
 	"melee-weapons-u":"MELEE WEAPONS",	
 	"dmg-u":"DMG",	
 	"enc-u":"ENC",	
+	"type-u":"TYPE",
+	"impaling-c":"Impaling",
+	"slashing-c":"Slashing",
+	"crushing-c":"Crushing",
+	"typeDef":"Damage Type: Impaling, Slashing, or Crushing",
 	"hp-u":"HP",	
 	"shield-u":"SHIELD",	
 	"missile-weapons-u":"MISSILE WEAPONS",	
+	"range-c":"Range",	
 	"range-u":"RANGE",	
+	"rng-u":"RNG",	
 	"rate-u":"RATE",
 	"damage-c":"Damage",
 	"damage-u":"DAMAGE",	
@@ -336,6 +368,7 @@
 	"item-u":"ITEM",
 	"enc-u":"ENC",
 	"maxEnc-c":"Max ENC",
+	"encDef":"If Red, indicates the character has an Encumbrance Penalty. This occurs when Encumbrance exceeds the average of Strength and Constitution OR number of items exceed Strength",
 	"totalEnc-u":"TOTAL ENC",
 	
 	"primary-activity-c":"Primary Activities",
@@ -396,6 +429,7 @@
 	"modifier-c":"Modifier",
 	"effect-c":"Effect",
 	"effect:-c":"Effect:",
+	"mpCost:":"MP Cost:",
 	"realm-c":"Realm",
 	"mind-c":"Mind",
 	"body-c":"Body",