diff --git a/Only-War-Enhanced/OnlyWarEnhanced.css b/Only-War-Enhanced/OnlyWarEnhanced.css
index b5d29c3716..1652c228e4 100644
--- a/Only-War-Enhanced/OnlyWarEnhanced.css
+++ b/Only-War-Enhanced/OnlyWarEnhanced.css
@@ -594,7 +594,7 @@ ______________________________ start of minimisable infographic ________________
 
 .sheet-minimisable_infographic_grid {
 	display: grid;
-	grid-template-columns: 185px 103px 103px 215px;
+	grid-template-columns: 185px 185px 103px 215px;
 }
 
 .sheet-minimisable_infographic_g1 { grid-area: mi1; background: #52682d !important; border: 0px solid transparent; font-family: inherit !important; letter-spacing: 0px; justify-self: center; width: calc(100% - 6px); }
diff --git a/Only-War-Enhanced/OnlyWarEnhanced.html b/Only-War-Enhanced/OnlyWarEnhanced.html
index 1d2c186b73..63c3f6953e 100644
--- a/Only-War-Enhanced/OnlyWarEnhanced.html
+++ b/Only-War-Enhanced/OnlyWarEnhanced.html
@@ -70,16 +70,15 @@
 	  <input type="hidden" name='attr_wpB' value=''>
 	  <input type="hidden" name='attr_felTotal' value=''>
 	  <input type="hidden" name='attr_felB' value=''>
-<!-- TODO: setup the sheetworker to calc statTotal and statB -->
-	  <button title="Weapon Skill" name='WS' type='roll' class='clear full_width characteristics_button stats_grid_1' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Weapon Skill}}  {{dos=[[[[1+floor(abs([[{{ {@{wsTotal}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>WS |<input name='attr_WS_total' value='@{wsTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Ballistic Skill" name='BS' type='roll' class='clear full_width characteristics_button stats_grid_2' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Ballistic Skill}}  {{dos=[[[[1+floor(abs([[{{ {@{bsTotal}+@{inlinemod-toggle}}, {@{bsTotal}-@{limiter}}}kh1, {@{bsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{BS_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>BS |<input name='attr_BS_total' value='@{bsTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Strength" name='STR' type='roll' class='clear full_width characteristics_button stats_grid_3' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Strength}}  {{dos=[[[[1+floor(abs([[{{ {@{strTotal}+@{inlinemod-toggle}}, {@{strTotal}-@{limiter}}}kh1, {@{strTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{STR_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>STR |<input name='attr_STR_total' value='@{strTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Toughness" name='TOU' type='roll' class='clear full_width characteristics_button stats_grid_4' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Toughness}}  {{dos=[[[[1+floor(abs([[{{ {@{touTotal}+@{inlinemod-toggle}}, {@{touTotal}-@{limiter}}}kh1, {@{touTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{TOU_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>TOU |<input name='attr_TOU_total' value='@{touTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Agility" name='AGI' type='roll' class='clear full_width characteristics_button stats_grid_5' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Agility}}  {{dos=[[[[1+floor(abs([[{{ {@{agiTotal}+@{inlinemod-toggle}}, {@{agiTotal}-@{limiter}}}kh1, {@{agiTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{AGI_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>AGI |<input name='attr_AGI_total' value='@{agiTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Intelligence" name='INT' type='roll' class='clear full_width characteristics_button stats_grid_6' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Intelligence}}  {{dos=[[[[1+floor(abs([[{{ {@{intTotal}+@{inlinemod-toggle}}, {@{intTotal}-@{limiter}}}kh1, {@{intTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{INT_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>INT |<input name='attr_INT_total' value='@{intTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Perception" name='PER' type='roll' class='clear full_width characteristics_button stats_grid_7' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Perception}}  {{dos=[[[[1+floor(abs([[{{ {@{perTotal}+@{inlinemod-toggle}}, {@{perTotal}-@{limiter}}}kh1, {@{perTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{PER_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>PER |<input name='attr_PER_total' value='@{perTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Willpower" name='WP' type='roll' class='clear full_width characteristics_button stats_grid_8' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Willpower}}  {{dos=[[[[1+floor(abs([[{{ {@{wpTotal}+@{inlinemod-toggle}}, {@{wpTotal}-@{limiter}}}kh1, {@{wpTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WP_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>WP |<input name='attr_WP_total' value='@{wpTotal}' class='input_background input_char_background' disabled /></button>
-	  <button title="Fellowship" name='FEL' type='roll' class='clear full_width characteristics_button stats_grid_9' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Fellowship}}  {{dos=[[[[1+floor(abs([[{{ {@{felTotal}+@{inlinemod-toggle}}, {@{felTotal}-@{limiter}}}kh1, {@{felTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{FEL_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>FEL |<input name='attr_FEL_total' value='@{felTotal}' class='input_background input_char_background' disabled /></button>
+	  <button title="Weapon Skill" name='WS' type='roll' class='clear full_width characteristics_button stats_grid_1' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Weapon Skill}}  {{dos=[[[[1+floor(abs([[{{ {@{wsTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>WS |<input name='attr_WS_total' value='@{wsTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Ballistic Skill" name='BS' type='roll' class='clear full_width characteristics_button stats_grid_2' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Ballistic Skill}}  {{dos=[[[[1+floor(abs([[{{ {@{bsTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{bsTotal}-@{limiter}}}kh1, {@{bsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{BS_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>BS |<input name='attr_BS_total' value='@{bsTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Strength" name='STR' type='roll' class='clear full_width characteristics_button stats_grid_3' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Strength}}  {{dos=[[[[1+floor(abs([[{{ {@{strTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{strTotal}-@{limiter}}}kh1, {@{strTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{STR_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>STR |<input name='attr_STR_total' value='@{strTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Toughness" name='TOU' type='roll' class='clear full_width characteristics_button stats_grid_4' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Toughness}}  {{dos=[[[[1+floor(abs([[{{ {@{touTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{touTotal}-@{limiter}}}kh1, {@{touTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{TOU_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>TOU |<input name='attr_TOU_total' value='@{touTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Agility" name='AGI' type='roll' class='clear full_width characteristics_button stats_grid_5' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Agility}}  {{dos=[[[[1+floor(abs([[{{ {@{agiTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{agiTotal}-@{limiter}}}kh1, {@{agiTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{AGI_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>AGI |<input name='attr_AGI_total' value='@{agiTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Intelligence" name='INT' type='roll' class='clear full_width characteristics_button stats_grid_6' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Intelligence}}  {{dos=[[[[1+floor(abs([[{{ {@{intTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{intTotal}-@{limiter}}}kh1, {@{intTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{INT_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>INT |<input name='attr_INT_total' value='@{intTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Perception" name='PER' type='roll' class='clear full_width characteristics_button stats_grid_7' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Perception}}  {{dos=[[[[1+floor(abs([[{{ {@{perTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{perTotal}-@{limiter}}}kh1, {@{perTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{PER_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>PER |<input name='attr_PER_total' value='@{perTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Willpower" name='WP' type='roll' class='clear full_width characteristics_button stats_grid_8' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Willpower}}  {{dos=[[[[1+floor(abs([[{{ {@{wpTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{wpTotal}-@{limiter}}}kh1, {@{wpTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WP_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>WP |<input name='attr_WP_total' value='@{wpTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
+	  <button title="Fellowship" name='FEL' type='roll' class='clear full_width characteristics_button stats_grid_9' value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Fellowship}}  {{dos=[[[[1+floor(abs([[{{ {@{felTotal}+@{fatigued}+@{inlinemod-toggle}}, {@{felTotal}-@{limiter}}}kh1, {@{felTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{FEL_unnat}/2)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}'>FEL |<input name='attr_FEL_total' value='@{felTotal}+@{fatigued}' class='input_background input_char_background' disabled /></button>
 	  <label title='Toggles additional spaces to input Unnatural Characteristics and other bonus stats'><input type='checkbox' name='attr_extra_stats' class='collapsible_entity_switch select_button hidden' /><span class='select_text full_width stats_grid_plus'>▼</span></label>
 	  
 	  <input title="Weapon Skill" name='attr_WS' type='text' value='0' class='characteristics_input full_width stats_grid_10' />
@@ -357,13 +356,17 @@
 			<input class='minimisable_infographic_g3 full_width' type='text' name='attr_wounds_max' value='0' />
 		  </div>
 
-		  <div class='minimisable_infographic_field2x3 radius_border'>
+		  <div class='minimisable_infographic_field4x3a radius_border'>
 			<button name='fatigue_roll' type='roll' class='minimisable_infographic_g1 clear radius_border_top'
-			value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{name=Fatigue}} {{2x2-name=Current}} {{2x2=@{fatigue}}} {{2x2-name-max=Max}} {{2x2-max=@{fatigue|max}}}'>Fatigue</button>
-			<p class='minimisable_infographic_g2'>Current</p>
-			<input class='minimisable_infographic_g3 full_width' type='text' name='attr_fatigue' value='0' />
-			<p class='minimisable_infographic_g4'>Max</p>
-			<input class='minimisable_infographic_g5 full_width' type='text' name='attr_fatigue_max' value='0' readonly />
+			value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{name=Fatigue}} {{2x2-name=Current}} {{2x2=@{fatigue}}} {{2x2-name-max=Max}} {{2x2-max=@{fatigue|max}}} '>Fatigue</button>
+			<!-- TODO: add fatigue check to everything "+@{fatigued}" -->
+			<p class='minimisable_infographic_g6'>Current</p>
+			<input class='minimisable_infographic_g7 full_width' type='text' name='attr_fatigue' value='0' />
+			<p title='If current Fatigue is above this number, a -10 penalty will be applied to all Tests' class='minimisable_infographic_g4'>Threshold</p>
+			<input title='If current Fatigue is above this number, a -10 penalty will be applied to all Tests' class='minimisable_infographic_g5 full_width' type='text' name='attr_fatigue_threshold' value='0' />
+			<p class='minimisable_infographic_g2'>Max</p>
+			<input class='minimisable_infographic_g3 full_width' type='text' name='attr_fatigue_max' value='0' readonly />
+			<input class='hidden' type='checkbox' name='attr_fatigued' value='-10' />
 		  </div>
 
 		  <div class='minimisable_infographic_field2x3 radius_border'>
@@ -435,7 +438,7 @@
 			  <input name='attr_mod3_acrobatics' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_acrobatics_focus' type='hidden' value=''>
 			  <input name='attr_acrobatics_unnat' type='hidden' value=''>
-			  <button type='roll' name='acrobatics_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Acrobatics}} {{dos=[[[[1+floor(abs([[{{ {@{acrobatics_total}+@{inlinemod-toggle}}, {@{acrobatics_focus}-@{limiter}}}kh1, {@{acrobatics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{acrobatics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_acrobatics_total' value='@{acrobatics_focus}+@{mod2_acrobatics}+@{mod3_acrobatics}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='acrobatics_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Acrobatics}} {{dos=[[[[1+floor(abs([[{{ {@{acrobatics_total}+@{inlinemod-toggle}}, {@{acrobatics_focus}-@{limiter}}}kh1, {@{acrobatics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{acrobatics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_acrobatics_total' value='@{acrobatics_focus}+@{mod2_acrobatics}+@{mod3_acrobatics}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Athletics</p>
@@ -450,7 +453,7 @@
 			  <input name='attr_mod3_athletics' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_athletics_focus' type='hidden' value=''>
 			  <input name='attr_athletics_unnat' type='hidden' value=''>
-			  <button type='roll' name='athletics_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Athletics}} {{dos=[[[[1+floor(abs([[{{ {@{athletics_total}+@{inlinemod-toggle}}, {@{athletics_focus}-@{limiter}}}kh1, {@{athletics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{athletics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_athletics_total' value='@{athletics_focus}+@{mod2_athletics}+@{mod3_athletics}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='athletics_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Athletics}} {{dos=[[[[1+floor(abs([[{{ {@{athletics_total}+@{inlinemod-toggle}}, {@{athletics_focus}-@{limiter}}}kh1, {@{athletics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{athletics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_athletics_total' value='@{athletics_focus}+@{mod2_athletics}+@{mod3_athletics}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Awareness</p>
@@ -466,7 +469,7 @@
 			  <input name='attr_mod3_awareness' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_awareness_focus' type='hidden' value=''>
 			  <input name='attr_awareness_unnat' type='hidden' value=''>
-			  <button type='roll' name='awareness_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Awareness}} {{dos=[[[[1+floor(abs([[{{ {@{awareness_total}+@{inlinemod-toggle}}, {@{awareness_focus}-@{limiter}}}kh1, {@{awareness_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{awareness_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_awareness_total' value='@{awareness_focus}+@{mod2_awareness}+@{mod3_awareness}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='awareness_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Awareness}} {{dos=[[[[1+floor(abs([[{{ {@{awareness_total}+@{inlinemod-toggle}}, {@{awareness_focus}-@{limiter}}}kh1, {@{awareness_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{awareness_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_awareness_total' value='@{awareness_focus}+@{mod2_awareness}+@{mod3_awareness}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Charm</p>
@@ -480,7 +483,7 @@
 			  <input name='attr_mod3_charm' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_charm_focus' type='hidden' value=''>
 			  <input name='attr_charm_unnat' type='hidden' value=''>
-			  <button type='roll' name='charm_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Charm}} {{dos=[[[[1+floor(abs([[{{ {@{charm_total}+@{inlinemod-toggle}}, {@{charm_focus}-@{limiter}}}kh1, {@{charm_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{charm_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_charm_total' value='@{charm_focus}+@{mod2_charm}+@{mod3_charm}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='charm_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Charm}} {{dos=[[[[1+floor(abs([[{{ {@{charm_total}+@{inlinemod-toggle}}, {@{charm_focus}-@{limiter}}}kh1, {@{charm_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{charm_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_charm_total' value='@{charm_focus}+@{mod2_charm}+@{mod3_charm}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Command</p>
@@ -497,7 +500,7 @@
 			  <input name='attr_mod3_command' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_command_focus' type='hidden' value=''>
 			  <input name='attr_command_unnat' type='hidden' value=''>
-			  <button type='roll' name='command_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Command}} {{dos=[[[[1+floor(abs([[{{ {@{command_total}+@{inlinemod-toggle}}, {@{command_focus}-@{limiter}}}kh1, {@{command_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{command_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_command_total' value='@{command_focus}+@{mod2_command}+@{mod3_command}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='command_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Command}} {{dos=[[[[1+floor(abs([[{{ {@{command_total}+@{inlinemod-toggle}}, {@{command_focus}-@{limiter}}}kh1, {@{command_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{command_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_command_total' value='@{command_focus}+@{mod2_command}+@{mod3_command}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Commerce</p>
@@ -512,7 +515,7 @@
 			  <input name='attr_mod3_commerce' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_commerce_focus' type='hidden' value=''>
 			  <input name='attr_commerce_unnat' type='hidden' value=''>
-			  <button type='roll' name='commerce_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Commerce}} {{dos=[[[[1+floor(abs([[{{ {@{commerce_total}+@{inlinemod-toggle}}, {@{commerce_focus}-@{limiter}}}kh1, {@{commerce_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{commerce_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_commerce_total' value='@{commerce_focus}+@{mod2_commerce}+@{mod3_commerce}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='commerce_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Commerce}} {{dos=[[[[1+floor(abs([[{{ {@{commerce_total}+@{inlinemod-toggle}}, {@{commerce_focus}-@{limiter}}}kh1, {@{commerce_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{commerce_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_commerce_total' value='@{commerce_focus}+@{mod2_commerce}+@{mod3_commerce}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Deceive</p>
@@ -527,7 +530,7 @@
 			  <input name='attr_mod3_deceive' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_deceive_focus' type='hidden' value=''>
 			  <input name='attr_deceive_unnat' type='hidden' value=''>
-			  <button type='roll' name='deceive_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Deceive}} {{dos=[[[[1+floor(abs([[{{ {@{deceive_total}+@{inlinemod-toggle}}, {@{deceive_focus}-@{limiter}}}kh1, {@{deceive_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{deceive_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_deceive_total' value='@{deceive_focus}+@{mod2_deceive}+@{mod3_deceive}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='deceive_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Deceive}} {{dos=[[[[1+floor(abs([[{{ {@{deceive_total}+@{inlinemod-toggle}}, {@{deceive_focus}-@{limiter}}}kh1, {@{deceive_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{deceive_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_deceive_total' value='@{deceive_focus}+@{mod2_deceive}+@{mod3_deceive}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Dodge</p>
@@ -541,7 +544,7 @@
 			  <input name='attr_mod3_dodge' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_dodge_focus' type='hidden' value=''>
 			  <input name='attr_dodge_unnat' type='hidden' value=''>
-			  <button type='roll' name='dodge_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Dodge}} {{dos=[[[[1+floor(abs([[{{ {@{dodge_total}+@{inlinemod-toggle}}, {@{dodge_focus}-@{limiter}}}kh1, {@{dodge_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{dodge_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_dodge_total' value='@{dodge_focus}+@{mod2_dodge}+@{mod3_dodge}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='dodge_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Dodge}} {{dos=[[[[1+floor(abs([[{{ {@{dodge_total}+@{inlinemod-toggle}}, {@{dodge_focus}-@{limiter}}}kh1, {@{dodge_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{dodge_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_dodge_total' value='@{dodge_focus}+@{mod2_dodge}+@{mod3_dodge}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Inquiry</p>
@@ -557,7 +560,7 @@
 			  <input name='attr_mod3_inquiry' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_inquiry_focus' type='hidden' value=''>
 			  <input name='attr_inquiry_unnat' type='hidden' value=''>
-			  <button type='roll' name='inquiry_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Inquiry}} {{dos=[[[[1+floor(abs([[{{ {@{inquiry_total}+@{inlinemod-toggle}}, {@{inquiry_focus}-@{limiter}}}kh1, {@{inquiry_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{inquiry_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_inquiry_total' value='@{inquiry_focus}+@{mod2_inquiry}+@{mod3_inquiry}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='inquiry_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Inquiry}} {{dos=[[[[1+floor(abs([[{{ {@{inquiry_total}+@{inlinemod-toggle}}, {@{inquiry_focus}-@{limiter}}}kh1, {@{inquiry_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{inquiry_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_inquiry_total' value='@{inquiry_focus}+@{mod2_inquiry}+@{mod3_inquiry}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Interrogation</p>
@@ -572,7 +575,7 @@
 			  <input name='attr_mod3_interrogation' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_interrogation_focus' type='hidden' value=''>
 			  <input name='attr_interrogation_unnat' type='hidden' value=''>
-			  <button type='roll' name='interrogation_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Interrogation}} {{dos=[[[[1+floor(abs([[{{ {@{interrogation_total}+@{inlinemod-toggle}}, {@{interrogation_focus}-@{limiter}}}kh1, {@{interrogation_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{interrogation_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_interrogation_total' value='@{interrogation_focus}+@{mod2_interrogation}+@{mod3_interrogation}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='interrogation_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Interrogation}} {{dos=[[[[1+floor(abs([[{{ {@{interrogation_total}+@{inlinemod-toggle}}, {@{interrogation_focus}-@{limiter}}}kh1, {@{interrogation_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{interrogation_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_interrogation_total' value='@{interrogation_focus}+@{mod2_interrogation}+@{mod3_interrogation}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Intimidate</p>
@@ -587,7 +590,7 @@
 			  <input name='attr_mod3_intimidate' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_intimidate_focus' type='hidden' value=''>
 			  <input name='attr_intimidate_unnat' type='hidden' value=''>
-			  <button type='roll' name='intimidate_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Intimidate}} {{dos=[[[[1+floor(abs([[{{ {@{intimidate_total}+@{inlinemod-toggle}}, {@{intimidate_focus}-@{limiter}}}kh1, {@{intimidate_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{intimidate_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_intimidate_total' value='@{intimidate_focus}+@{mod2_intimidate}+@{mod3_intimidate}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='intimidate_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Intimidate}} {{dos=[[[[1+floor(abs([[{{ {@{intimidate_total}+@{inlinemod-toggle}}, {@{intimidate_focus}-@{limiter}}}kh1, {@{intimidate_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{intimidate_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_intimidate_total' value='@{intimidate_focus}+@{mod2_intimidate}+@{mod3_intimidate}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Logic</p>
@@ -602,7 +605,7 @@
 			  <input name='attr_mod3_logic' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_logic_focus' type='hidden' value=''>
 			  <input name='attr_logic_unnat' type='hidden' value=''>
-			  <button type='roll' name='logic_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Logic}} {{dos=[[[[1+floor(abs([[{{ {@{logic_total}+@{inlinemod-toggle}}, {@{logic_focus}-@{limiter}}}kh1, {@{logic_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{logic_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_logic_total' value='@{logic_focus}+@{mod2_logic}+@{mod3_logic}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='logic_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Logic}} {{dos=[[[[1+floor(abs([[{{ {@{logic_total}+@{inlinemod-toggle}}, {@{logic_focus}-@{limiter}}}kh1, {@{logic_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{logic_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_logic_total' value='@{logic_focus}+@{mod2_logic}+@{mod3_logic}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Medicae</p>
@@ -618,7 +621,7 @@
 			  <input name='attr_mod3_medicae' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_medicae_focus' type='hidden' value=''>
 			  <input name='attr_medicae_unnat' type='hidden' value=''>
-			  <button type='roll' name='medicae_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Medicae}} {{dos=[[[[1+floor(abs([[{{ {@{medicae_total}+@{inlinemod-toggle}}, {@{medicae_focus}-@{limiter}}}kh1, {@{medicae_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{medicae_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_medicae_total' value='@{medicae_focus}+@{mod2_medicae}+@{mod3_medicae}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='medicae_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Medicae}} {{dos=[[[[1+floor(abs([[{{ {@{medicae_total}+@{inlinemod-toggle}}, {@{medicae_focus}-@{limiter}}}kh1, {@{medicae_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{medicae_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_medicae_total' value='@{medicae_focus}+@{mod2_medicae}+@{mod3_medicae}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Navigate: Surface</p>
@@ -633,7 +636,7 @@
 			  <input name='attr_mod3_nav_surface' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_nav_surface_focus' type='hidden' value=''>
 			  <input name='attr_nav_surface_unnat' type='hidden' value=''>
-			  <button type='roll' name='nav_surface_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Surface}} {{dos=[[[[1+floor(abs([[{{ {@{nav_surface_total}+@{inlinemod-toggle}}, {@{nav_surface_focus}-@{limiter}}}kh1, {@{nav_surface_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{nav_surface_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_nav_surface_total' value='@{nav_surface_focus}+@{mod2_nav_surface}+@{mod3_nav_surface}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='nav_surface_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Surface}} {{dos=[[[[1+floor(abs([[{{ {@{nav_surface_total}+@{inlinemod-toggle}}, {@{nav_surface_focus}-@{limiter}}}kh1, {@{nav_surface_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{nav_surface_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_nav_surface_total' value='@{nav_surface_focus}+@{mod2_nav_surface}+@{mod3_nav_surface}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Navigate: Stellar</p>
@@ -648,7 +651,7 @@
 			  <input name='attr_mod3_nav_stellar' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_nav_stellar_focus' type='hidden' value=''>
 			  <input name='attr_nav_stellar_unnat' type='hidden' value=''>
-			  <button type='roll' name='nav_stellar_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Stellar}} {{dos=[[[[1+floor(abs([[{{ {@{nav_stellar_total}+@{inlinemod-toggle}}, {@{nav_stellar_focus}-@{limiter}}}kh1, {@{nav_stellar_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{nav_stellar_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_nav_stellar_total' value='@{nav_stellar_focus}+@{mod2_nav_stellar}+@{mod3_nav_stellar}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='nav_stellar_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Stellar}} {{dos=[[[[1+floor(abs([[{{ {@{nav_stellar_total}+@{inlinemod-toggle}}, {@{nav_stellar_focus}-@{limiter}}}kh1, {@{nav_stellar_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{nav_stellar_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_nav_stellar_total' value='@{nav_stellar_focus}+@{mod2_nav_stellar}+@{mod3_nav_stellar}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Navigate: Warp</p>
@@ -663,7 +666,7 @@
 			  <input name='attr_mod3_nav_warp' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_nav_warp_focus' type='hidden' value=''>
 			  <input name='attr_nav_warp_unnat' type='hidden' value=''>
-			  <button type='roll' name='nav_warp_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Warp}} {{dos=[[[[1+floor(abs([[{{ {@{nav_warp_total}+@{inlinemod-toggle}}, {@{nav_warp_focus}-@{limiter}}}kh1, {@{nav_warp_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{nav_warp_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_nav_warp_total' value='@{nav_warp_focus}+@{mod2_nav_warp}+@{mod3_nav_warp}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='nav_warp_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Warp}} {{dos=[[[[1+floor(abs([[{{ {@{nav_warp_total}+@{inlinemod-toggle}}, {@{nav_warp_focus}-@{limiter}}}kh1, {@{nav_warp_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{nav_warp_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_nav_warp_total' value='@{nav_warp_focus}+@{mod2_nav_warp}+@{mod3_nav_warp}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Operate: Surface</p>
@@ -678,7 +681,7 @@
 			  <input name='attr_mod3_op_surface' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_op_surface_focus' type='hidden' value=''>
 			  <input name='attr_op_surface_unnat' type='hidden' value=''>
-			  <button type='roll' name='op_surface_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Surface}} {{dos=[[[[1+floor(abs([[{{ {@{op_surface_total}+@{inlinemod-toggle}}, {@{op_surface_focus}-@{limiter}}}kh1, {@{op_surface_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{op_surface_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_op_surface_total' value='@{op_surface_focus}+@{mod2_op_surface}+@{mod3_op_surface}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='op_surface_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Surface}} {{dos=[[[[1+floor(abs([[{{ {@{op_surface_total}+@{inlinemod-toggle}}, {@{op_surface_focus}-@{limiter}}}kh1, {@{op_surface_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{op_surface_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_op_surface_total' value='@{op_surface_focus}+@{mod2_op_surface}+@{mod3_op_surface}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Operate: Aeronautica</p>
@@ -693,7 +696,7 @@
 			  <input name='attr_mod3_op_aero' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_op_aero_focus' type='hidden' value=''>
 			  <input name='attr_op_aero_unnat' type='hidden' value=''>
-			  <button type='roll' name='op_aero_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Aeronautica}} {{dos=[[[[1+floor(abs([[{{ {@{op_aero_total}+@{inlinemod-toggle}}, {@{op_aero_focus}-@{limiter}}}kh1, {@{op_aero_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{op_aero_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_op_aero_total' value='@{op_aero_focus}+@{mod2_op_aero}+@{mod3_op_aero}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='op_aero_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Aeronautica}} {{dos=[[[[1+floor(abs([[{{ {@{op_aero_total}+@{inlinemod-toggle}}, {@{op_aero_focus}-@{limiter}}}kh1, {@{op_aero_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{op_aero_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_op_aero_total' value='@{op_aero_focus}+@{mod2_op_aero}+@{mod3_op_aero}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Operate: Voidship</p>
@@ -708,7 +711,7 @@
 			  <input name='attr_mod3_op_void' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_op_void_focus' type='hidden' value=''>
 			  <input name='attr_op_void_unnat' type='hidden' value=''>
-			  <button type='roll' name='op_void_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Voidship}} {{dos=[[[[1+floor(abs([[{{ {@{op_void_total}+@{inlinemod-toggle}}, {@{op_void_focus}-@{limiter}}}kh1, {@{op_void_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{op_void_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_op_void_total' value='@{op_void_focus}+@{mod2_op_void}+@{mod3_op_void}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='op_void_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Voidship}} {{dos=[[[[1+floor(abs([[{{ {@{op_void_total}+@{inlinemod-toggle}}, {@{op_void_focus}-@{limiter}}}kh1, {@{op_void_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{op_void_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_op_void_total' value='@{op_void_focus}+@{mod2_op_void}+@{mod3_op_void}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Parry</p>
@@ -722,7 +725,7 @@
 			  <input name='attr_mod3_parry' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_parry_focus' type='hidden' value=''>
 			  <input name='attr_parry_unnat' type='hidden' value=''>
-			  <button type='roll' name='parry_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Parry}} {{dos=[[[[1+floor(abs([[{{ {@{parry_total}+@{inlinemod-toggle}}, {@{parry_focus}-@{limiter}}}kh1, {@{parry_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{parry_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_parry_total' value='@{parry_focus}+@{mod2_parry}+@{mod3_parry}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='parry_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Parry}} {{dos=[[[[1+floor(abs([[{{ {@{parry_total}+@{inlinemod-toggle}}, {@{parry_focus}-@{limiter}}}kh1, {@{parry_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{parry_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_parry_total' value='@{parry_focus}+@{mod2_parry}+@{mod3_parry}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Psyniscience</p>
@@ -737,7 +740,7 @@
 			  <input name='attr_mod3_psyniscience' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_psyniscience_focus' type='hidden' value=''>
 			  <input name='attr_psyniscience_unnat' type='hidden' value=''>
-			  <button type='roll' name='psyniscience_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Psyniscience}} {{dos=[[[[1+floor(abs([[{{ {@{psyniscience_total}+@{inlinemod-toggle}}, {@{psyniscience_focus}-@{limiter}}}kh1, {@{psyniscience_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{psyniscience_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_psyniscience_total' value='@{psyniscience_focus}+@{mod2_psyniscience}+@{mod3_psyniscience}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='psyniscience_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Psyniscience}} {{dos=[[[[1+floor(abs([[{{ {@{psyniscience_total}+@{inlinemod-toggle}}, {@{psyniscience_focus}-@{limiter}}}kh1, {@{psyniscience_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{psyniscience_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_psyniscience_total' value='@{psyniscience_focus}+@{mod2_psyniscience}+@{mod3_psyniscience}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Scrutiny</p>
@@ -752,7 +755,7 @@
 			  <input name='attr_mod3_scrutiny' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_scrutiny_focus' type='hidden' value=''>
 			  <input name='attr_scrutiny_unnat' type='hidden' value=''>
-			  <button type='roll' name='scrutiny_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Scrutiny}} {{dos=[[[[1+floor(abs([[{{ {@{scrutiny_total}+@{inlinemod-toggle}}, {@{scrutiny_focus}-@{limiter}}}kh1, {@{scrutiny_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scrutiny_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_scrutiny_total' value='@{scrutiny_focus}+@{mod2_scrutiny}+@{mod3_scrutiny}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='scrutiny_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Scrutiny}} {{dos=[[[[1+floor(abs([[{{ {@{scrutiny_total}+@{inlinemod-toggle}}, {@{scrutiny_focus}-@{limiter}}}kh1, {@{scrutiny_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scrutiny_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_scrutiny_total' value='@{scrutiny_focus}+@{mod2_scrutiny}+@{mod3_scrutiny}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Security</p>
@@ -767,7 +770,7 @@
 			  <input name='attr_mod3_security' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_security_focus' type='hidden' value=''>
 			  <input name='attr_security_unnat' type='hidden' value=''>
-			  <button type='roll' name='security_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Security}} {{dos=[[[[1+floor(abs([[{{ {@{security_total}+@{inlinemod-toggle}}, {@{security_focus}-@{limiter}}}kh1, {@{security_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{security_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_security_total' value='@{security_focus}+@{mod2_security}+@{mod3_security}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='security_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Security}} {{dos=[[[[1+floor(abs([[{{ {@{security_total}+@{inlinemod-toggle}}, {@{security_focus}-@{limiter}}}kh1, {@{security_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{security_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_security_total' value='@{security_focus}+@{mod2_security}+@{mod3_security}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Sleight of Hand</p>
@@ -782,7 +785,7 @@
 			  <input name='attr_mod3_sleight' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_sleight_focus' type='hidden' value=''>
 			  <input name='attr_sleight_unnat' type='hidden' value=''>
-			  <button type='roll' name='sleight_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Sleight of Hand}} {{dos=[[[[1+floor(abs([[{{ {@{sleight_total}+@{inlinemod-toggle}}, {@{sleight_focus}-@{limiter}}}kh1, {@{sleight_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{sleight_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_sleight_total' value='@{sleight_focus}+@{mod2_sleight}+@{mod3_sleight}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='sleight_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Sleight of Hand}} {{dos=[[[[1+floor(abs([[{{ {@{sleight_total}+@{inlinemod-toggle}}, {@{sleight_focus}-@{limiter}}}kh1, {@{sleight_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{sleight_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_sleight_total' value='@{sleight_focus}+@{mod2_sleight}+@{mod3_sleight}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Stealth</p>
@@ -797,7 +800,7 @@
 			  <input name='attr_mod3_stealth' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_stealth_focus' type='hidden' value=''>
 			  <input name='attr_stealth_unnat' type='hidden' value=''>
-			  <button type='roll' name='stealth_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Stealth}} {{dos=[[[[1+floor(abs([[{{ {@{stealth_total}+@{inlinemod-toggle}}, {@{stealth_focus}-@{limiter}}}kh1, {@{stealth_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{stealth_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_stealth_total' value='@{stealth_focus}+@{mod2_stealth}+@{mod3_stealth}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='stealth_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Stealth}} {{dos=[[[[1+floor(abs([[{{ {@{stealth_total}+@{inlinemod-toggle}}, {@{stealth_focus}-@{limiter}}}kh1, {@{stealth_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{stealth_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_stealth_total' value='@{stealth_focus}+@{mod2_stealth}+@{mod3_stealth}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Survival</p>
@@ -813,7 +816,7 @@
 			  <input name='attr_mod3_survival' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_survival_focus' type='hidden' value=''>
 			  <input name='attr_survival_unnat' type='hidden' value=''>
-			  <button type='roll' name='survival_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Survival}} {{dos=[[[[1+floor(abs([[{{ {@{survival_total}+@{inlinemod-toggle}}, {@{survival_focus}-@{limiter}}}kh1, {@{survival_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{survival_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_survival_total' value='@{survival_focus}+@{mod2_survival}+@{mod3_survival}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='survival_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Survival}} {{dos=[[[[1+floor(abs([[{{ {@{survival_total}+@{inlinemod-toggle}}, {@{survival_focus}-@{limiter}}}kh1, {@{survival_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{survival_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_survival_total' value='@{survival_focus}+@{mod2_survival}+@{mod3_survival}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Tech-Use</p>
@@ -828,7 +831,7 @@
 			  <input name='attr_mod3_tech_use' type='checkbox' value='50' class='skills_item' />
 			  <input name='attr_tech_use_focus' type='hidden' value=''>
 			  <input name='attr_tech_use_unnat' type='hidden' value=''>
-			  <button type='roll' name='tech_use_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Tech-Use}} {{dos=[[[[1+floor(abs([[{{ {@{tech_use_total}+@{inlinemod-toggle}}, {@{tech_use_focus}-@{limiter}}}kh1, {@{tech_use_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{tech_use_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_tech_use_total' value='@{tech_use_focus}+@{mod2_tech_use}+@{mod3_tech_use}-20' class='input_background' disabled /></button>
+			  <button type='roll' name='tech_use_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Tech-Use}} {{dos=[[[[1+floor(abs([[{{ {@{tech_use_total}+@{inlinemod-toggle}}, {@{tech_use_focus}-@{limiter}}}kh1, {@{tech_use_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{tech_use_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}' class='clear'><input name='attr_tech_use_total' value='@{tech_use_focus}+@{mod2_tech_use}+@{mod3_tech_use}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<fieldset name='skills' class='repeating_skill'>
 			  <div class='skill_grid'>
@@ -851,7 +854,7 @@
 				<input name='attr_skill_r_mod3' type='checkbox' value='50' class='skills_item' />
 				<input name='attr_skill_r_focus' type='hidden' value=''>
 				<input name='attr_skill_r_unnat' type='hidden' value=''>
-				<button type='roll' name='skill_Roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{skill_name}}} {{dos=[[[[1+floor(abs([[{{ {@{skill_r_total}+@{inlinemod-toggle}}, {@{skill_r_focus}-@{limiter}}}kh1, {@{skill_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{skill_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}' class='clear'><input name='attr_skill_r_total' value='@{skill_r_focus}+@{skill_r_mod2}+[[@{skill_r_mod3}-20' class='input_background' disabled /></button>
+				<button type='roll' name='skill_Roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{skill_name}}} {{dos=[[[[1+floor(abs([[{{ {@{skill_r_total}+@{inlinemod-toggle}}, {@{skill_r_focus}-@{limiter}}}kh1, {@{skill_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{skill_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}' class='clear'><input name='attr_skill_r_total' value='@{skill_r_focus}+@{skill_r_mod2}+[[@{skill_r_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			  </div>
 			</fieldset>
 		  </div>
@@ -883,7 +886,7 @@
 			  <input name='attr_linguistics_unnat' type='hidden' value=''>
 			  <button name='linguistics_roll' type='roll' class='clear'
 			  value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Linguistics: @{linguistics_name} }} {{dos=[[[[1+floor(abs([[{{ {@{linguistics_total}+@{inlinemod-toggle}}, {@{linguistics_focus}-@{limiter}}}kh1, {@{linguistics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{linguistics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}'>
-			  <input name='attr_linguistics_total' value='@{linguistics_focus}+@{linguistics_mod2}+@{linguistics_mod3}-20' class='input_background' disabled /></button>
+			  <input name='attr_linguistics_total' value='@{linguistics_focus}+@{linguistics_mod2}+@{linguistics_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<fieldset name='linguistics' class='repeating_linguistics'>
 			  <div class='education_grid'>
@@ -901,7 +904,7 @@
 				<input name='attr_linguistics_r_unnat' type='hidden' value=''>
 				<button name='linguistics_roll' type='roll' class='clear'
 				value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Linguistics: @{linguistics_name} }} {{dos=[[[[1+floor(abs([[{{ {@{linguistics_r_total}+@{inlinemod-toggle}}, {@{linguistics_r_focus}-@{limiter}}}kh1, {@{linguistics_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{linguistics_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
-				<input name='attr_linguistics_r_total' value='@{linguistics_r_focus}+@{linguistics_r_mod2}+@{linguistics_r_mod3}-20' class='input_background' disabled /></button>
+				<input name='attr_linguistics_r_total' value='@{linguistics_r_focus}+@{linguistics_r_mod2}+@{linguistics_r_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			  </div>
 			</fieldset>
 		  </div>
@@ -933,7 +936,7 @@
 			  <input name='attr_common-lore_unnat' type='hidden' value=''>
 			  <button name='common-lore_roll' type='roll' class='clear'
 			  value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Common Lore: @{common-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{common-lore_total}+@{inlinemod-toggle}}, {@{common-lore_focus}-@{limiter}}}kh1, {@{common-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{common-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}'>
-			  <input name='attr_common-lore_total' value='@{common-lore_focus}+@{common-lore_mod2}+@{common-lore_mod3}-20' class='input_background' disabled /></button>
+			  <input name='attr_common-lore_total' value='@{common-lore_focus}+@{common-lore_mod2}+@{common-lore_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<fieldset name='common-lore' class='repeating_common-lore'>
 			  <div class='education_grid'>
@@ -951,7 +954,7 @@
 				<input name='attr_common-lore_r_unnat' type='hidden' value=''>
 				<button name='common-lore_roll' type='roll' class='clear'
 				value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Common Lore: @{common-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{common-lore_r_total}+@{inlinemod-toggle}}, {@{common-lore_r_focus}-@{limiter}}}kh1, {@{common-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{common-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
-				<input name='attr_common-lore_r_total' value='@{common-lore_r_focus}+@{common-lore_r_mod2}+@{common-lore_r_mod3}-20' class='input_background' disabled /></button>
+				<input name='attr_common-lore_r_total' value='@{common-lore_r_focus}+@{common-lore_r_mod2}+@{common-lore_r_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			  </div>
 			</fieldset>
 		  </div>
@@ -983,7 +986,7 @@
 			  <input name='attr_scholastic-lore_unnat' type='hidden' value=''>
 			  <button name='scholastic-lore_roll' type='roll' class='clear'
 			  value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Scholastic Lore: @{scholastic-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{scholastic-lore_total}+@{inlinemod-toggle}}, {@{scholastic-lore_focus}-@{limiter}}}kh1, {@{scholastic-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scholastic-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}'>
-			  <input name='attr_scholastic-lore_total' value='@{scholastic-lore_focus}+@{scholastic-lore_mod2}+@{scholastic-lore_mod3}-20' class='input_background' disabled /></button>
+			  <input name='attr_scholastic-lore_total' value='@{scholastic-lore_focus}+@{scholastic-lore_mod2}+@{scholastic-lore_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<fieldset name='scholastic-lore' class='repeating_scholastic-lore'>
 			  <div class='education_grid'>
@@ -1001,7 +1004,7 @@
 				<input name='attr_scholastic-lore_r_unnat' type='hidden' value=''>
 				<button name='scholastic-lore_roll' type='roll' class='clear'
 				value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Scholastic Lore: @{scholastic-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{scholastic-lore_r_total}+@{inlinemod-toggle}}, {@{scholastic-lore_r_focus}-@{limiter}}}kh1, {@{scholastic-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scholastic-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
-				<input name='attr_scholastic-lore_r_total' value='@{scholastic-lore_r_focus}+@{scholastic-lore_r_mod2}+@{scholastic-lore_r_mod3}-20' class='input_background' disabled /></button>
+				<input name='attr_scholastic-lore_r_total' value='@{scholastic-lore_r_focus}+@{scholastic-lore_r_mod2}+@{scholastic-lore_r_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			  </div>
 			</fieldset>
 		  </div>
@@ -1033,7 +1036,7 @@
 			  <input name='attr_forbidden-lore_unnat' type='hidden' value=''>
 			  <button name='forbidden-lore_roll' type='roll' class='clear'
 			  value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Forbidden Lore: @{forbidden-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{forbidden-lore_total}+@{inlinemod-toggle}}, {@{forbidden-lore_focus}-@{limiter}}}kh1, {@{forbidden-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{forbidden-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}'>
-			  <input name='attr_forbidden-lore_total' value='@{forbidden-lore_focus}+@{forbidden-lore_mod2}+@{forbidden-lore_mod3}-20' class='input_background' disabled /></button>
+			  <input name='attr_forbidden-lore_total' value='@{forbidden-lore_focus}+@{forbidden-lore_mod2}+@{forbidden-lore_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<fieldset name='forbidden-lore' class='repeating_forbidden-lore'>
 			  <div class='education_grid'>
@@ -1051,7 +1054,7 @@
 				<input name='attr_forbidden-lore_r_unnat' type='hidden' value=''>
 				<button name='forbidden-lore_roll' type='roll' class='clear'
 				value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Forbidden Lore: @{forbidden-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{forbidden-lore_r_total}+@{inlinemod-toggle}}, {@{forbidden-lore_r_focus}-@{limiter}}}kh1, {@{forbidden-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{forbidden-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}'>
-				<input name='attr_forbidden-lore_r_total' value='@{forbidden-lore_r_focus}+@{forbidden-lore_r_mod2}+@{forbidden-lore_r_mod3}-20' class='input_background' disabled /></button>
+				<input name='attr_forbidden-lore_r_total' value='@{forbidden-lore_r_focus}+@{forbidden-lore_r_mod2}+@{forbidden-lore_r_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			  </div>
 			</fieldset>
 		  </div>
@@ -1084,7 +1087,7 @@
 			  <input name='attr_trade_unnat' type='hidden' value=''>
 			  <button name='trade_roll' type='roll' class='clear'
 			  value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{trade_name} }} {{dos=[[[[1+floor(abs([[{{ {@{trade_total}+@{inlinemod-toggle}}, {@{trade_focus}-@{limiter}}}kh1, {@{trade_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{trade_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof= $[[2]]}}'>
-			  <input name='attr_trade_total' value='@{trade_focus}+@{trade_mod2}+@{trade_mod3}-20' class='input_background' disabled /></button>
+			  <input name='attr_trade_total' value='@{trade_focus}+@{trade_mod2}+@{trade_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			</div>
 			<fieldset name='trade' class='repeating_trade'>
 			  <div class='education_grid'>
@@ -1103,7 +1106,7 @@
 				<input name='attr_trade_r_unnat' type='hidden' value=''>
 				<button name='trade_roll' type='roll' class='clear'
 				value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{trade_name} }} {{dos=[[[[1+floor(abs([[{{ {@{trade_r_total}+@{inlinemod-toggle}}, {@{trade_r_focus}-@{limiter}}}kh1, {@{trade_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{trade_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
-				<input name='attr_trade_r_total' value='@{trade_r_focus}+@{trade_r_mod2}+@{trade_r_mod3}-20' class='input_background' disabled /></button>
+				<input name='attr_trade_r_total' value='@{trade_r_focus}+@{trade_r_mod2}+@{trade_r_mod3}-20+@{fatigued}' class='input_background' disabled /></button>
 			  </div>
 			</fieldset>
 		  </div>
@@ -1165,7 +1168,7 @@
 				<option value='20' >Full Aim (+20)</option>
 			  </select>
 			  <button name='weapon_hit' class='equipment_ranged_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{R_weapon_name}}} {{burstwin=[[ceil([[[[1+ floor(abs([[{{ {@{R_weapon_target}+@{inlinemod-toggle}}, {@{bsTotal}-@{limiter}}}kh1, {@{bsTotal}+@{limiter}}}kl1]]-[[1d100@{R_weapon_mishap_chance}]])/10)]]+ceil(@{BS_unnat}/2)]]/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}{{dos=$[[3]]}}@{settings_hitroll}{{aim= [[@{R_weapon_aim}]]}}{{R_type= [[@{R_weapon_attack}]]}}{{range= [[@{R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{stat_name= Ballistic Skill}}{{stat=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{hitmod= [[@{R_weapon_mod1}]]}}{{trained= [[@{R_weapon_trained}-20]]}}{{burst=@{R_weapon_burst}}}{{auto=@{R_weapon_auto}}}
-!ammo @{character_id} repeating_rangedweapons_@{id}_R_weapon_mag [[@{ammo}*@{R_weapon_setting}]]'>Hit |<input name='attr_R_weapon_target' value='@{bsTotal} + @{R_weapon_trained} - 20 + @{R_weapon_mod1} + @{R_weapon_attack} + @{R_weapon_aim} + @{R_weapon_attack_range}' class='input_background input_char_background' disabled ></button>
+!ammo @{character_id} repeating_rangedweapons_@{id}_R_weapon_mag [[@{ammo}*@{R_weapon_setting}]]'>Hit |<input name='attr_R_weapon_target' value='@{bsTotal} + @{R_weapon_trained} - 20 + @{R_weapon_mod1} + @{R_weapon_attack} + @{R_weapon_aim} + @{R_weapon_attack_range}+@{fatigued}' class='input_background input_char_background' disabled ></button>
 			  <button name='weapon_dmg' class='equipment_ranged_weapons_gs_a5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{R_weapon_type}}} {{weapon= @{R_weapon_name}}} {{damage=[[@{R_weapon_real_dmg}]] }} {{spray= [[@{R_weapon_spray}]] }} {{pen=[[@{R_weapon_pen}+0@{R_weapon_pen2}]] }}  {{@{settings_weapondescription}=@{R_ability_r} }} @{R_weapon_accurate}'>DMG</button>
 			</div>
 			<div class='equipment_ranged_weapons_grid2'>
@@ -1286,7 +1289,7 @@
 				<option value='10' >Half Aim (+10)</option>
 				<option value='20' >Full Aim (+20)</option>
 			  </select>
-			  <button name='weapon_hit' class='equipment_melee_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{burstwin=[[ceil([[[[1+ floor(abs([[{{ {@{M_weapon_target}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}{{dos= $[[3]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{stat_name= Weapon Skill}}{{stat=[[@{WS}]]}}{{advancement=[[@{WS_advancement}]]}}{{hitmod=[[@{M_weapon_mod1}]]}}{{trained=[[@{M_weapon_trained}-20]]}}{{WS_bonus=[[@{wsB}]]}}' >Hit |<input name='attr_M_weapon_target' value='@{wsTotal}+@{M_weapon_trained}-20+@{M_weapon_mod1}+@{M_weapon_attack}+@{M_weapon_aim}+@{M_weapon_multi}' class='input_background input_char_background' disabled ></button>
+			  <button name='weapon_hit' class='equipment_melee_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{burstwin=[[ceil([[[[1+ floor(abs([[{{ {@{M_weapon_target}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}{{dos= $[[3]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{stat_name= Weapon Skill}}{{stat=[[@{WS}]]}}{{advancement=[[@{WS_advancement}]]}}{{hitmod=[[@{M_weapon_mod1}]]}}{{trained=[[@{M_weapon_trained}-20]]}}{{WS_bonus=[[@{wsB}]]}}' >Hit |<input name='attr_M_weapon_target' value='@{wsTotal}+@{M_weapon_trained}-20+@{M_weapon_mod1}+@{M_weapon_attack}+@{M_weapon_aim}+@{M_weapon_multi}+@{fatigued}' class='input_background input_char_background' disabled ></button>
 			  <button name='weapon_dmg' class='equipment_melee_weapons_gs_a5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{weapon= @{M_weapon_name}}} {{type= @{M_weapon_type}}} {{damage=[[@{M_weapon_real_dmg}+[[floor((@{strTotal})/10) + @{str_unnat}]]]] }} {{pen= [[@{M_weapon_pen}]] }} {{@{settings_weapondescription}=@{M_ability_r} }}'>DMG</button>
 			</div>
 			<div class='equipment_melee_weapons_grid2'>
@@ -1774,6 +1777,7 @@
 			</div>
 			<input class='hidden' type='text' name='attr_psy_ab_total_finder' readonly />
 			<input class='hidden' type='text' name='attr_psy_ab_unnat_finder' readonly />
+			<input class='hidden' type='text' name='attr_psy_fatigue_finder' readonly />
 			<div class='psykana_ability_grid3'>
 			  <div class='psykana_ability_gs_c1'>Focus Power</div>
 			  <select name='attr_P_focus' class='psykana_ability_gs_c2 full_width bottomless'>
@@ -1783,7 +1787,7 @@
 			  </select>
 			  <div class='psykana_ability_gs_c3 collapsible_entity_toggle'>Power Mod</div>
 			  <input class='psykana_ability_gs_c4 full_width' type='text' value='0' name='attr_P_mod1' />
-			  <button name='psy_hit' class='equipment_weapon_rep_c5_psy full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}}{{psy= }}{{attack= }}{{weapon= @{P_name}}} {{burstwin=[[ceil([[ [[1+floor(abs([[{{ {@{P_total}+@{inlinemod-toggle}}, {@{psy_ab_total_finder}-@{limiter}}}kh1, {@{psy_ab_total_finder}+@{limiter}}}kl1]]-[[1d100cs>90@{psy_roll}]])/10)]]+ceil(@{psy_ab_unnat_finder}/2)]]/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}} {{dos=$[[3]]}} {{class=[[@{psykana_class}]]}} {{limit=[[@{psykana_limit}]]}} {{focus= [[@{psy_ab_total_finder}]]}} {{pmod=[[@{P_mod1}]]}} {{sustain=[[@{psykana_sustain}]]}} {{modifier=[[@{inlinemod-toggle}]]}} {{P_multi=[[@{P_multi}]]}} {{eprmod=[[5*@{effective_psy_rating}]]}} {{epr=[[@{effective_psy_rating}]]}}'>Cast |<input name='attr_P_total' value='@{psy_ab_total_finder}+@{P_mod1}+5*@{effective_psy_rating}+@{psykana_sustain}' class='input_background input_char_background' disabled /></button>
+			  <button name='psy_hit' class='equipment_weapon_rep_c5_psy full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}}{{psy= }}{{attack= }}{{weapon= @{P_name}}} {{burstwin=[[ceil([[ [[1+floor(abs([[{{ {@{P_total}+@{inlinemod-toggle}}, {@{psy_ab_total_finder}-@{limiter}}}kh1, {@{psy_ab_total_finder}+@{limiter}}}kl1]]-[[1d100cs>90@{psy_roll}]])/10)]]+ceil(@{psy_ab_unnat_finder}/2)]]/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}} {{dos=$[[3]]}} {{class=[[@{psykana_class}]]}} {{limit=[[@{psykana_limit}]]}} {{focus= [[@{psy_ab_total_finder}]]}} {{pmod=[[@{P_mod1}]]}} {{sustain=[[@{psykana_sustain}]]}} {{modifier=[[@{inlinemod-toggle}]]}} {{P_multi=[[@{P_multi}]]}} {{eprmod=[[5*@{effective_psy_rating}]]}} {{epr=[[@{effective_psy_rating}]]}}'>Cast |<input name='attr_P_total' value='@{psy_ab_total_finder}+@{P_mod1}+5*@{effective_psy_rating}+@{psykana_sustain}+@{psy_fatigue_finder}' class='input_background input_char_background' disabled /></button>
 			  <button name='psy_dmg' class='psykana_ability_gs_c6 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{P_type}}} {{weapon= @{P_name}}} {{damage=[[@{P_dam-roll}]] }} {{pen=[[@{P_pen}]] }} {{@{settings_weapondescription}=@{P_ability_r} }}' >DMG</button>
 			</div>
 			
@@ -2031,11 +2035,12 @@
 				<option value='20' >Full Aim (+20)</option>
 			  </select>
 			  <button name='weapon_hit' class='equipment_ranged_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{V_R_weapon_name}}} {{burstwin=[[ceil([[[[1+ floor(abs([[{{ {@{V_R_weapon_target}+@{inlinemod-toggle}}, {@{veh_atk_total_finder}-@{limiter}}}kh1, {@{veh_atk_total_finder}+@{limiter}}}kl1]]-[[1d100@{V_R_weapon_mishap_chance}]])/10)]]+ceil(@{veh_atk_unnat_finder}/2)]]/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}{{dos= $[[3]]}}@{settings_hitroll}{{aim= [[@{V_R_weapon_aim}]]}}{{R_type= [[@{V_R_weapon_attack}]]}}{{range= [[@{V_R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{stat_name= @{V_R_focus}}}{{stat=[[@{veh_atk_total_finder}]]}}{{hitmod= [[@{V_R_weapon_mod1}]]}}{{trained= [[@{V_R_weapon_trained}-20]]}}{{burst=@{V_R_weapon_burst}}}{{auto=@{V_R_weapon_auto}}}
-!ammo @{character_id} repeating_rangedweapons_@{id}_V_R_weapon_mag [[@{ammo}*@{V_R_weapon_setting}]]'>Hit |<input name='attr_V_R_weapon_target' value='@{veh_atk_total_finder} + @{V_R_weapon_trained} - 20 + @{V_R_weapon_mod1} + @{V_R_weapon_attack} + @{V_R_weapon_aim} + @{V_R_weapon_attack_range}' class='input_background input_char_background' disabled ></button>
+!ammo @{character_id} repeating_rangedweapons_@{id}_V_R_weapon_mag [[@{ammo}*@{V_R_weapon_setting}]]'>Hit |<input name='attr_V_R_weapon_target' value='@{veh_atk_total_finder} + @{V_R_weapon_trained} - 20 + @{V_R_weapon_mod1} + @{V_R_weapon_attack} + @{V_R_weapon_aim} + @{V_R_weapon_attack_range}+@{veh_fatigue_finder}' class='input_background input_char_background' disabled ></button>
 			  <button name='weapon_dmg' class='equipment_ranged_weapons_gs_a5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{V_R_weapon_type}}} {{weapon= @{V_R_weapon_name}}} {{damage=[[@{V_R_weapon_real_dmg}]] }} {{spray= [[@{V_R_weapon_spray}]] }} {{pen=[[@{V_R_weapon_pen}+0@{V_R_weapon_pen2}]] }}  {{@{settings_weapondescription}=@{V_R_ability_r} }} @{V_R_weapon_accurate}'>DMG</button>
 			</div>
 			<input class='hidden' type='text' name='attr_veh_atk_total_finder' readonly />
 			<input class='hidden' type='text' name='attr_veh_atk_unnat_finder' readonly />
+			<input class='hidden' type='text' name='attr_veh_fatigue_finder' readonly />
 			<div class='equipment_ranged_weapons_grid2'>
 			  <input name='attr_wep_display' type='checkbox' value='min' class='collapsible_entity_switch hidden' />
 			  <input name='attr_wep_display' type='checkbox' value='half' class='collapsible_entity_switch_half hidden' />
@@ -2158,7 +2163,7 @@
 				<option value='10' >Half Aim (+10)</option>
 				<option value='20' >Full Aim (+20)</option>
 			  </select>
-			  <button name='weapon_hit' class='equipment_melee_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{V_M_weapon_name}}}{{burstwin=[[ceil([[[[1+ floor(abs([[{{ {@{V_M_weapon_target}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}{{dos=$[[3]]}}@{settings_hitroll} {{aim= [[@{V_M_weapon_aim}]]}}{{M_type= [[@{V_M_weapon_attack}]]}}{{multi= [[@{V_M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{stat_name= Weapon Skill}}{{stat=[[@{WS}]]}}{{advancement=[[@{WS_advancement}]]}}{{hitmod=[[@{V_M_weapon_mod1}]]}}{{trained=[[@{V_M_weapon_trained}-20]]}}{{WS_bonus=[[@{wsB}]]}}' >Hit |<input name='attr_V_M_weapon_target' value='@{wsTotal}+@{V_M_weapon_trained}-20+@{V_M_weapon_mod1}+@{V_M_weapon_attack}+@{V_M_weapon_aim}+@{V_M_weapon_multi}' class='input_background input_char_background' disabled ></button>
+			  <button name='weapon_hit' class='equipment_melee_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{V_M_weapon_name}}}{{burstwin=[[ceil([[[[1+ floor(abs([[{{ {@{V_M_weapon_target}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}{{dos=$[[3]]}}@{settings_hitroll} {{aim= [[@{V_M_weapon_aim}]]}}{{M_type= [[@{V_M_weapon_attack}]]}}{{multi= [[@{V_M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{stat_name= Weapon Skill}}{{stat=[[@{WS}]]}}{{advancement=[[@{WS_advancement}]]}}{{hitmod=[[@{V_M_weapon_mod1}]]}}{{trained=[[@{V_M_weapon_trained}-20]]}}{{WS_bonus=[[@{wsB}]]}}' >Hit |<input name='attr_V_M_weapon_target' value='@{wsTotal}+@{V_M_weapon_trained}-20+@{V_M_weapon_mod1}+@{V_M_weapon_attack}+@{V_M_weapon_aim}+@{V_M_weapon_multi}+@{fatigued}' class='input_background input_char_background' disabled ></button>
 			  <button name='weapon_dmg' class='equipment_melee_weapons_gs_a5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{weapon= @{V_M_weapon_name}}} {{type= @{V_M_weapon_type}}} {{damage=[[@{V_M_weapon_real_dmg}+[[floor((@{strTotal})/10) + @{str_unnat}]]]] }} {{pen= [[@{V_M_weapon_pen}]] }} {{@{settings_weapondescription}=@{V_M_ability_r} }}'>DMG</button>
 			</div>
 			<div class='equipment_melee_weapons_grid2'>
@@ -2551,14 +2556,12 @@
   // ________________________Fatigue and Armor sheet worker_____________________
   // ___________________________________________________________________________
   let fieldsFA = [
-	'fatigue_mod',
 	'tou', 'tou_unnat', 'tou_advancement',
 	'wp', 'wp_unnat', 'wp_advancement',
 	'armor_head', 'armor_arm_right', 'armor_body', 'armor_arm_left', 'armor_leg_right', 'armor_leg_left'
   ];
   on('sheet:opened ' + fieldsFA.map(field => 'change:' + field).join(' '), function() {
 	getAttrs(fieldsFA, function(values) {
-	  var fatigue_mod = parseInt(values['fatigue_mod'], 10) || 0;
 	  var tou = parseInt(values['tou'], 10) || 0;
 	  var tou_unnat = parseInt(values['tou_unnat'], 10) || 0;
 	  var tou_advancement = parseInt(values['tou_advancement'], 10) || 0;
@@ -2582,12 +2585,28 @@
 		soak_arm_left: (armor_arm_left + tou_mod),
 		soak_leg_right: (armor_leg_right + tou_mod),
 		soak_leg_left: (armor_leg_left + tou_mod),
-		fatigue_max: (tou_mod + wp_mod + fatigue_mod)
+		fatigue_max: (tou_mod + wp_mod)
 	  });
 
 	});
   });
 
+	//fatigue penalty
+  on('sheet:opened change:fatigue change:fatigue_threshold', function() {
+	getAttrs([
+	'fatigue', 'fatigue_threshold'
+	], function(values) {
+	  var fatigue = parseInt(values['fatigue']) || 0;
+	  var threshold = parseInt(values['fatigue_threshold']) || 0;
+	  
+	  var check = (fatigue > threshold) ? -10: 0;
+	  console.log(values,fatigue, threshold, check)
+	  setAttrs({
+		fatigued: check
+	  });
+	});
+  });
+
 
 
   // ___________________________________________________________________________
@@ -2613,8 +2632,8 @@
 	getAttrs([
 	'insanity_pts', 'corruption_pts'
 	], function(values) {
-	  var insanity_pts = parseInt(values['insanity_pts'], 0) || 0;
-	  var corruption_pts = parseInt(values['corruption_pts'], 10) || 0;
+	  var insanity_pts = parseInt(values['insanity_pts']) || 0;
+	  var corruption_pts = parseInt(values['corruption_pts']) || 0;
 	  
 	  if (insanity_pts <= 9) {
 		setAttrs({
@@ -2781,10 +2800,12 @@
 		  if (p_focus.length > 3) {
 			attr[`${row}_psy_ab_total_finder`] = `@{${p_focus}_total}`;
 			attr[`${row}_psy_ab_unnat_finder`] = `@{${p_focus}_unnat}`;
+			attr[`${row}_psy_fatigue_finder`] = 0;
 		  }
 		  else {
 			attr[`${row}_psy_ab_total_finder`] = `@{${p_focus}Total}`;
 			attr[`${row}_psy_ab_unnat_finder`] = `@{${p_focus.toUpperCase()}_unnat}`;
+			attr[`${row}_psy_fatigue_finder`] = `@{fatigued}`;
 		  }
 		});
 		console.log(values,attr)
@@ -2810,10 +2831,12 @@
 		  if (v_r_focus.length > 3) {
 			attr[`${row}_veh_atk_total_finder`] = `@{${v_r_focus}_total}`;
 			attr[`${row}_veh_atk_unnat_finder`] = `@{${v_r_focus}_unnat}`;
+			attr[`${row}_veh_fatigue_finder`] = 0;
 		  }
 		  else {
 			attr[`${row}_veh_atk_total_finder`] = `@{${v_r_focus}Total}`;
 			attr[`${row}_veh_atk_unnat_finder`] = `@{${v_r_focus.toUpperCase()}_unnat}`;
+			attr[`${row}_veh_fatigue_finder`] = `@{fatigued}`;
 		  }
 		});
 		console.log(values,attr)
@@ -3156,7 +3179,6 @@
 	{{^loc}}<div class="template-content">{{/loc}}
 
 	  <div class="rolltemplate-collapsible_entity_switch">
-		<!--TODO: visual bug: the divider line here is the "outside border" light green, but I want a darker green-->
 		<div class="template-2x2 template-content">
 		  <div class="template-2x2">
 			<div class="template-row template-right">Target:</div>