From 13d3198557e18a85171d2ac22f8482a102aea75e Mon Sep 17 00:00:00 2001
From: Stexinator <hurricane90@gmx.de>
Date: Mon, 21 Jun 2021 17:06:54 +0200
Subject: [PATCH 1/5] [TheWitcher] incorporate crit into roll

---
 TheWitcher/witchersheet.html | 246 ++++++++++++++++++-----------------
 1 file changed, 126 insertions(+), 120 deletions(-)

diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index 76cfa7959d..c76624d591 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -300,7 +300,7 @@
         					<div class='sheet-grid-item'>
         					<label class='sheet-skilltitle-int' data-i18n="intelligence-u" >INTELLIGENCE</label><input type="checkbox" name='attr_int_toggle' class="sheet-int-toggle"><span></span>
         						<div class='sheet-int-container'>
-        						    <button type='roll' data-i18n="awarenes-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{awareness_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>AWARENESS</button>
+        						    <button type='roll' data-i18n="awarenes-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{awareness_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>AWARENESS</button>
         						    <input name='attr_awareness' title='@{awareness}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_awareness_total' title='@{awareness_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{awareness}+@{awarenesssum})+0)+abs(round(@{awareness}+@{awarenesssum})-0))/2]]'>
         						    <input type="checkbox" checked='true' name='attr_awareness_unlock' class="sheet-awareness-unlock"><span></span>
@@ -315,7 +315,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="busines-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{business_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BUSINESS</button>
+        							<button type='roll' data-i18n="busines-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{business_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BUSINESS</button>
         							<input name='attr_business' title='@{business}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_business_total' title='@{business_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{business}+@{businesssum})+0)+abs(round(@{business}+@{businesssum})-0))/2]]'>
         						    <input type="checkbox" checked='true' name='attr_business_unlock' class="sheet-business-unlock"><span></span>
@@ -330,7 +330,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="deductio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{deduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DEDUCTION</button>
+        							<button type='roll' data-i18n="deductio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{deduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DEDUCTION</button>
         							<input name='attr_deduction' title='@{deduction}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_deduction_total' title='@{deduction_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{deduction}+@{deductionsum})+0)+abs(round(@{deduction}+@{deductionsum})-0))/2]]'>
         						    <input type="checkbox" checked='true' name='attr_deduction_unlock' class="sheet-deduction-unlock"><span></span>
@@ -345,7 +345,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="educatio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{education_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>EDUCATION</button>
+        							<button type='roll' data-i18n="educatio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{education_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>EDUCATION</button>
         							<input name='attr_education' title='@{education}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_education_total' title='@{education_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{education}+@{educationsum})+0)+abs(round(@{education}+@{educationsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_education_unlock' class="sheet-education-unlock"><span></span>
@@ -360,7 +360,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="nordling-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{nordling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>NORDLING*</button>
+        							<button type='roll' data-i18n="nordling-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{nordling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>NORDLING*</button>
         							<input name='attr_nordling' title='@{nordling}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_nordling_total' title='@{nordling_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{nordling}+@{nordlingsum})+0)+abs(round(@{nordling}+@{nordlingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_nordling_unlock' class="sheet-nordling-unlock"><span></span>
@@ -375,7 +375,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="elder-speech-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{elder_speech_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ELDER SPEECH*</button>
+        							<button type='roll' data-i18n="elder-speech-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{elder_speech_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ELDER SPEECH*</button>
         						    <input name='attr_elder_speech' title='@{elder_speech}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_elder_speech_total' title='@{elder_speech_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{elder_speech}+@{elderspeechsum})+0)+abs(round(@{elder_speech}+@{elderspeechsum})-0))/2]]'>
         						    <input type="checkbox" checked='true' name='attr_elder_speech_unlock' class="sheet-elder_speech-unlock"><span></span>
@@ -390,7 +390,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="dwarven-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{dwarven_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DWARVEN*</button>
+        							<button type='roll' data-i18n="dwarven-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{dwarven_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DWARVEN*</button>
         							<input name='attr_dwarven' title='@{dwarven}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_dwarven_total' title='@{dwarven_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{dwarven}+@{dwarvensum})+0)+abs(round(@{dwarven}+@{dwarvensum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_dwarven_unlock' class="sheet-dwarven-unlock"><span></span>
@@ -405,7 +405,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="monster-lore-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{monster_lore_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>MONSTER LORE*</button>
+        							<button type='roll' data-i18n="monster-lore-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{monster_lore_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>MONSTER LORE*</button>
         							<input name='attr_monster_lore' title='@{monster_lore}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_monster_lore_total' title='@{monster_lore_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{monster_lore}+@{monsterloresum})+0)+abs(round(@{monster_lore}+@{monsterloresum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_monster_lore_unlock' class="sheet-monster_lore-unlock"><span></span>
@@ -420,7 +420,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="social-etiquett-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{social_etiquette_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SOCIAL ETIQUETTE</button>
+        							<button type='roll' data-i18n="social-etiquett-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{social_etiquette_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SOCIAL ETIQUETTE</button>
         							<input name='attr_social_etiquette' title='@{social_etiquette}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_social_etiquette_total' title='@{social_etiquette_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{social_etiquette}+@{socialetiquettesum})+0)+abs(round(@{social_etiquette}+@{socialetiquettesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_social_etiquette_unlock' class="sheet-social_etiquette-unlock"><span></span>
@@ -435,7 +435,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="streetwis-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{streetwise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STREETWISE</button>
+        							<button type='roll' data-i18n="streetwis-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{streetwise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STREETWISE</button>
         							<input name='attr_streetwise' title='@{streetwise}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_streetwise_total' title='@{streetwise_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{streetwise}+@{streetwisesum})+0)+abs(round(@{streetwise}+@{streetwisesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_streetwise_unlock' class="sheet-streetwise-unlock"><span></span>
@@ -450,7 +450,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="tactics-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{tactics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TACTICS*</button>
+        							<button type='roll' data-i18n="tactics-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{tactics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TACTICS*</button>
         							<input name='attr_tactics' title='@{tactics}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_tactics_total' title='@{tactics_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{tactics}+@{tacticssum})+0)+abs(round(@{tactics}+@{tacticssum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_tactics_unlock' class="sheet-tactics-unlock"><span></span>
@@ -465,7 +465,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="teachin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{teaching_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TEACHING*</button>
+        							<button type='roll' data-i18n="teachin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{teaching_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TEACHING*</button>
         							<input name='attr_teaching' title='@{teaching}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_teaching_total' title='@{teaching_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{teaching}+@{teachingsum})+0)+abs(round(@{teaching}+@{teachingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_teaching_unlock' class="sheet-teaching-unlock"><span></span>
@@ -480,7 +480,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="wilderness-surviva-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{wilderness_survival_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>WILDERNESS SURVIVAL</button>
+        							<button type='roll' data-i18n="wilderness-surviva-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{wilderness_survival_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>WILDERNESS SURVIVAL</button>
         							<input name='attr_wilderness_survival' title='@{wilderness_survival}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_wilderness_survival_total' title='@{wilderness_survival_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{wilderness_survival}+@{wildernesssurvivalsum})+0)+abs(round(@{wilderness_survival}+@{wildernesssurvivalsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_wilderness_survival_unlock' class="sheet-wilderness_survival-unlock"><span></span>
@@ -508,14 +508,14 @@
             							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-brawling-options'>
-            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
-            							    <button type='roll' data-i18n="disarm--take-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[DISARM(TAKE)]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DISARM (TAKE)</button><br />
-            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
-            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
-            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
-            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
-            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button>
-            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
+            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
+            							    <button type='roll' data-i18n="disarm--take-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[DISARM(TAKE)]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DISARM (TAKE)</button><br />
+            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
+            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
+            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
+            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
+            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button>
+            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
             							</div><br />
         						    <div class='brawling-container'>
             							    <fieldset class="repeating_brawling">
@@ -527,7 +527,7 @@
             					            </fieldset><br>
         							</div>
         							<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="dodge-escap-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{dodge_escape_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DODGE/ESCAPE</button>
+        							<button type='roll' data-i18n="dodge-escap-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{dodge_escape_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DODGE/ESCAPE</button>
         							<input name='attr_dodge_escape' title='@{dodge_escape}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_dodge_escape_total' title='@{dodge_escape_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{dodge_escape}+@{dodgeescapesum})+0)+abs(round(@{dodge_escape}+@{dodgeescapesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_dodge_escape_unlock' class="sheet-dodge_escape-unlock"><span></span>
@@ -551,13 +551,13 @@
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-melee-options'>
-            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
-            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
-            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
-            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
-            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
-            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
-            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button>
+            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
+            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
+            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
+            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
+            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
+            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
+            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button>
         							    </div><br>
         							<div class='melee-container'>
             							    <fieldset class="repeating_melee">
@@ -569,7 +569,7 @@
             					            </fieldset><br>
         							</div>
         							<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="ridin-u"  class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{riding_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RIDING</button>
+        							<button type='roll' data-i18n="ridin-u"  class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{riding_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RIDING</button>
         							<input name='attr_riding' title='@{riding}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_riding_total' title='@{riding_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{riding}+@{ridingsum})+0)+abs(round(@{riding}+@{ridingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_riding_unlock' class="sheet-riding-unlock"><span></span>
@@ -584,7 +584,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="sailin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{sailing_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SAILING</button>
+        							<button type='roll' data-i18n="sailin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{sailing_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SAILING</button>
         							<input name='attr_sailing' title='@{sailing}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_sailing_total' title='@{sailing_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{sailing}+@{sailingsum})+0)+abs(round(@{sailing}+@{sailingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_sailing_unlock' class="sheet-sailing-unlock"><span></span>
@@ -608,13 +608,13 @@
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-small_blades-options'>
-            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
-            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
-            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
-            							    <button type='roll' data-i18n="bloc-u"  class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
-            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
-            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
-            							    <button data-i18n="joint-attac-u" type='roll' class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button>
+            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
+            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
+            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
+            							    <button type='roll' data-i18n="bloc-u"  class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
+            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
+            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
+            							    <button data-i18n="joint-attac-u" type='roll' class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button>
         							    </div><br>
         							<div class='small_blades-container'>
             							    <fieldset class="repeating_smallblades">
@@ -635,12 +635,12 @@
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-staff_spear-options'>
-            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
-            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
-            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
-            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
-            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
-            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
+            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
+            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
+            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
+            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
+            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
+            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
         							    </div><br>
         							<div class='staff_spear-container'>
             							    <fieldset class="repeating_staffspear">
@@ -661,13 +661,13 @@
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-swordsmanship-options'>
-            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
-            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
-            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
-            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
-            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
-            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
-            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACk</button>
+            							    <button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FAST STRIKES</button>
+            							    <button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SPECIAL MOVE</button><br />
+            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
+            							    <button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BLOCK</button><br />
+            							    <button type='roll' data-i18n="charg-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARGE</button>
+            							    <button type='roll' data-i18n="parr-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PARRY</button><br />
+            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACk</button>
         							    </div><br>
         						    <div class='swordsmanship-container'>
             							    <fieldset class="repeating_swordsmanship">
@@ -693,8 +693,8 @@
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-archery-options'>
-            							    <button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SINGLE STRIKE</button>
-            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
+            							    <button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SINGLE STRIKE</button>
+            							    <button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STRONG STRIKE</button>
             							</div><br>
         						    <div class='archery-container'>
             							    <fieldset class="repeating_archery">
@@ -715,10 +715,10 @@
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
             							<div class='sheet-athletics-options'>
-            							    <button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{athletics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BASIC ROLL</button>
-            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button><br />
-            							    <button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SINGLE STRIKE</button>
-            							    <button type='roll' data-i18n="repositio-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{athletics_total}[SKILL]+0[REPOSITION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>REPOSITION</button><br />
+            							    <button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BASIC ROLL</button>
+            							    <button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button><br />
+            							    <button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SINGLE STRIKE</button>
+            							    <button type='roll' data-i18n="repositio-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]+0[REPOSITION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>REPOSITION</button><br />
             							</div><br>
             						<div class='athletics-container'>
             							    <fieldset class="repeating_athletics">
@@ -730,7 +730,7 @@
             					            </fieldset><br>
         						    </div>
         						    <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        						    <button type='roll' data-i18n="crossbo-u"  class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CROSSBOW}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CROSSBOW</button>
+        						    <button type='roll' data-i18n="crossbo-u"  class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CROSSBOW}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CROSSBOW</button>
         							<input name='attr_crossbow' title='@{crossbow}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_crossbow_total' title='@{crossbow_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{crossbow}+@{crossbowsum})+0)+abs(round(@{crossbow}+@{crossbowsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_crossbow_unlock' class="sheet-crossbow-unlock"><span></span>
@@ -745,7 +745,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="sleight-of-han-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{sleight_of_hand_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SLEIGHT OF HAND</button>
+        							<button type='roll' data-i18n="sleight-of-han-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{sleight_of_hand_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SLEIGHT OF HAND</button>
         							<input name='attr_sleight_of_hand' title='@{sleight_of_hand}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_sleight_of_hand_total' title='@{sleight_of_hand_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{sleight_of_hand}+@{sleightofhandsum})+0)+abs(round(@{sleight_of_hand}+@{sleightofhandsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_sleight_of_hand_unlock' class="sheet-sleight_of_hand-unlock"><span></span>
@@ -760,7 +760,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="stealt-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{stealth_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STEALTH</button>
+        							<button type='roll' data-i18n="stealt-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{stealth_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STEALTH</button>
         							<input name='attr_stealth' title='@{stealth}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_stealth_total' title='@{stealth_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{stealth}+@{stealthsum})+0)+abs(round(@{stealth}+@{stealthsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_stealth_unlock' class="sheet-stealth-unlock"><span></span>
@@ -784,7 +784,7 @@
         					<div class='sheet-grid-item' style='margin-left: -30px; margin-right: 10px; margin-top: 0px;'>
         						<label class='sheet-skilltitle-body' data-i18n="body-u" >BODY</label><input type="checkbox" name='attr_body_toggle' class="sheet-body-toggle"><span></span>
         						<div class='sheet-body-container'>
-        							<button type='roll' data-i18n="physiqu-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10+@{body}[STAT]+@{physique_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PHYSIQUE</button>
+        							<button type='roll' data-i18n="physiqu-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{physique_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PHYSIQUE</button>
         							<input name='attr_physique' title='@{physique}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_physique_total' title='@{physique_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{physique}+@{physiquesum})+0)+abs(round(@{physique}+@{physiquesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_physique_unlock' class="sheet-physique-unlock"><span></span>
@@ -799,7 +799,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="enduranc-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10+@{body}[STAT]+@{endurance_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ENDURANCE</button>
+        							<button type='roll' data-i18n="enduranc-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{endurance_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ENDURANCE</button>
         							<input name='attr_endurance' title='@{endurance}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_endurance_total' title='@{endurance_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{endurance}+@{endurancesum})+0)+abs(round(@{endurance}+@{endurancesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_endurance_unlock' class="sheet-endurance-unlock"><span></span>
@@ -819,7 +819,7 @@
 
         						<label class='sheet-skilltitle-emp' data-i18n="empath-u" >EMPATHY</label><input type="checkbox" name='attr_emp_toggle' class="sheet-emp-toggle"><span></span>
         						<div class='sheet-emp-container'>
-        						    <button type='roll' data-i18n="charism-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{charisma_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARISMA</button>
+        						    <button type='roll' data-i18n="charism-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{charisma_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARISMA</button>
         							<input name='attr_charisma' title='@{charisma}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_charisma_total' title='@{charisma_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{charisma}+@{charismasum})+0)+abs(round(@{charisma}+@{charismasum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_charisma_unlock' class="sheet-charisma-unlock"><span></span>
@@ -834,7 +834,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="decei-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{deceit_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DECEIT</button>
+        							<button type='roll' data-i18n="decei-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{deceit_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DECEIT</button>
         							<input name='attr_deceit' title='@{deceit}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_deceit_total' title='@{deceit_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{deceit}+@{deceitsum})+0)+abs(round(@{deceit}+@{deceitsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_deceit_unlock' class="sheet-deceit-unlock"><span></span>
@@ -849,7 +849,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="gamblin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{gambling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>GAMBLING</button>
+        							<button type='roll' data-i18n="gamblin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{gambling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>GAMBLING</button>
         							<input name='attr_gambling' title='@{gambling}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_gambling_total' title='@{gambling_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{gambling}+@{gamblingsum})+0)+abs(round(@{gambling}+@{gamblingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_gambling_unlock' class="sheet-gambling-unlock"><span></span>
@@ -864,7 +864,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="grooming-style-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{grooming_and_style_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>GROOMING & STYLE</button>
+        							<button type='roll' data-i18n="grooming-style-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{grooming_and_style_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>GROOMING & STYLE</button>
         							<input name='attr_grooming_and_style' title='@{grooming_and_style}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_grooming_and_style_total' title='@{grooming_and_style_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{grooming_and_style}+@{groomingandstylesum})+0)+abs(round(@{grooming_and_style}+@{groomingandstylesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_grooming_and_style_unlock' class="sheet-grooming_and_style-unlock"><span></span>
@@ -879,7 +879,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="human-perceptio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{human_perception_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>HUMAN PERCEPTION</button>
+        							<button type='roll' data-i18n="human-perceptio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{human_perception_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>HUMAN PERCEPTION</button>
         							<input name='attr_human_perception' title='@{human_perception}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_human_perception_total' title='@{human_perception_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{human_perception}+@{humanperceptionsum})+0)+abs(round(@{human_perception}+@{humanperceptionsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_human_perception_unlock' class="sheet-human_perception-unlock"><span></span>
@@ -894,7 +894,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="leadershi-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{leadership_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>LEADERSHIP</button>
+        							<button type='roll' data-i18n="leadershi-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{leadership_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>LEADERSHIP</button>
         							<input name='attr_leadership' title='@{leadership}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_leadership_total' title='@{leadership_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{leadership}+@{leadershipsum})+0)+abs(round(@{leadership}+@{leadershipsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_leadership_unlock' class="sheet-leadership-unlock"><span></span>
@@ -909,7 +909,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="persuasio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{persuasion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERSUASION</button>
+        							<button type='roll' data-i18n="persuasio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{persuasion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERSUASION</button>
         						    <input name='attr_persuasion' title='@{persuasion}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_persuasion_total' title='@{persuasion_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{persuasion}+@{persuasionsum})+0)+abs(round(@{persuasion}+@{persuasionsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_persuasion_unlock' class="sheet-persuasion-unlock"><span></span>
@@ -924,7 +924,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="seductio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{seduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SEDUCTION</button>
+        							<button type='roll' data-i18n="seductio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{seduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SEDUCTION</button>
         							<input name='attr_seduction' title='@{seduction}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_seduction_total' title='@{seduction_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{seduction}+@{seductionsum})+0)+abs(round(@{seduction}+@{seductionsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_seduction_unlock' class="sheet-seduction-unlock"><span></span>
@@ -940,26 +940,26 @@
         							   </div><br>
         							   <hr style='border: 0.5px solid #5e0000; width: 180px; margin: 3px 0px 3px 70px;'>
         						    <div class='sheet-expanding-emp-choices'>
-        							<button type='roll' data-i18n="fine-art-u" class='sheet-skill-roller-emp' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name}}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{fine_arts}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FINE ARTS:</button>
+        							<button type='roll' data-i18n="fine-art-u" class='sheet-skill-roller-emp' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FINE ARTS:</button>
         							<input name='attr_fa_name' type='text' class='sheet-extraskill' placeholder='Type...'>
         							<input name='attr_fine_arts' title='@{fine_arts}' class='sheet-skillbox' type='number' value='0'>
         							<input type="checkbox" checked='true' name='attr_finearts_unlock' class="sheet-finearts-plus"><span></span>
         							    <div class='finearts-container'>
         							        <fieldset class="repeating_finearts">
-            						            <button type='roll' data-i18n="fine-art-u" class='repeating_skill_roller_emp' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name2}}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{fine_arts2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FINE ARTS:</button>
+            						            <button type='roll' data-i18n="fine-art-u" class='repeating_skill_roller_emp' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FINE ARTS:</button>
         							            <input name='attr_fa_name2' type='text' class='repeating_extraskill' placeholder='Type...'>
         							            <input name='attr_fine_arts2' class='repeating_skillbox' type='number' value='0'><br>
             					            </fieldset><br>
             					            <hr style='border: 0.5px; margin: 0px 0px -13px 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
             					        </div>
             					    <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-            					    <button type='roll' data-i18n="performanc-u" class='sheet-skill-roller-emp' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name}}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{performance}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERFORMANCE:</button>
+            					    <button type='roll' data-i18n="performanc-u" class='sheet-skill-roller-emp' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERFORMANCE:</button>
         							<input name='attr_p_name' type='text' class='sheet-extraskill' placeholder='Type...'>
         							<input name='attr_performance' title='@{performance}' class='sheet-skillbox' type='number' value='0'>
         							<input type="checkbox" checked='true' name='attr_performance_plus' class="sheet-performance-plus"><span></span>
             					        <div class='performance-container'>
             							   <fieldset class="repeating_performance">
-            						            <button type='roll' data-i18n="performanc-u" class='repeating_skill_roller_emp' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name2}}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{performance2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERFORMANCE:</button>
+            						            <button type='roll' data-i18n="performanc-u" class='repeating_skill_roller_emp' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERFORMANCE:</button>
         							            <input name='attr_p_name2' type='text' class='repeating_extraskill' placeholder='Type...'>
         							            <input name='attr_performance2' class='repeating_skillbox' type='number' value='0'><br>
             					           </fieldset><br>
@@ -971,7 +971,7 @@
 
         						<label class='sheet-skilltitle-cra' data-i18n="craf-u" >CRAFT</label><input type="checkbox" name='attr_cra_toggle' class="sheet-cra-toggle"><span></span>
         						<div class='sheet-cra-container'>
-        						    <button type='roll' data-i18n="alchemy-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{alchemy_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ALCHEMY*</button>
+        						    <button type='roll' data-i18n="alchemy-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{alchemy_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ALCHEMY*</button>
         							<input name='attr_alchemy' title='@{alchemy}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_alchemy_total' title='@{alchemy_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{alchemy}+@{alchemysum})+0)+abs(round(@{alchemy}+@{alchemysum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_alchemy_unlock' class="sheet-alchemy-unlock"><span></span>
@@ -986,7 +986,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CRAFTING*</button>
+        							<button type='roll' data-i18n="crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CRAFTING*</button>
         							<input name='attr_crafting' title='@{crafting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_crafting_total' title='@{crafting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{crafting}+@{craftingsum})+0)+abs(round(@{crafting}+@{craftingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_crafting_unlock' class="sheet-crafting-unlock"><span></span>
@@ -1001,7 +1001,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="disguis-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{disguise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DISGUISE</button>
+        							<button type='roll' data-i18n="disguis-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{disguise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DISGUISE</button>
         							<input name='attr_disguise' title='@{disguise}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_disguise_total' title='@{disguise_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{disguise}+@{disguisesum})+0)+abs(round(@{disguise}+@{disguisesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_disguise_unlock' class="sheet-disguise-unlock"><span></span>
@@ -1016,7 +1016,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="first-ai-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{first_aid_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FIRST AID</button>
+        							<button type='roll' data-i18n="first-ai-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{first_aid_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FIRST AID</button>
         							<input name='attr_first_aid' title='@{first_aid}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_first_aid_total' title='@{first_aid_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{first_aid}+@{firstaidsum})+0)+abs(round(@{first_aid}+@{firstaidsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_first_aid_unlock' class="sheet-first_aid-unlock"><span></span>
@@ -1031,7 +1031,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="forger-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{forgery_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FORGERY</button>
+        							<button type='roll' data-i18n="forger-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{forgery_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FORGERY</button>
         							<input name='attr_forgery' title='@{forgery}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_forgery_total' title='@{forgery_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{forgery}+@{forgerysum})+0)+abs(round(@{forgery}+@{forgerysum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_forgery_unlock' class="sheet-forgery-unlock"><span></span>
@@ -1046,7 +1046,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="pick-loc-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{pick_lock_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PICK LOCK</button>
+        							<button type='roll' data-i18n="pick-loc-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{pick_lock_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PICK LOCK</button>
         							<input name='attr_pick_lock' title='@{pick_lock}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_pick_lock_total' title='@{pick_lock_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{pick_lock}+@{picklocksum})+0)+abs(round(@{pick_lock}+@{picklocksum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_pick_lock_unlock' class="sheet-pick_lock-unlock"><span></span>
@@ -1061,7 +1061,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="trap-crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{trap_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TRAP CRAFTING*</button>
+        							<button type='roll' data-i18n="trap-crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{trap_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TRAP CRAFTING*</button>
         							<input name='attr_trap_crafting' title='@{trap_crafting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_trap_crafting_total' title='@{trap_crafting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{trap_crafting}+@{trapcraftingsum})+0)+abs(round(@{trap_crafting}+@{trapcraftingsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_trap_crafting_unlock' class="sheet-trap_crafting-unlock"><span></span>
@@ -1081,7 +1081,7 @@
 
         						<label class='sheet-skilltitle-will' data-i18n="will-u" >WILL</label><input type="checkbox" name='attr_will_toggle' class="sheet-will-toggle"><span></span>
         						<div class='sheet-will-container'>
-        						    <button type='roll' data-i18n="courag-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{courage_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>COURAGE</button>
+        						    <button type='roll' data-i18n="courag-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{courage_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>COURAGE</button>
         							<input name='attr_courage' title='@{courage}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_courage_total' title='@{courage_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{courage}+@{couragesum})+0)+abs(round(@{courage}+@{couragesum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_courage_unlock' class="sheet-courage-unlock"><span></span>
@@ -1096,7 +1096,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="hex-weaving-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{hex_weaving_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>HEX WEAVING*</button>
+        							<button type='roll' data-i18n="hex-weaving-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{hex_weaving_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>HEX WEAVING*</button>
         							<input name='attr_hex_weaving' title='@{hex_weaving}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_hex_weaving_total' title='@{hex_weaving_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{hex_weaving}+@{hexweavingsum}+@{totalev})+0)+abs(round(@{hex_weaving}+@{hexweavingsum}+@{totalev})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_hex_weaving_unlock' class="sheet-hex_weaving-unlock"><span></span>
@@ -1113,7 +1113,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="intimidatio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{intimidation_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>INTIMIDATION</button>
+        							<button type='roll' data-i18n="intimidatio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{intimidation_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>INTIMIDATION</button>
         							<input name='attr_intimidation' title='@{intimidation}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_intimidation_total' title='@{intimidation_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{intimidation}+@{intimidationsum})+0)+abs(round(@{intimidation}+@{intimidationsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_intimidation_unlock' class="sheet-intimidation-unlock"><span></span>
@@ -1139,8 +1139,8 @@
                           <input type='number' name='attr_totalev' class='sheet-totalev' value='[[0@{headev}@{torsoev}@{legev}-@{held_toggle}]]' disabled='true'>
             							</div>
             							<div class='sheet-spell_casting-options'>
-        							    <button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{spell_casting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BASIC ROLL</button>
-        							    <button type='roll' data-i18n="detailed-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{spell_casting_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DETAILED ROLL</button>
+        							    <button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BASIC ROLL</button>
+        							    <button type='roll' data-i18n="detailed-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DETAILED ROLL</button>
         							</div><br>
         							<div class='spell_casting-container'>
             							    <fieldset class="repeating_spellcasting">
@@ -1152,7 +1152,7 @@
             					            </fieldset><br>
             					    </div>
             					    <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-            					    <button type='roll' data-i18n="resist-magic-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{resist_magic_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RESIST MAGIC*</button>
+            					    <button type='roll' data-i18n="resist-magic-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_magic_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RESIST MAGIC*</button>
         							<input name='attr_resist_magic' title='@{resist_magic}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_resist_magic_total' title='@{resist_magic_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{resist_magic}+@{resistmagicsum})+0)+abs(round(@{resist_magic}+@{resistmagicsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_resist_magic_unlock' class="sheet-resist_magic-unlock"><span></span>
@@ -1167,7 +1167,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="resist-coercio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{resist_coercion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RESIST COERCION</button>
+        							<button type='roll' data-i18n="resist-coercio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_coercion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RESIST COERCION</button>
         							<input name='attr_resist_coercion' title='@{resist_coercion}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_resist_coercion_total' title='@{resist_coercion_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{resist_coercion}+@{resistcoercionsum})+0)+abs(round(@{resist_coercion}+@{resistcoercionsum})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_resist_coercion_unlock' class="sheet-resist_coercion-unlock"><span></span>
@@ -1182,7 +1182,7 @@
             					            </fieldset>
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        							<button type='roll' data-i18n="ritual-crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{ritual_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RITUAL CRAFTING*</button>
+        							<button type='roll' data-i18n="ritual-crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{ritual_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RITUAL CRAFTING*</button>
         							<input name='attr_ritual_crafting' title='@{ritual_crafting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_ritual_crafting_total' title='@{ritual_crafting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{ritual_crafting}+@{ritualcraftingsum}+@{totalev})+0)+abs(round(@{ritual_crafting}+@{ritualcraftingsum}+@{totalev})-0))/2]]'>
         							<input type="checkbox" checked='true' name='attr_ritual_crafting_unlock' class="sheet-ritual_crafting-unlock"><span></span>
@@ -1212,7 +1212,7 @@
         						<hr style='margin-bottom: 10px; margin-top: 5px;'>
         						<label class='sheet-initiativetitle' data-i18n="initiativ-u" >INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]&{tracker}+?{INITIATIVE MOD? (Bonuses/Penalties etc)|0}[MOD]]]}}'></button><br />
                                 <label class='sheet-savetitle' data-i18n="stun-death-save-u" >STUN & DEATH SAVE</label><button class='sheet-save-roll' type='roll' value= '@{whisper}&{template:save} {{title=STUN/DEATH SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below [[@{stun}+?{STUN/DEATH SAVE MOD? (Bonuses/Penalties etc)|0}[MOD]]]}} {{roll=[[1d10]]}}'></button><br />
-        						<label class='sheet-crittitle' data-i18n="crit-or-fumbl-u" >CRIT OR FUMBLE</label><button class='sheet-critical-roll' type='roll' value= '@{whisper}&{template:crit} {{title=CRIT/FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button><br />
+        						<label class='sheet-crittitle' data-i18n="crit-or-fumbl-u" >FUMBLE</label><button class='sheet-critical-roll' type='roll' value= '@{whisper}&{template:crit} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10+1]]}}'></button><br />
         						<label class='sheet-locationtitle' data-i18n="target-locatio-u" >TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
         					    <hr style='margin-bottom: 10px; margin-top: 5px;'>
         					    <label class='sheet-quick-button-maintitle' style='font-size: 17px; margin-top: 18px' data-i18n="quick-weapon-button-u" >QUICK WEAPON BUTTONS</label><br />
@@ -1244,7 +1244,7 @@
         				</div>
         			</div>
         			<hr>
-        		</div title='skills-tab-close'>
+        		</div> <!-- title='skills-tab-close' -->
 
         		<!-- --- Profession Abilities ---- -->
         		<div class="sheet-section-abilities" style='margin-left: -10px;'>
@@ -1274,7 +1274,7 @@
 				            <textarea class='sheet-prof-main-text' name='attr_prof_main_text'></textarea><br />
 				            <span class='sheet-main-skill-span2'><label style='margin-left: 200px;' class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_main_stat' title='@{prof_main_stat}' type='text' value='1'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:mainskill} {{title=@{prof_main_name}}} {{name=@{character_name}}} {{description=@{prof_main_text}}} {{roll=[[1d10+@{prof_main_choice}[STAT]+@{prof_main_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:mainskill} {{title=@{prof_main_name}}} {{name=@{character_name}}} {{description=@{prof_main_text}}} {{roll=[[1d10!+@{prof_main_choice}[STAT]+@{prof_main_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				    <div class='sheet-middle-skill-grid' style='margin-left: -10px; margin-right: 40px;'>
@@ -1294,7 +1294,7 @@
 				            <textarea class='sheet-prof-blue1-text' name='attr_prof_blue1_text'></textarea>
 				            <span class='sheet-blue1-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_blue1_stat' title='@{prof_blue1_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue1_name}}} {{name=@{character_name}}} {{description=@{prof_blue1_text}}} {{roll=[[1d10+@{prof_blue1_choice}[STAT]+@{prof_blue1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue1_name}}} {{name=@{character_name}}} {{description=@{prof_blue1_text}}} {{roll=[[1d10!+@{prof_blue1_choice}[STAT]+@{prof_blue1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-blue2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue2_name' value='2nd Skill Name...'>
@@ -1312,7 +1312,7 @@
 				            <textarea class='sheet-prof-blue2-text' name='attr_prof_blue2_text'></textarea>
 				            <span class='sheet-blue2-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_blue2_stat' title='@{prof_blue2_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue2_name}}} {{name=@{character_name}}} {{description=@{prof_blue2_text}}} {{roll=[[1d10+@{prof_blue2_choice}[STAT]+@{prof_blue2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue2_name}}} {{name=@{character_name}}} {{description=@{prof_blue2_text}}} {{roll=[[1d10!+@{prof_blue2_choice}[STAT]+@{prof_blue2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-blue3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue3_name' value='3rd Skill Name...'>
@@ -1330,7 +1330,7 @@
 				            <textarea class='sheet-prof-blue3-text' name='attr_prof_blue3_text'></textarea>
 				            <span class='sheet-blue3-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_blue3_stat' title='@{prof_blue3_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue3_name}}} {{name=@{character_name}}} {{description=@{prof_blue3_text}}} {{roll=[[1d10+@{prof_blue3_choice}[STAT]+@{prof_blue3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue3_name}}} {{name=@{character_name}}} {{description=@{prof_blue3_text}}} {{roll=[[1d10!+@{prof_blue3_choice}[STAT]+@{prof_blue3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 				        </div>
 
@@ -1350,7 +1350,7 @@
 				            <textarea class='sheet-prof-green1-text' name='attr_prof_green1_text'></textarea>
 				            <span class='sheet-green1-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_green1_stat' title='@{prof_green1_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green1_name}}} {{name=@{character_name}}} {{description=@{prof_green1_text}}} {{roll=[[1d10+@{prof_green1_choice}[STAT]+@{prof_green1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green1_name}}} {{name=@{character_name}}} {{description=@{prof_green1_text}}} {{roll=[[1d10!+@{prof_green1_choice}[STAT]+@{prof_green1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-green2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green2_name' value='2nd Skill Name...'>
@@ -1368,7 +1368,7 @@
 				            <textarea class='sheet-prof-green2-text' name='attr_prof_green2_text'></textarea>
 				            <span class='sheet-green2-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_green2_stat' title='@{prof_green2_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green2_name}}} {{name=@{character_name}}} {{description=@{prof_green2_text}}} {{roll=[[1d10+@{prof_green2_choice}[STAT]+@{prof_green2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green2_name}}} {{name=@{character_name}}} {{description=@{prof_green2_text}}} {{roll=[[1d10!+@{prof_green2_choice}[STAT]+@{prof_green2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-green3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green3_name' value='3rd Skill Name...'>
@@ -1386,7 +1386,7 @@
 				            <textarea class='sheet-prof-green3-text' name='attr_prof_green3_text'></textarea>
 				            <span class='sheet-green3-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_green3_stat' title='@{prof_green3_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green3_name}}} {{name=@{character_name}}} {{description=@{prof_green3_text}}} {{roll=[[1d10+@{prof_green3_choice}[STAT]+@{prof_green3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green3_name}}} {{name=@{character_name}}} {{description=@{prof_green3_text}}} {{roll=[[1d10!+@{prof_green3_choice}[STAT]+@{prof_green3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 				        </div>
 
@@ -1406,7 +1406,7 @@
 				            <textarea class='sheet-prof-red1-text' name='attr_prof_red1_text'></textarea>
 				            <span class='sheet-red1-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_red1_stat' title='@{prof_red1_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red1_name}}} {{name=@{character_name}}} {{description=@{prof_red1_text}}} {{roll=[[1d10+@{prof_red1_choice}[STAT]+@{prof_red1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red1_name}}} {{name=@{character_name}}} {{description=@{prof_red1_text}}} {{roll=[[1d10!+@{prof_red1_choice}[STAT]+@{prof_red1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-red2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red2_name' value='2nd Skill Name...'>
@@ -1424,7 +1424,7 @@
 				            <textarea class='sheet-prof-red2-text' name='attr_prof_red2_text'></textarea>
 				            <span class='sheet-red2-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_red2_stat' title='@{prof_red2_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red2_name}}} {{name=@{character_name}}} {{description=@{prof_red2_text}}} {{roll=[[1d10+@{prof_red2_choice}[STAT]+@{prof_red2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red2_name}}} {{name=@{character_name}}} {{description=@{prof_red2_text}}} {{roll=[[1d10!+@{prof_red2_choice}[STAT]+@{prof_red2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-red3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red3_name' value='3rd Skill Name...'>
@@ -1442,11 +1442,11 @@
 				            <textarea class='sheet-prof-red3-text' name='attr_prof_red3_text'></textarea>
 				            <span class='sheet-red3-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_red3_stat' title='@{prof_red3_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red3_name}}} {{name=@{character_name}}} {{description=@{prof_red3_text}}} {{roll=[[1d10+@{prof_red3_choice}[STAT]+@{prof_red3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red3_name}}} {{name=@{character_name}}} {{description=@{prof_red3_text}}} {{roll=[[1d10!+@{prof_red3_choice}[STAT]+@{prof_red3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 				        </div>
 				    </div>
-        		</div title='abilities-tab-close'>
+        		</div> <!-- title='abilities-tab-close' -->
 
         		<!-- ---- Arms, Gear & Bags ---- -->
         		<div class="sheet-section-gear" style='margin-left: -10px;'>
@@ -2246,7 +2246,7 @@
         					<input type="hidden" name="attr_fulgur_quantity" value='[[@{quantity_fulgur}]]'>
         					<input type="hidden" name="attr_quantity_fulgur" value='0'>
 
-        		</div title='gear-tab-close'>
+        		</div> <!-- title='gear-tab-close' -->
 
         		<!-- --- Spells & Magic ---- -->
         		<div class="sheet-section-spells" style='margin-left: -10px;'>
@@ -2334,7 +2334,7 @@
         						<div>
         							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
         							<select class='repeating_spell_type' type="text" name="attr_spell_type">
-        								<option value="Master Spell" SPELL</option>
+        								<option value="Master Spell"> SPELL </option>
         								<option value="Master/AP Invocation" data-i18n="invocatio-u" >INVOCATION</option></select>
         							<label class='repeating_spell_sta_title' data-i18n="sta-cos-u" >STA COST</label><input class='repeating_spell_sta' type='text' name='attr_spell_sta' value='0'><br />
         							<label class='repeating_spell_range_title' data-i18n="range-u" >RANGE</label><input class='repeating_spell_range' type='text' name='attr_spell_range'>
@@ -2430,7 +2430,7 @@
         							</fieldset>
         				</div>
         			</div>
-        		</div title='spells-tab-close'>
+        		</div> <!-- title='spells-tab-close' -->
 
         		<!-- --- Background---- -->
         		<div class="sheet-section-background" style='margin-left: -10px;'>
@@ -2540,7 +2540,7 @@
         					</div>
         				</div>
         			</div>
-        		</div title='background-tab-close'>
+        		</div> <!-- title='background-tab-close' -->
         	</div>
         </div>
         <div class="sheet-block-npc" style='margin-top: 90px;'>
@@ -2554,7 +2554,7 @@
         			<label class='sheet-stattitle' data-i18n="body-u" >BODY</label><input name='attr_total_body_npc' title='@{total_body_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_body_npc' title='@{body_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_body_npc}+@{stat_mod_body_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=BODY SAVE}} {{description=To succeed you need to roll below @{body_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="spd-u" >SPD</label><input name='attr_total_spd_npc' title='@{total_spd_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_spd_npc' title='@{spd_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_spd_npc}+@{stat_mod_spd_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=SPD SAVE}} {{description=To succeed you need to roll below @{spd_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="emp-u" >EMP</label><input name='attr_total_emp_npc' title='@{total_emp_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_emp_npc' title='@{emp_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_emp_npc}+@{stat_mod_emp_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=EMP SAVE}} {{description=To succeed you need to roll below @{emp_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="cra-u" >CRA</label><input name='attr_total_cra_npc'_npctitle='@{total_cra_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra_npc' title='@{cra_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra_npc}+@{stat_mod_cra_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=CRA SAVE}} {{description=To succeed you need to roll below @{cra_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="cra-u" >CRA</label><input name='attr_total_cra_npc' npctitle='@{total_cra_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra_npc' title='@{cra_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra_npc}+@{stat_mod_cra_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=CRA SAVE}} {{description=To succeed you need to roll below @{cra_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="will-u" >WILL</label><input name='attr_total_will_npc' title='@{total_will_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_will_npc' title='@{will_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_will_npc}+@{stat_mod_will_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=WILL SAVE}} {{description=To succeed you need to roll below @{will_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="luck-u" >LUCK</label><input name='attr_total_luck_npc' title='@{total_luck_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_luck_npc' title='@{luck_npc}' class='sheet-smallbox' type='text' value='0'><br />
         			<label class='sheet-sizetitle' style='margin-top: 7px; margin-left: 28px;' data-i18n="threat-u" >THREAT</label><input name='attr_npc_threat' class='sheet-size-box2' type='text'>
@@ -2604,7 +2604,7 @@
     				                <option value='@{will_npc}' data-i18n="will-u" >WILL</option>
         					        </select>
         					        <input class='repeating_npcskill_score' name='attr_npcskill_score' type='text' value='0'>
-        					        <button type='roll' style='margin-top: -4px;' class='repeating_npc_skill_roll' value='@{whisper}&{template:statistics2} {{title=@{npcskill_name}}} {{name=@{character_name}}} {{roll=[[1d10+@{npcskill_stat}[STAT]+@{npcskill_score}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+        					        <button type='roll' style='margin-top: -4px;' class='repeating_npc_skill_roll' value='@{whisper}&{template:statistics2} {{title=@{npcskill_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{npcskill_stat}[STAT]+@{npcskill_score}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
         					    </span>
         					</fieldset>
     					</div>
@@ -2680,7 +2680,7 @@
 						<hr style='margin-bottom: 10px; margin-top: 5px;'>
 						<label class='sheet-initiativetitle' data-i18n="initiativ-u" >INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref_npc}[STAT]&{tracker}]]}}'></button><br />
 						<label class='sheet-savetitle' data-i18n="stun-death-save-u" >STUN & DEATH SAVE</label><button class='sheet-save-roll' type='roll' value= '@{whisper}&{template:save} {{title=STUN/DEATH SAVE}} {{name=@{character_name}}} {{description= To succeed you need to roll below [[@{stun_npc}]].}} {{roll=[[1d10]]}}'></button><br />
-						<label class='sheet-crittitle' data-i18n="crit-or-fumbl-u" >CRIT OR FUMBLE</label><button class='sheet-critical-roll' type='roll' name="roll_Fumble" value= '@{whisper}&{template:crit} {{title=CRIT/FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button><br />
+						<label class='sheet-crittitle' data-i18n="crit-or-fumbl-u" >FUMBLE</label><button class='sheet-critical-roll' type='roll' name="roll_Fumble" value= '@{whisper}&{template:crit} {{title=CRIT/FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button><br />
 						<label class='sheet-locationtitle' data-i18n="target-locatio-u" >TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
 					</div>
 				</div>
@@ -3371,7 +3371,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><th  style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your total score.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
@@ -3382,9 +3382,9 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td><strong class="template-title">1ST ATTACK: </strong> {{roll}}</td></tr>
         <tr><td><strong class="template-title">2ND ATTACK: </strong> {{roll2}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your first attack.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your first attack.</td></tr>{{/rollWasFumble() roll}}
-        {{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your second attack.</td></tr>{{/rollWasCrit() roll2}}
+        {{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll2}}
         {{#rollWasFumble() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your second attack.</td></tr>{{/rollWasFumble() roll2}}
     </table>
 </rolltemplate>
@@ -3419,8 +3419,12 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
 
 <rolltemplate class="sheet-rolltemplate-target">
     <table>
-        <tr><th>{{title}}</th></tr>
-        <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
+		<tr>
+			<th>{{title}}</th>
+		</tr>
+		<tr>
+			<td><strong class="template-title">NAME: </strong> {{name}}</td>
+		</tr>
         {{#rollTotal() roll 1}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">HEAD:</strong> If successful, your attack will deal x3 damage.</td></tr>{{/rollTotal() roll 1}}
         {{#rollBetween() roll 2 4}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">TORSO (HUMANOID):</strong> If successful, your attack will deal standard damage.</td></tr>{{/rollBetween() roll 2 4}}
         {{#rollTotal() roll 5}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">RIGHT ARM (HUMANOID):</strong> If successful, your attack will deal half damage.</td></tr>{{/rollTotal() roll 5}}
@@ -3432,7 +3436,9 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         {{#rollBetween() roll 8 9}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">LEFT LIMB (MONSTER):</strong> If successful, your attack will deal half damage.</td></tr>{{/rollBetween() roll 8 9}}
         {{#rollTotal() roll 10}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">WING/TAIL (MONSTER):</strong> If successful, your attack will deal half damage.</td></tr>{{/rollTotal() roll 10}}
 
-        <tr><td><strong class="template-title">TARGET LOCATION: </strong> {{roll}}</td></tr>
+		<tr>
+			<td><strong class="template-title">TARGET LOCATION: </strong> {{roll}}</td>
+		</tr>
     </table>
 </rolltemplate>
 
@@ -3444,7 +3450,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong>{{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your total score.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
@@ -3455,7 +3461,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your total score.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
@@ -3466,7 +3472,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your total score.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
@@ -3477,7 +3483,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your total score.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
@@ -3566,7 +3572,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">REPUTATION: </strong> {{reputation}}</td></tr>
         <tr><td><strong class="template-title">REP ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Use the Critical/Fumble button, **add** the result to your total score.</td></tr>{{/rollWasCrit() roll}}
+        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>

From 582eaac1ce66524d970a713db522e6e1eb4cf6bb Mon Sep 17 00:00:00 2001
From: Stexinator <hurricane90@gmx.de>
Date: Mon, 21 Jun 2021 17:47:36 +0200
Subject: [PATCH 2/5] [TheWitcher] some html cleanup

---
 TheWitcher/witchersheet.html | 451 ++++++++++++++++++-----------------
 1 file changed, 229 insertions(+), 222 deletions(-)

diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index c76624d591..019fda798b 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -12,12 +12,12 @@
         			<button type='roll' data-i18n="int-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=INT SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{int}.}} {{roll=[[1d10]]}}'>INT</button>
         			<input name='attr_total_int' title='@{total_int}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_int' title='@{int}' class='sheet-statbox' type='text' value='[[((floor((@{total_int}+@{intstatsum})@{wound_mod})+1)+abs((floor((@{total_int}+@{intstatsum})@{wound_mod}))-1))/2]]' disabled='true'>
-        			<input type="checkbox" checked='true' name='attr_int_unlock' class="sheet-int-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_int_unlock' class="sheet-int-unlock"><span></span>
         			    <div class='intstat-container'>
         			        <input name='attr_ev_penalty' class='sheet-statbox' type='text' value='' disabled='true'>
                 			<fieldset class="repeating_intstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_intstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_intstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_intstattoggle' value='1' checked>|
                     			<input type="number" class='repeating_mod' name="attr_intstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_intstatsum" value='0'>
@@ -27,13 +27,13 @@
         			<button type='roll' data-i18n="ref-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=REF SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{ref}.}} {{roll=[[1d10]]}}'>REF</button>
         			<input name='attr_total_ref' title='@{total_ref}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_ref' title='@{ref}' class='sheet-statbox' type='text' value='[[((floor((@{total_ref}+@{refstatsum}+@{totalev})@{wound_mod})+1)+abs((floor((@{total_ref}+@{refstatsum}+@{totalev})@{wound_mod}))-1))/2]]' disabled='true'>
-        			<input type="checkbox" checked='true' name='attr_ref_unlock' class="sheet-ref-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_ref_unlock' class="sheet-ref-unlock"><span></span>
         			    <div class='refstat-container'>
                       <label class='sheet-totalev-title' data-i18n="ev-penalty-u">EV PENALTY</label>
                       <input type='number' name='attr_totalev' class='sheet-totalev' value='[[0@{headev}@{torsoev}@{legev}-@{held_toggle}]]' disabled='true'>
                 			<fieldset class="repeating_refstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_refstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_refstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_refstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_refstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_refstatsum" value='0'>
@@ -43,13 +43,13 @@
         			<button type='roll' data-i18n="dex-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=DEX SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{dex}.}} {{roll=[[1d10]]}}'>DEX</button>
         			<input name='attr_total_dex' title='@{total_dex}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_dex' title='@{dex}' class='sheet-statbox' type='text' value='[[((floor((@{total_dex}+@{dexstatsum}+@{totalev})@{wound_mod})+1)+abs((floor((@{total_dex}+@{dexstatsum}+@{totalev})@{wound_mod}))-1))/2]]' disabled='true'>
-        			<input type="checkbox" checked='true' name='attr_dex_unlock' class="sheet-dex-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_dex_unlock' class="sheet-dex-unlock"><span></span>
         			    <div class='dexstat-container'>
                     <label class='sheet-totalev-title' data-i18n="ev-penalty-u">EV PENALTY</label>
                     <input type='number' name='attr_totalev' class='sheet-totalev' value='[[0@{headev}@{torsoev}@{legev}-@{held_toggle}]]' disabled='true'>
                 			<fieldset class="repeating_dexstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_dexstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_dexstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_dexstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_dexstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_dexstatsum" value='0'>
@@ -59,11 +59,11 @@
         			<button type='roll' data-i18n="body-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=BODY SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{body}.}} {{roll=[[1d10]]}}'>BODY</button>
         			<input name='attr_total_body' title='@{total_body}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_body' title='@{body}' class='sheet-statbox' type='text' value='[[((floor((@{total_body}+@{bodystatsum})@{death_mod})+1)+abs((floor((@{total_body}+@{bodystatsum})@{death_mod}))-1))/2]]' disabled='true'>
-        	        <input type="checkbox" checked='true' name='attr_body_unlock' class="sheet-body-unlock"><span></span>
+        	        <input type="checkbox" checked name='attr_body_unlock' class="sheet-body-unlock"><span></span>
         			    <div class='bodystat-container'>
                 			<fieldset class="repeating_bodystat">
                     			<input type="text" class='repeating_statmod_name' name="attr_bodystatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_bodystattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_bodystattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_bodystatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_bodystatsum" value='0'>
@@ -73,11 +73,11 @@
         	        <button type='roll' data-i18n="spd-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=SPD SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{spd}.}} {{roll=[[1d10]]}}'>SPD</button>
         	        <input name='attr_total_spd' title='@{total_spd}' class='sheet-statbox' type='number' value='1'>
         	        <input name='attr_spd' title='@{spd}' class='sheet-statbox' type='text' value='[[((floor((@{total_spd}+@{spdstatsum})@{death_mod})+1)+abs((floor((@{total_spd}+@{spdstatsum})@{death_mod}))-1))/2]]' disabled='true'>
-                	<input type="checkbox" checked='true' name='attr_spd_unlock' class="sheet-spd-unlock"><span></span>
+                	<input type="checkbox" checked name='attr_spd_unlock' class="sheet-spd-unlock"><span></span>
         			    <div class='spdstat-container'>
                 			<fieldset class="repeating_spdstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_spdstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_spdstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_spdstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_spdstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_spdstatsum" value='0'>
@@ -87,11 +87,11 @@
                 	<button type='roll' data-i18n="emp-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=EMP SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{emp}.}} {{roll=[[1d10]]}}'>EMP</button>
                 	<input name='attr_total_emp' title='@{total_emp}' class='sheet-statbox' type='number' value='1'>
                 	<input name='attr_emp' title='@{emp}' class='sheet-statbox' type='text' value='[[((floor((@{total_emp}+@{empstatsum})@{death_mod})+1)+abs((floor((@{total_emp}+@{empstatsum})@{death_mod}))-1))/2]]' disabled='true'>
-                	<input type="checkbox" checked='true' name='attr_emp_unlock' class="sheet-emp-unlock"><span></span>
+                	<input type="checkbox" checked name='attr_emp_unlock' class="sheet-emp-unlock"><span></span>
         			    <div class='empstat-container'>
                 			<fieldset class="repeating_empstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_empstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_empstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_empstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_empstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_empstatsum" value='0'>
@@ -101,11 +101,11 @@
                 	<button type='roll' data-i18n="cra-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=CRA SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{cra}.}} {{roll=[[1d10]]}}'>CRA</button>
                 	<input name='attr_total_cra' title='@{total_cra}' class='sheet-statbox' type='number' value='1'>
                 	<input name='attr_cra' title='@{cra}' class='sheet-statbox' type='text' value='[[((floor((@{total_cra}+@{crastatsum})@{death_mod})+1)+abs((floor((@{total_cra}+@{crastatsum})@{death_mod}))-1))/2]]' disabled='true'>
-        			<input type="checkbox" checked='true' name='attr_cra_unlock' class="sheet-cra-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_cra_unlock' class="sheet-cra-unlock"><span></span>
         			    <div class='crastat-container'>
                 			<fieldset class="repeating_crastat">
                     			<input type="text" class='repeating_statmod_name' name="attr_crastatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_crastattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_crastattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_crastatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_crastatsum" value='0'>
@@ -115,11 +115,11 @@
         			<button type='roll' data-i18n="will-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=WILL SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{will}.}} {{roll=[[1d10]]}}'>WILL</button>
         			<input name='attr_total_will' title='@{total_will}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_will' title='@{will}' class='sheet-statbox' type='text' value='[[((floor((@{total_will}+@{willstatsum})@{wound_mod})+1)+abs((floor((@{total_will}+@{willstatsum})@{wound_mod}))-1))/2]]' disabled='true'>
-        			<input type="checkbox" checked='true' name='attr_will_unlock' class="sheet-will-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_will_unlock' class="sheet-will-unlock"><span></span>
         			    <div class='willstat-container'>
                 			<fieldset class="repeating_willstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_willstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_willstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_willstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_willstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_willstatsum" value='0'>
@@ -154,11 +154,11 @@
         		<div class='sheet-grid-item' style='margin: 10px 0px 0px 15px;'>
                     <label class='sheet-stattitle3' data-i18n="stun-u" >STUN</label>
                     <input name='attr_stun' title='@{stun}' class='sheet-statbox3' type='text' value='floor((@{body}+@{will})/2)+@{stunstatsum}' disabled='true'>
-        			<input type="checkbox" checked='true' name='attr_stun_unlock' class="sheet-stun-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_stun_unlock' class="sheet-stun-unlock"><span></span>
         			    <div class='stunstat-container'>
                 			<fieldset class="repeating_stunstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_stunstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_stunstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_stunstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_stunstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_stunstatsum" value='0'>
@@ -168,11 +168,11 @@
                     <label class='sheet-stattitle3' data-i18n="run-u" >RUN</label>
                     <input name='attr_run' title='@{run}' class='sheet-statbox3' type='text' value='floor(@{runsum})+@{runstatsum}' disabled='true'>
                     <input name='attr_runsum' type='hidden' value='[[floor(@{spd}*3)]]'>
-                    <input type="checkbox" checked='true' name='attr_run_unlock' class="sheet-run-unlock"><span></span>
+                    <input type="checkbox" checked name='attr_run_unlock' class="sheet-run-unlock"><span></span>
         			    <div class='runstat-container'>
                 			<fieldset class="repeating_runstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_runstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_runstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_runstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_runstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_runstatsum" value='0'>
@@ -181,11 +181,11 @@
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         			<label class='sheet-stattitle3' data-i18n="leap-u" >LEAP</label>
         			<input name='attr_leap' title='@{leap}' class='sheet-statbox3' type='text' value='floor(@{runsum}/5)+@{leapstatsum}' disabled='true'>
-                    <input type="checkbox" checked='true' name='attr_leap_unlock' class="sheet-leap-unlock"><span></span>
+                    <input type="checkbox" checked name='attr_leap_unlock' class="sheet-leap-unlock"><span></span>
         			    <div class='leapstat-container'>
                 			<fieldset class="repeating_leapstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_leapstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_leapstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_leapstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_leapstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_leapstatsum" value='0'>
@@ -194,11 +194,11 @@
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         			<label class='sheet-stattitle3' data-i18n="enc-u" >ENC</label>
         			<input name='attr_enc' title='@{enc}' class='sheet-statbox3' type='text' value='floor(@{body}*10)+@{encstatsum}' disabled='true'>
-                    <input type="checkbox" checked='true' name='attr_enc_unlock' class="sheet-enc-unlock"><span></span>
+                    <input type="checkbox" checked name='attr_enc_unlock' class="sheet-enc-unlock"><span></span>
         			    <div class='encstat-container'>
                 			<fieldset class="repeating_encstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_encstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_encstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_encstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_encstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_encstatsum" value='0'>
@@ -207,11 +207,11 @@
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         			<label class='sheet-stattitle3' data-i18n="rec-u" >REC</label>
         			<input name='attr_rec' title='@{rec}' class='sheet-statbox3' type='text' value='floor((@{body}+@{will})/2)+@{recstatsum}' disabled='true'>
-                    <input type="checkbox" checked='true' name='attr_rec_unlock' class="sheet-rec-unlock"><span></span>
+                    <input type="checkbox" checked name='attr_rec_unlock' class="sheet-rec-unlock"><span></span>
         			    <div class='recstat-container'>
                 			<fieldset class="repeating_recstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_recstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_recstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_recstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_recstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_recstatsum" value='0'>
@@ -221,11 +221,11 @@
         			<label class='sheet-stattitle3' data-i18n="hp-u" >HP</label>
         			<input name='attr_hp_max' title='@{hp_max}' class='sheet-smallbox2' type='text' value='floor(@{hpsta})+@{hpstatsum}' disabled='true'>
         			<input name='attr_hp' title='@{hp}' class='sheet-smallbox2' type='number' value='0'>
-        			<input type="checkbox" checked='true' name='attr_hp_unlock' class="sheet-hp-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_hp_unlock' class="sheet-hp-unlock"><span></span>
         			    <div class='hpstat-container'>
                 			<fieldset class="repeating_hpstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_hpstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_hpstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_hpstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_hpstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_hpstatsum" value='0'>
@@ -235,11 +235,11 @@
         			<label class='sheet-stattitle3' data-i18n="sta-u" >STA</label>
         			<input name='attr_sta_max' title='@{sta_max}' class='sheet-smallbox2' type='text' value='floor(@{hpsta})+@{stastatsum}' disabled='true'>
         			<input name='attr_sta' title='@{sta}' class='sheet-smallbox2' type='number' value='0'>
-        			<input type="checkbox" checked='true' name='attr_sta_unlock' class="sheet-sta-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_sta_unlock' class="sheet-sta-unlock"><span></span>
         			    <div class='stastat-container'>
                 			<fieldset class="repeating_stastat">
                     			<input type="text" class='repeating_statmod_name' name="attr_stastatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_stastattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_stastattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_stastatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_stastatsum" value='0'>
@@ -249,11 +249,11 @@
         			<label class='sheet-stattitle3' data-i18n="resolv-u" >RESOLVE</label>
         			<input name='attr_resolve_max' title='@{resolve_max}' class='sheet-statbox2' type='text' value='floor(@{resolve_mod}+@{resolvestatsum})' disabled='true'>
         			<input name='attr_resolve' title='@{resolve}' class='sheet-statbox2' type='number' value='0'>
-        			<input type="checkbox" checked='true' name='attr_resolve_unlock' class="sheet-resolve-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_resolve_unlock' class="sheet-resolve-unlock"><span></span>
         			    <div class='resolvestat-container'>
                 			<fieldset class="repeating_resolvestat">
                     			<input type="text" class='repeating_statmod_name' name="attr_resolvestatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_resolvestattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_resolvestattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_resolvestatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_resolvestatsum" value='0'>
@@ -263,11 +263,11 @@
         			<label class='sheet-stattitle3' data-i18n="focus-u" >FOCUS</label>
         			<input name='attr_focus_max' title='@{focus_max}' class='sheet-statbox2' type='text' value='floor(@{focus_mod}+@{focusstatsum})' disabled='true'>
         			<input name='attr_focus' title='@{focus}' class='sheet-statbox2' type='number' value='0'>
-        			<input type="checkbox" checked='true' name='attr_focus_unlock' class="sheet-focus-unlock"><span></span>
+        			<input type="checkbox" checked name='attr_focus_unlock' class="sheet-focus-unlock"><span></span>
         			    <div class='focusstat-container'>
                 			<fieldset class="repeating_focusstat">
                     			<input type="text" class='repeating_statmod_name' name="attr_focusstatname" placeholder='Modifier type...'> |
-                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_focusstattoggle' value='1' checked='true'><span></span>|
+                    			<input type="checkbox" class="repeating_mod_checkbox" name='attr_focusstattoggle' value='1' checked><span></span>|
                     			<input type="number" class='repeating_mod' name="attr_focusstatmod" value='0'>
                     			<!-- Sheetworker Destination Below Must Remain Hidden -->
                     			<input type="hidden" name="attr_focusstatsum" value='0'>
@@ -303,12 +303,12 @@
         						    <button type='roll' data-i18n="awarenes-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{awareness_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>AWARENESS</button>
         						    <input name='attr_awareness' title='@{awareness}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_awareness_total' title='@{awareness_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{awareness}+@{awarenesssum})+0)+abs(round(@{awareness}+@{awarenesssum})-0))/2]]'>
-        						    <input type="checkbox" checked='true' name='attr_awareness_unlock' class="sheet-awareness-unlock"><span></span>
+        						    <input type="checkbox" checked name='attr_awareness_unlock' class="sheet-awareness-unlock"><span></span>
         							   <div class='awareness-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_awareness">
             						            <input type="text" class='repeating_mod_name' name="attr_awarenessname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_awarenesstoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_awarenesstoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_awarenessmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_awarenesssum" value='0'>
@@ -318,12 +318,12 @@
         							<button type='roll' data-i18n="busines-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{business_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BUSINESS</button>
         							<input name='attr_business' title='@{business}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_business_total' title='@{business_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{business}+@{businesssum})+0)+abs(round(@{business}+@{businesssum})-0))/2]]'>
-        						    <input type="checkbox" checked='true' name='attr_business_unlock' class="sheet-business-unlock"><span></span>
+        						    <input type="checkbox" checked name='attr_business_unlock' class="sheet-business-unlock"><span></span>
         							    <div class='business-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_business">
             						            <input type="text" class='repeating_mod_name' name="attr_businessname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_businesstoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_businesstoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_businessmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_businesssum" value='0'>
@@ -333,12 +333,12 @@
         							<button type='roll' data-i18n="deductio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{deduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DEDUCTION</button>
         							<input name='attr_deduction' title='@{deduction}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_deduction_total' title='@{deduction_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{deduction}+@{deductionsum})+0)+abs(round(@{deduction}+@{deductionsum})-0))/2]]'>
-        						    <input type="checkbox" checked='true' name='attr_deduction_unlock' class="sheet-deduction-unlock"><span></span>
+        						    <input type="checkbox" checked name='attr_deduction_unlock' class="sheet-deduction-unlock"><span></span>
         						        <div class='deduction-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_deduction">
             						            <input type="text" class='repeating_mod_name' name="attr_deductionname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_deductiontoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_deductiontoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_deductionmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_deductionsum" value='0'>
@@ -348,12 +348,12 @@
         							<button type='roll' data-i18n="educatio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{education_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>EDUCATION</button>
         							<input name='attr_education' title='@{education}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_education_total' title='@{education_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{education}+@{educationsum})+0)+abs(round(@{education}+@{educationsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_education_unlock' class="sheet-education-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_education_unlock' class="sheet-education-unlock"><span></span>
         						        <div class='education-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_education">
             						            <input type="text" class='repeating_mod_name' name="attr_educationname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_educationtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_educationtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_educationmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_educationsum" value='0'>
@@ -363,12 +363,12 @@
         							<button type='roll' data-i18n="nordling-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{nordling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>NORDLING*</button>
         							<input name='attr_nordling' title='@{nordling}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_nordling_total' title='@{nordling_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{nordling}+@{nordlingsum})+0)+abs(round(@{nordling}+@{nordlingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_nordling_unlock' class="sheet-nordling-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_nordling_unlock' class="sheet-nordling-unlock"><span></span>
         						        <div class='nordling-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_nordling">
             						            <input type="text" class='repeating_mod_name' name="attr_nordlingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_nordlingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_nordlingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_nordlingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_nordlingsum" value='0'>
@@ -378,12 +378,12 @@
         							<button type='roll' data-i18n="elder-speech-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{elder_speech_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ELDER SPEECH*</button>
         						    <input name='attr_elder_speech' title='@{elder_speech}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_elder_speech_total' title='@{elder_speech_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{elder_speech}+@{elderspeechsum})+0)+abs(round(@{elder_speech}+@{elderspeechsum})-0))/2]]'>
-        						    <input type="checkbox" checked='true' name='attr_elder_speech_unlock' class="sheet-elder_speech-unlock"><span></span>
+        						    <input type="checkbox" checked name='attr_elder_speech_unlock' class="sheet-elder_speech-unlock"><span></span>
         							   <div class='elder_speech-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_elderspeech">
             						            <input type="text" class='repeating_mod_name' name="attr_elderspeechname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_elderspeechtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_elderspeechtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_elderspeechmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_elderspeechsum" value='0'>
@@ -393,12 +393,12 @@
         							<button type='roll' data-i18n="dwarven-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{dwarven_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DWARVEN*</button>
         							<input name='attr_dwarven' title='@{dwarven}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_dwarven_total' title='@{dwarven_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{dwarven}+@{dwarvensum})+0)+abs(round(@{dwarven}+@{dwarvensum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_dwarven_unlock' class="sheet-dwarven-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_dwarven_unlock' class="sheet-dwarven-unlock"><span></span>
         						        <div class='dwarven-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_dwarven">
             						            <input type="text" class='repeating_mod_name' name="attr_dwarvenname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_dwarventoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_dwarventoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_dwarvenmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_dwarvensum" value='0'>
@@ -408,12 +408,12 @@
         							<button type='roll' data-i18n="monster-lore-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{monster_lore_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>MONSTER LORE*</button>
         							<input name='attr_monster_lore' title='@{monster_lore}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_monster_lore_total' title='@{monster_lore_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{monster_lore}+@{monsterloresum})+0)+abs(round(@{monster_lore}+@{monsterloresum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_monster_lore_unlock' class="sheet-monster_lore-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_monster_lore_unlock' class="sheet-monster_lore-unlock"><span></span>
         						        <div class='monster_lore-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_monsterlore">
             						            <input type="text" class='repeating_mod_name' name="attr_monsterlorename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_monsterloretoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_monsterloretoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_monsterloremod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_monsterloresum" value='0'>
@@ -423,12 +423,12 @@
         							<button type='roll' data-i18n="social-etiquett-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{social_etiquette_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SOCIAL ETIQUETTE</button>
         							<input name='attr_social_etiquette' title='@{social_etiquette}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_social_etiquette_total' title='@{social_etiquette_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{social_etiquette}+@{socialetiquettesum})+0)+abs(round(@{social_etiquette}+@{socialetiquettesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_social_etiquette_unlock' class="sheet-social_etiquette-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_social_etiquette_unlock' class="sheet-social_etiquette-unlock"><span></span>
         						        <div class='social_etiquette-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_socialetiquette">
             						            <input type="text" class='repeating_mod_name' name="attr_socialetiquettename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_socialetiquettetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_socialetiquettetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_socialetiquettemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_socialetiquettesum" value='0'>
@@ -438,12 +438,12 @@
         							<button type='roll' data-i18n="streetwis-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{streetwise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STREETWISE</button>
         							<input name='attr_streetwise' title='@{streetwise}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_streetwise_total' title='@{streetwise_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{streetwise}+@{streetwisesum})+0)+abs(round(@{streetwise}+@{streetwisesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_streetwise_unlock' class="sheet-streetwise-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_streetwise_unlock' class="sheet-streetwise-unlock"><span></span>
         						        <div class='streetwise-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_streetwise">
             						            <input type="text" class='repeating_mod_name' name="attr_streetwisename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_streetwisetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_streetwisetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_streetwisemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_streetwisesum" value='0'>
@@ -453,12 +453,12 @@
         							<button type='roll' data-i18n="tactics-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{tactics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TACTICS*</button>
         							<input name='attr_tactics' title='@{tactics}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_tactics_total' title='@{tactics_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{tactics}+@{tacticssum})+0)+abs(round(@{tactics}+@{tacticssum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_tactics_unlock' class="sheet-tactics-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_tactics_unlock' class="sheet-tactics-unlock"><span></span>
         						        <div class='tactics-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_tactics">
             						            <input type="text" class='repeating_mod_name' name="attr_tacticsname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_tacticstoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_tacticstoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_tacticsmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_tacticssum" value='0'>
@@ -468,12 +468,12 @@
         							<button type='roll' data-i18n="teachin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{teaching_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TEACHING*</button>
         							<input name='attr_teaching' title='@{teaching}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_teaching_total' title='@{teaching_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{teaching}+@{teachingsum})+0)+abs(round(@{teaching}+@{teachingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_teaching_unlock' class="sheet-teaching-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_teaching_unlock' class="sheet-teaching-unlock"><span></span>
         						        <div class='teaching-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_teaching">
             						            <input type="text" class='repeating_mod_name' name="attr_teachingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_teachingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_teachingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_teachingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_teachingsum" value='0'>
@@ -483,12 +483,12 @@
         							<button type='roll' data-i18n="wilderness-surviva-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{wilderness_survival_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>WILDERNESS SURVIVAL</button>
         							<input name='attr_wilderness_survival' title='@{wilderness_survival}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_wilderness_survival_total' title='@{wilderness_survival_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{wilderness_survival}+@{wildernesssurvivalsum})+0)+abs(round(@{wilderness_survival}+@{wildernesssurvivalsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_wilderness_survival_unlock' class="sheet-wilderness_survival-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_wilderness_survival_unlock' class="sheet-wilderness_survival-unlock"><span></span>
         						        <div class='wilderness_survival-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_wildernesssurvival">
             						            <input type="text" class='repeating_mod_name' name="attr_wildernesssurvivalname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_wildernesssurvivaltoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_wildernesssurvivaltoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_wildernesssurvivalmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_wildernesssurvivalsum" value='0'>
@@ -500,10 +500,10 @@
         						<label class='sheet-skilltitle-ref' data-i18n="reflexe-u" >REFLEXES</label><input type="checkbox" name='attr_ref_toggle' class="sheet-ref-toggle"><span></span>
         						<div class='sheet-ref-container'>
         						    <!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_brawling_dropdown' class="sheet-brawling-dropdown" label="BRAWLING" data-i18n-label="brawlin-u" />
+        							<input type="checkbox" checked name='attr_brawling_dropdown' class="sheet-brawling-dropdown" label="BRAWLING" data-i18n-label="brawlin-u" />
         							<input name='attr_brawling' title='@{brawling}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_brawling_total' title='@{brawling_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{brawling}+@{brawlingsum})+0)+abs(round(@{brawling}+@{brawlingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_brawling_unlock' class="sheet-brawling-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_brawling_unlock' class="sheet-brawling-unlock"><span></span>
             							<div class='brawling-container'>
             							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -520,7 +520,7 @@
         						    <div class='brawling-container'>
             							    <fieldset class="repeating_brawling">
             						            <input type="text" class='repeating_mod_name' name="attr_brawlingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_brawlingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_brawlingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_brawlingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_brawlingsum" value='0'>
@@ -530,12 +530,12 @@
         							<button type='roll' data-i18n="dodge-escap-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{dodge_escape_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DODGE/ESCAPE</button>
         							<input name='attr_dodge_escape' title='@{dodge_escape}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_dodge_escape_total' title='@{dodge_escape_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{dodge_escape}+@{dodgeescapesum})+0)+abs(round(@{dodge_escape}+@{dodgeescapesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_dodge_escape_unlock' class="sheet-dodge_escape-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_dodge_escape_unlock' class="sheet-dodge_escape-unlock"><span></span>
         						        <div class='dodge_escape-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_dodgeescape">
             						            <input type="text" class='repeating_mod_name' name="attr_dodgeescapename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_dodgeescapetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_dodgeescapetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_dodgeescapemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_dodgeescapesum" value='0'>
@@ -543,10 +543,10 @@
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         							<!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_melee_dropdown' class="sheet-melee-dropdown" label="MELEE" data-i18n-label="mele-u" />
+        							<input type="checkbox" checked name='attr_melee_dropdown' class="sheet-melee-dropdown" label="MELEE" data-i18n-label="mele-u" />
         							<input name='attr_melee' title='@{melee}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_melee_total' title='@{melee_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{melee}+@{meleesum})+0)+abs(round(@{melee}+@{meleesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_melee_unlock' class="sheet-melee-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_melee_unlock' class="sheet-melee-unlock"><span></span>
         							<div class='sheet-melee-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -562,7 +562,7 @@
         							<div class='melee-container'>
             							    <fieldset class="repeating_melee">
             						            <input type="text" class='repeating_mod_name' name="attr_meleename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_meleetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_meleetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_meleemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_meleesum" value='0'>
@@ -572,12 +572,12 @@
         							<button type='roll' data-i18n="ridin-u"  class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{riding_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RIDING</button>
         							<input name='attr_riding' title='@{riding}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_riding_total' title='@{riding_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{riding}+@{ridingsum})+0)+abs(round(@{riding}+@{ridingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_riding_unlock' class="sheet-riding-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_riding_unlock' class="sheet-riding-unlock"><span></span>
         						        <div class='riding-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_riding">
             						            <input type="text" class='repeating_mod_name' name="attr_ridingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_ridingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_ridingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_ridingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_ridingsum" value='0'>
@@ -587,12 +587,12 @@
         							<button type='roll' data-i18n="sailin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{sailing_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SAILING</button>
         							<input name='attr_sailing' title='@{sailing}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_sailing_total' title='@{sailing_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{sailing}+@{sailingsum})+0)+abs(round(@{sailing}+@{sailingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_sailing_unlock' class="sheet-sailing-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_sailing_unlock' class="sheet-sailing-unlock"><span></span>
         						        <div class='sailing-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_sailing">
             						            <input type="text" class='repeating_mod_name' name="attr_sailingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_sailingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_sailingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_sailingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_sailingsum" value='0'>
@@ -600,10 +600,10 @@
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         							<!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_small_blades_dropdown' class="sheet-small_blades-dropdown" label="SMALL BLADES" data-i18n-label="small-blade-u" />
+        							<input type="checkbox" checked name='attr_small_blades_dropdown' class="sheet-small_blades-dropdown" label="SMALL BLADES" data-i18n-label="small-blade-u" />
         							<input name='attr_small_blades' title='@{small_blades}' class='sheet-skillbox' type='number' value='0'>
         	                        <input name='attr_small_blades_total' title='@{small_blades_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{small_blades}+@{smallbladessum})+0)+abs(round(@{small_blades}+@{smallbladessum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_small_blades_unlock' class="sheet-small_blades-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_small_blades_unlock' class="sheet-small_blades-unlock"><span></span>
         							<div class='sheet-small_blades-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -619,7 +619,7 @@
         							<div class='small_blades-container'>
             							    <fieldset class="repeating_smallblades">
             						            <input type="text" class='repeating_mod_name' name="attr_smallbladesname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_smallbladestoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_smallbladestoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_smallbladesmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_smallbladessum" value='0'>
@@ -627,10 +627,10 @@
         							</div>
         							<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         							<!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_staff_spear_dropdown' class="sheet-staff_spear-dropdown" label="STAFF/SPEAR" data-i18n-label="staff-spea-u" />
+        							<input type="checkbox" checked name='attr_staff_spear_dropdown' class="sheet-staff_spear-dropdown" label="STAFF/SPEAR" data-i18n-label="staff-spea-u" />
         							<input name='attr_staff_spear' title='@{staff_spear}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_staff_spear_total' title='@{staff_spear_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{staff_spear}+@{staffspearsum})+0)+abs(round(@{staff_spear}+@{staffspearsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_staff_spear_unlock' class="sheet-staff_spear-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_staff_spear_unlock' class="sheet-staff_spear-unlock"><span></span>
         							<div class='sheet-staff_spear-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -645,7 +645,7 @@
         							<div class='staff_spear-container'>
             							    <fieldset class="repeating_staffspear">
             						            <input type="text" class='repeating_mod_name' name="attr_staffspearname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_staffspeartoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_staffspeartoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_staffspearmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_staffspearsum" value='0'>
@@ -653,10 +653,10 @@
         							</div>
         							<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         							<!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_swordsmanship_dropdown' class="sheet-swordsmanship-dropdown" label="SWORDSMANSHIP" data-i18n-label="swordsmanshi-u" />
+        							<input type="checkbox" checked name='attr_swordsmanship_dropdown' class="sheet-swordsmanship-dropdown" label="SWORDSMANSHIP" data-i18n-label="swordsmanshi-u" />
         							<input name='attr_swordsmanship' title='@{swordsmanship}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_swordsmanship_total' title='@{swordsmanship_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{swordsmanship}+@{swordsmanshipsum})+0)+abs(round(@{swordsmanship}+@{swordsmanshipsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_swordsmanship_unlock' class="sheet-swordsmanship-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_swordsmanship_unlock' class="sheet-swordsmanship-unlock"><span></span>
         							<div class='sheet-swordsmanship-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -672,7 +672,7 @@
         						    <div class='swordsmanship-container'>
             							    <fieldset class="repeating_swordsmanship">
             						            <input type="text" class='repeating_mod_name' name="attr_swordsmanshipname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_swordsmanshiptoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_swordsmanshiptoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_swordsmanshipmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_swordsmanshipsum" value='0'>
@@ -685,10 +685,10 @@
         						<label class='sheet-skilltitle-dex' data-i18n="dexterit-u" >DEXTERITY</label><input type="checkbox" name='attr_dex_toggle' class="sheet-dex-toggle"><span></span>
         						<div class='sheet-dex-container'>
         						   	<!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_archery_dropdown' class="sheet-archery-dropdown" label="ARCHERY" data-i18n-label="archer-u" />
+        							<input type="checkbox" checked name='attr_archery_dropdown' class="sheet-archery-dropdown" label="ARCHERY" data-i18n-label="archer-u" />
         							<input name='attr_archery' title='@{archery}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_archery_total' title='@{archery_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{archery}+@{archerysum})+0)+abs(round(@{archery}+@{archerysum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_archery_unlock' class="sheet-archery-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_archery_unlock' class="sheet-archery-unlock"><span></span>
         							<div class='sheet-archery-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -699,7 +699,7 @@
         						    <div class='archery-container'>
             							    <fieldset class="repeating_archery">
             						            <input type="text" class='repeating_mod_name' name="attr_archeryname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_archerytoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_archerytoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_archerymod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_archerysum" value='0'>
@@ -707,10 +707,10 @@
         						    </div>
         						    <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         						    <!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_athletics_dropdown' class="sheet-athletics-dropdown" label="ATHLETICS" data-i18n-label="athletic-u" />
+        							<input type="checkbox" checked name='attr_athletics_dropdown' class="sheet-athletics-dropdown" label="ATHLETICS" data-i18n-label="athletic-u" />
         							<input name='attr_athletics' title='@{athletics}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_athletics_total' title='@{athletics_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{athletics}+@{athleticssum})+0)+abs(round(@{athletics}+@{athleticssum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_athletics_unlock' class="sheet-athletics-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_athletics_unlock' class="sheet-athletics-unlock"><span></span>
         							<div class='sheet-athletics-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							</div>
@@ -723,7 +723,7 @@
             						<div class='athletics-container'>
             							    <fieldset class="repeating_athletics">
             						            <input type="text" class='repeating_mod_name' name="attr_athleticsname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_athleticstoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_athleticstoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_athleticsmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_athleticssum" value='0'>
@@ -733,12 +733,12 @@
         						    <button type='roll' data-i18n="crossbo-u"  class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CROSSBOW}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CROSSBOW</button>
         							<input name='attr_crossbow' title='@{crossbow}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_crossbow_total' title='@{crossbow_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{crossbow}+@{crossbowsum})+0)+abs(round(@{crossbow}+@{crossbowsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_crossbow_unlock' class="sheet-crossbow-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_crossbow_unlock' class="sheet-crossbow-unlock"><span></span>
         						        <div class='crossbow-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_crossbow">
             						            <input type="text" class='repeating_mod_name' name="attr_crossbowname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_crossbowtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_crossbowtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_crossbowmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_crossbowsum" value='0'>
@@ -748,12 +748,12 @@
         							<button type='roll' data-i18n="sleight-of-han-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{sleight_of_hand_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SLEIGHT OF HAND</button>
         							<input name='attr_sleight_of_hand' title='@{sleight_of_hand}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_sleight_of_hand_total' title='@{sleight_of_hand_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{sleight_of_hand}+@{sleightofhandsum})+0)+abs(round(@{sleight_of_hand}+@{sleightofhandsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_sleight_of_hand_unlock' class="sheet-sleight_of_hand-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_sleight_of_hand_unlock' class="sheet-sleight_of_hand-unlock"><span></span>
         						        <div class='sleight_of_hand-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_sleightofhand">
             						            <input type="text" class='repeating_mod_name' name="attr_sleightofhandname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_sleightofhandtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_sleightofhandtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_sleightofhandmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_sleightofhandsum" value='0'>
@@ -763,12 +763,12 @@
         							<button type='roll' data-i18n="stealt-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{stealth_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>STEALTH</button>
         							<input name='attr_stealth' title='@{stealth}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_stealth_total' title='@{stealth_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{stealth}+@{stealthsum})+0)+abs(round(@{stealth}+@{stealthsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_stealth_unlock' class="sheet-stealth-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_stealth_unlock' class="sheet-stealth-unlock"><span></span>
         						        <div class='stealth-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_stealth">
             						            <input type="text" class='repeating_mod_name' name="attr_stealthname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_stealthtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_stealthtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_stealthmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_stealthsum" value='0'>
@@ -787,12 +787,12 @@
         							<button type='roll' data-i18n="physiqu-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{physique_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PHYSIQUE</button>
         							<input name='attr_physique' title='@{physique}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_physique_total' title='@{physique_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{physique}+@{physiquesum})+0)+abs(round(@{physique}+@{physiquesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_physique_unlock' class="sheet-physique-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_physique_unlock' class="sheet-physique-unlock"><span></span>
         						        <div class='physique-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_physique">
             						            <input type="text" class='repeating_mod_name' name="attr_physiquename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_physiquetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_physiquetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_physiquemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_physiquesum" value='0'>
@@ -802,12 +802,12 @@
         							<button type='roll' data-i18n="enduranc-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{endurance_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ENDURANCE</button>
         							<input name='attr_endurance' title='@{endurance}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_endurance_total' title='@{endurance_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{endurance}+@{endurancesum})+0)+abs(round(@{endurance}+@{endurancesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_endurance_unlock' class="sheet-endurance-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_endurance_unlock' class="sheet-endurance-unlock"><span></span>
         						        <div class='endurance-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_endurance">
             						            <input type="text" class='repeating_mod_name' name="attr_endurancename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_endurancetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_endurancetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_endurancemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_endurancesum" value='0'>
@@ -822,12 +822,12 @@
         						    <button type='roll' data-i18n="charism-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{charisma_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CHARISMA</button>
         							<input name='attr_charisma' title='@{charisma}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_charisma_total' title='@{charisma_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{charisma}+@{charismasum})+0)+abs(round(@{charisma}+@{charismasum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_charisma_unlock' class="sheet-charisma-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_charisma_unlock' class="sheet-charisma-unlock"><span></span>
         						        <div class='charisma-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_charisma">
             						            <input type="text" class='repeating_mod_name' name="attr_charismaname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_charismatoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_charismatoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_charismamod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_charismasum" value='0'>
@@ -837,12 +837,12 @@
         							<button type='roll' data-i18n="decei-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{deceit_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DECEIT</button>
         							<input name='attr_deceit' title='@{deceit}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_deceit_total' title='@{deceit_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{deceit}+@{deceitsum})+0)+abs(round(@{deceit}+@{deceitsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_deceit_unlock' class="sheet-deceit-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_deceit_unlock' class="sheet-deceit-unlock"><span></span>
         						        <div class='deceit-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_deceit">
             						            <input type="text" class='repeating_mod_name' name="attr_deceitname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_deceittoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_deceittoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_deceitmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_deceitsum" value='0'>
@@ -852,12 +852,12 @@
         							<button type='roll' data-i18n="gamblin-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{gambling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>GAMBLING</button>
         							<input name='attr_gambling' title='@{gambling}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_gambling_total' title='@{gambling_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{gambling}+@{gamblingsum})+0)+abs(round(@{gambling}+@{gamblingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_gambling_unlock' class="sheet-gambling-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_gambling_unlock' class="sheet-gambling-unlock"><span></span>
         						        <div class='gambling-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_gambling">
             						            <input type="text" class='repeating_mod_name' name="attr_gamblingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_gamblingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_gamblingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_gamblingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_gamblingsum" value='0'>
@@ -867,12 +867,12 @@
         							<button type='roll' data-i18n="grooming-style-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{grooming_and_style_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>GROOMING & STYLE</button>
         							<input name='attr_grooming_and_style' title='@{grooming_and_style}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_grooming_and_style_total' title='@{grooming_and_style_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{grooming_and_style}+@{groomingandstylesum})+0)+abs(round(@{grooming_and_style}+@{groomingandstylesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_grooming_and_style_unlock' class="sheet-grooming_and_style-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_grooming_and_style_unlock' class="sheet-grooming_and_style-unlock"><span></span>
         						        <div class='grooming_and_style-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_groomingandstyle">
             						            <input type="text" class='repeating_mod_name' name="attr_groomingandstylename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_groomingandstyletoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_groomingandstyletoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_groomingandstylemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_groomingandstylesum" value='0'>
@@ -882,12 +882,12 @@
         							<button type='roll' data-i18n="human-perceptio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{human_perception_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>HUMAN PERCEPTION</button>
         							<input name='attr_human_perception' title='@{human_perception}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_human_perception_total' title='@{human_perception_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{human_perception}+@{humanperceptionsum})+0)+abs(round(@{human_perception}+@{humanperceptionsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_human_perception_unlock' class="sheet-human_perception-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_human_perception_unlock' class="sheet-human_perception-unlock"><span></span>
         						        <div class='human_perception-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_humanperception">
             						            <input type="text" class='repeating_mod_name' name="attr_humanperceptionname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_humanperceptiontoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_humanperceptiontoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_humanperceptionmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_humanperceptionsum" value='0'>
@@ -897,12 +897,12 @@
         							<button type='roll' data-i18n="leadershi-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{leadership_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>LEADERSHIP</button>
         							<input name='attr_leadership' title='@{leadership}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_leadership_total' title='@{leadership_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{leadership}+@{leadershipsum})+0)+abs(round(@{leadership}+@{leadershipsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_leadership_unlock' class="sheet-leadership-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_leadership_unlock' class="sheet-leadership-unlock"><span></span>
         						        <div class='leadership-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_leadership">
             						            <input type="text" class='repeating_mod_name' name="attr_leadershipname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_leadershiptoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_leadershiptoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_leadershipmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_leadershipsum" value='0'>
@@ -912,12 +912,12 @@
         							<button type='roll' data-i18n="persuasio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{persuasion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERSUASION</button>
         						    <input name='attr_persuasion' title='@{persuasion}' class='sheet-skillbox' type='number' value='0'>
         						    <input name='attr_persuasion_total' title='@{persuasion_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{persuasion}+@{persuasionsum})+0)+abs(round(@{persuasion}+@{persuasionsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_persuasion_unlock' class="sheet-persuasion-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_persuasion_unlock' class="sheet-persuasion-unlock"><span></span>
         						        <div class='persuasion-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_persuasion">
             						            <input type="text" class='repeating_mod_name' name="attr_persuasionname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_persuasiontoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_persuasiontoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_persuasionmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_persuasionsum" value='0'>
@@ -927,12 +927,12 @@
         							<button type='roll' data-i18n="seductio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{seduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SEDUCTION</button>
         							<input name='attr_seduction' title='@{seduction}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_seduction_total' title='@{seduction_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{seduction}+@{seductionsum})+0)+abs(round(@{seduction}+@{seductionsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_seduction_unlock' class="sheet-seduction-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_seduction_unlock' class="sheet-seduction-unlock"><span></span>
         						        <div class='seduction-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_seduction">
             						            <input type="text" class='repeating_mod_name' name="attr_seductionname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_seductiontoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_seductiontoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_seductionmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_seductionsum" value='0'>
@@ -943,7 +943,7 @@
         							<button type='roll' data-i18n="fine-art-u" class='sheet-skill-roller-emp' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FINE ARTS:</button>
         							<input name='attr_fa_name' type='text' class='sheet-extraskill' placeholder='Type...'>
         							<input name='attr_fine_arts' title='@{fine_arts}' class='sheet-skillbox' type='number' value='0'>
-        							<input type="checkbox" checked='true' name='attr_finearts_unlock' class="sheet-finearts-plus"><span></span>
+        							<input type="checkbox" checked name='attr_finearts_unlock' class="sheet-finearts-plus"><span></span>
         							    <div class='finearts-container'>
         							        <fieldset class="repeating_finearts">
             						            <button type='roll' data-i18n="fine-art-u" class='repeating_skill_roller_emp' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FINE ARTS:</button>
@@ -956,7 +956,7 @@
             					    <button type='roll' data-i18n="performanc-u" class='sheet-skill-roller-emp' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERFORMANCE:</button>
         							<input name='attr_p_name' type='text' class='sheet-extraskill' placeholder='Type...'>
         							<input name='attr_performance' title='@{performance}' class='sheet-skillbox' type='number' value='0'>
-        							<input type="checkbox" checked='true' name='attr_performance_plus' class="sheet-performance-plus"><span></span>
+        							<input type="checkbox" checked name='attr_performance_plus' class="sheet-performance-plus"><span></span>
             					        <div class='performance-container'>
             							   <fieldset class="repeating_performance">
             						            <button type='roll' data-i18n="performanc-u" class='repeating_skill_roller_emp' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PERFORMANCE:</button>
@@ -974,12 +974,12 @@
         						    <button type='roll' data-i18n="alchemy-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{alchemy_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>ALCHEMY*</button>
         							<input name='attr_alchemy' title='@{alchemy}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_alchemy_total' title='@{alchemy_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{alchemy}+@{alchemysum})+0)+abs(round(@{alchemy}+@{alchemysum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_alchemy_unlock' class="sheet-alchemy-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_alchemy_unlock' class="sheet-alchemy-unlock"><span></span>
         						        <div class='alchemy-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_alchemy">
             						            <input type="text" class='repeating_mod_name' name="attr_alchemyname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_alchemytoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_alchemytoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_alchemymod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_alchemysum" value='0'>
@@ -989,12 +989,12 @@
         							<button type='roll' data-i18n="crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>CRAFTING*</button>
         							<input name='attr_crafting' title='@{crafting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_crafting_total' title='@{crafting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{crafting}+@{craftingsum})+0)+abs(round(@{crafting}+@{craftingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_crafting_unlock' class="sheet-crafting-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_crafting_unlock' class="sheet-crafting-unlock"><span></span>
         						        <div class='crafting-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_crafting">
             						            <input type="text" class='repeating_mod_name' name="attr_craftingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_craftingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_craftingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_craftingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_craftingsum" value='0'>
@@ -1004,12 +1004,12 @@
         							<button type='roll' data-i18n="disguis-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{disguise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>DISGUISE</button>
         							<input name='attr_disguise' title='@{disguise}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_disguise_total' title='@{disguise_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{disguise}+@{disguisesum})+0)+abs(round(@{disguise}+@{disguisesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_disguise_unlock' class="sheet-disguise-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_disguise_unlock' class="sheet-disguise-unlock"><span></span>
         						        <div class='disguise-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_disguise">
             						            <input type="text" class='repeating_mod_name' name="attr_disguisename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_disguisetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_disguisetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_disguisemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_disguisesum" value='0'>
@@ -1019,12 +1019,12 @@
         							<button type='roll' data-i18n="first-ai-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{first_aid_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FIRST AID</button>
         							<input name='attr_first_aid' title='@{first_aid}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_first_aid_total' title='@{first_aid_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{first_aid}+@{firstaidsum})+0)+abs(round(@{first_aid}+@{firstaidsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_first_aid_unlock' class="sheet-first_aid-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_first_aid_unlock' class="sheet-first_aid-unlock"><span></span>
         						        <div class='first_aid-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_firstaid">
             						            <input type="text" class='repeating_mod_name' name="attr_firstaidname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_firstaidtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_firstaidtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_firstaidmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_firstaidsum" value='0'>
@@ -1034,12 +1034,12 @@
         							<button type='roll' data-i18n="forger-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{forgery_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>FORGERY</button>
         							<input name='attr_forgery' title='@{forgery}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_forgery_total' title='@{forgery_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{forgery}+@{forgerysum})+0)+abs(round(@{forgery}+@{forgerysum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_forgery_unlock' class="sheet-forgery-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_forgery_unlock' class="sheet-forgery-unlock"><span></span>
         						        <div class='forgery-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_forgery">
             						            <input type="text" class='repeating_mod_name' name="attr_forgeryname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_forgerytoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_forgerytoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_forgerymod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_forgerysum" value='0'>
@@ -1049,12 +1049,12 @@
         							<button type='roll' data-i18n="pick-loc-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{pick_lock_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>PICK LOCK</button>
         							<input name='attr_pick_lock' title='@{pick_lock}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_pick_lock_total' title='@{pick_lock_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{pick_lock}+@{picklocksum})+0)+abs(round(@{pick_lock}+@{picklocksum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_pick_lock_unlock' class="sheet-pick_lock-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_pick_lock_unlock' class="sheet-pick_lock-unlock"><span></span>
         						        <div class='pick_lock-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_picklock">
             						            <input type="text" class='repeating_mod_name' name="attr_picklockname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_picklocktoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_picklocktoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_picklockmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_picklocksum" value='0'>
@@ -1064,12 +1064,12 @@
         							<button type='roll' data-i18n="trap-crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{trap_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>TRAP CRAFTING*</button>
         							<input name='attr_trap_crafting' title='@{trap_crafting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_trap_crafting_total' title='@{trap_crafting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{trap_crafting}+@{trapcraftingsum})+0)+abs(round(@{trap_crafting}+@{trapcraftingsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_trap_crafting_unlock' class="sheet-trap_crafting-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_trap_crafting_unlock' class="sheet-trap_crafting-unlock"><span></span>
         						        <div class='trap_crafting-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_trapcrafting">
             						            <input type="text" class='repeating_mod_name' name="attr_trapcraftingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_trapcraftingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_trapcraftingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_trapcraftingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_trapcraftingsum" value='0'>
@@ -1084,12 +1084,12 @@
         						    <button type='roll' data-i18n="courag-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{courage_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>COURAGE</button>
         							<input name='attr_courage' title='@{courage}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_courage_total' title='@{courage_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{courage}+@{couragesum})+0)+abs(round(@{courage}+@{couragesum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_courage_unlock' class="sheet-courage-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_courage_unlock' class="sheet-courage-unlock"><span></span>
         						        <div class='courage-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_courage">
             						            <input type="text" class='repeating_mod_name' name="attr_couragename" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_couragetoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_couragetoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_couragemod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_couragesum" value='0'>
@@ -1099,14 +1099,14 @@
         							<button type='roll' data-i18n="hex-weaving-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{hex_weaving_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>HEX WEAVING*</button>
         							<input name='attr_hex_weaving' title='@{hex_weaving}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_hex_weaving_total' title='@{hex_weaving_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{hex_weaving}+@{hexweavingsum}+@{totalev})+0)+abs(round(@{hex_weaving}+@{hexweavingsum}+@{totalev})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_hex_weaving_unlock' class="sheet-hex_weaving-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_hex_weaving_unlock' class="sheet-hex_weaving-unlock"><span></span>
         						        <div class='hex_weaving-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
                              <label class='sheet-totalev-title2' data-i18n="ev-penalty-u">EV PENALTY</label>
                              <input type='number' name='attr_totalev' class='sheet-totalev' value='[[0@{headev}@{torsoev}@{legev}-@{held_toggle}]]' disabled='true'>
             							    <fieldset class="repeating_hexweaving">
             						            <input type="text" class='repeating_mod_name' name="attr_hexweavingname" placeholder='Modifier/focus type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_hexweavingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_hexweavingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_hexweavingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_hexweavingsum" value='0'>
@@ -1116,12 +1116,12 @@
         							<button type='roll' data-i18n="intimidatio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{intimidation_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>INTIMIDATION</button>
         							<input name='attr_intimidation' title='@{intimidation}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_intimidation_total' title='@{intimidation_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{intimidation}+@{intimidationsum})+0)+abs(round(@{intimidation}+@{intimidationsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_intimidation_unlock' class="sheet-intimidation-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_intimidation_unlock' class="sheet-intimidation-unlock"><span></span>
         						        <div class='intimidation-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_intimidation">
             						            <input type="text" class='repeating_mod_name' name="attr_intimidationname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_intimidationtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_intimidationtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_intimidationmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_intimidationsum" value='0'>
@@ -1129,10 +1129,10 @@
         							   </div><br>
         							   <hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
         							<!-- THE CHECKBOX BELOW WILL NOT SHOW THE SKILL NAME IN PREVIEW MODE. THIS IS INTENDED & NOT A BUG! -->
-        							<input type="checkbox" checked='true' name='attr_spell_casting_dropdown' class="sheet-spell_casting-dropdown" label="SPELL CASTING*" data-i18n-label="spell-casting-u" />
+        							<input type="checkbox" checked name='attr_spell_casting_dropdown' class="sheet-spell_casting-dropdown" label="SPELL CASTING*" data-i18n-label="spell-casting-u" />
         							<input name='attr_spell_casting' title='@{spell_casting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_spell_casting_total' title='@{spell_casting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{spell_casting}+@{spellcastingsum}+@{totalev})+0)+abs(round(@{spell_casting}+@{spellcastingsum}+@{totalev})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_spell_casting_unlock' class="sheet-spell_casting-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_spell_casting_unlock' class="sheet-spell_casting-unlock"><span></span>
         							<div class='sheet-spell_casting-container'>
         							    <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
                           <label class='sheet-totalev-title2' data-i18n="ev-penalty-u">EV PENALTY</label>
@@ -1145,7 +1145,7 @@
         							<div class='spell_casting-container'>
             							    <fieldset class="repeating_spellcasting">
             						            <input type="text" class='repeating_mod_name' name="attr_spellcastingname" placeholder='Modifier/focus type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_spellcastingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_spellcastingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_spellcastingmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_spellcastingsum" value='0'>
@@ -1155,12 +1155,12 @@
             					    <button type='roll' data-i18n="resist-magic-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_magic_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RESIST MAGIC*</button>
         							<input name='attr_resist_magic' title='@{resist_magic}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_resist_magic_total' title='@{resist_magic_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{resist_magic}+@{resistmagicsum})+0)+abs(round(@{resist_magic}+@{resistmagicsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_resist_magic_unlock' class="sheet-resist_magic-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_resist_magic_unlock' class="sheet-resist_magic-unlock"><span></span>
         						        <div class='resist_magic-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_resistmagic">
             						            <input type="text" class='repeating_mod_name' name="attr_resistmagicname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_resistmagictoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_resistmagictoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_resistmagicmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_resistmagicsum" value='0'>
@@ -1170,12 +1170,12 @@
         							<button type='roll' data-i18n="resist-coercio-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_coercion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RESIST COERCION</button>
         							<input name='attr_resist_coercion' title='@{resist_coercion}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_resist_coercion_total' title='@{resist_coercion_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{resist_coercion}+@{resistcoercionsum})+0)+abs(round(@{resist_coercion}+@{resistcoercionsum})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_resist_coercion_unlock' class="sheet-resist_coercion-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_resist_coercion_unlock' class="sheet-resist_coercion-unlock"><span></span>
         						        <div class='resist_coercion-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
             							    <fieldset class="repeating_resistcoercion">
             						            <input type="text" class='repeating_mod_name' name="attr_resistcoercionname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_resistcoerciontoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_resistcoerciontoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attr_resistcoercionmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_resistcoercionsum" value='0'>
@@ -1185,14 +1185,14 @@
         							<button type='roll' data-i18n="ritual-crafting-u" class='sheet-skill-roller' value= '@{whisper}&{template:statistics2} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{ritual_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>RITUAL CRAFTING*</button>
         							<input name='attr_ritual_crafting' title='@{ritual_crafting}' class='sheet-skillbox' type='number' value='0'>
         							<input name='attr_ritual_crafting_total' title='@{ritual_crafting_total}' class='sheet-skillbox' type='text' disabled='true' value='[[((round(@{ritual_crafting}+@{ritualcraftingsum}+@{totalev})+0)+abs(round(@{ritual_crafting}+@{ritualcraftingsum}+@{totalev})-0))/2]]'>
-        							<input type="checkbox" checked='true' name='attr_ritual_crafting_unlock' class="sheet-ritual_crafting-unlock"><span></span>
+        							<input type="checkbox" checked name='attr_ritual_crafting_unlock' class="sheet-ritual_crafting-unlock"><span></span>
         						        <div class='ritual_crafting-container'>
         							       <label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
                              <label class='sheet-totalev-title2' data-i18n="ev-penalty-u">EV PENALTY</label>
                              <input type='number' name='attr_totalev' class='sheet-totalev' value='[[0@{headev}@{torsoev}@{legev}-@{held_toggle}]]' disabled='true'>
             							    <fieldset class="repeating_ritualcrafting">
             						            <input type="text" class='repeating_mod_name' name="attr_ritualcraftingname" placeholder='Modifier type...'> |
-            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_ritualcraftingtoggle' value='1' checked='true'><span></span>|
+            						            <input type="checkbox" class="repeating_mod_checkbox" name='attr_ritualcraftingtoggle' value='1' checked><span></span>|
             						            <input type="number" class='repeating_mod' name="attrritualcraftingnmod" value='0'>
             						            <!-- Sheetworker Destination Below Must Remain Hidden -->
             						            <input type="hidden" name="attr_ritualcraftingsum" value='0'>
@@ -1457,11 +1457,12 @@
         					<span class='sheet-primary-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_primary_weapon_name" value='Weapon Name Goes Here...'/></span>
         					<label class='sheet-weapon-reliability' data-i18n="reliabilit-u" >RELIABILITY</label><input name='attr_primary_weapon_reliability' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:weapon} {{name=@{character_name}}} {{weapon-name=@{primary_weapon_name}}} {{reliability=@{primary_weapon_reliability}}} {{accuracy=@{primary_wa}}} {{range=@{primary_weapon_range}}} {{damage=[[@{primary_weapon_damage}@{primary_weapon_bonus}]]}} {{type1=@{primary_weapon_hold}}} {{type2=@{primary_weapon_type}}} {{effect=@{primary_weapon_effect}}} {{enhancement=@{primary_weapon_enhancement}}}'><strong style='font-size: 11px;'>1st</strong></button>
-        					<input type="checkbox" checked='true' name='attr_primary_toggle' class="sheet-primary-weapon-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_primary_toggle' class="sheet-primary-weapon-toggle"><span></span><br />
         					<div class='sheet-primary-weapon-padding-container'>
         						<label class='sheet-weapon-accuracy' data-i18n="w-accuracy-u" >W. ACCURACY</label><input name='attr_primary_wa' class='sheet-weapon-accuracy-element' type='number' value='0'>
         						<label class='sheet-weapon-range' data-i18n="range-u" >RANGE</label><input name='attr_primary_weapon_range' class='sheet-weapon-range-element' type='text' value='0'>
-        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label><select name='attr_primary_weapon_bonus' class='sheet-weapon-bonus-element' type='number' value='0'>
+        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label>
+								<select name='attr_primary_weapon_bonus' class='sheet-weapon-bonus-element'>
         						    <option value='@{bonus_mod}' data-i18n="yes-u" >YES</option>
         						    <option value='+0' data-i18n="no-u">NO</option>
         						</select>
@@ -1484,11 +1485,12 @@
         					<span class='sheet-secondary-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_secondary_weapon_name" value='Weapon Name Goes Here...'/></span>
         					<label class='sheet-weapon-reliability' data-i18n="reliabilit-u" >RELIABILITY</label><input name='attr_secondary_weapon_reliability' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:weapon} {{name=@{character_name}}} {{weapon-name=@{secondary_weapon_name}}} {{reliability=@{secondary_weapon_reliability}}} {{accuracy=@{secondary_wa}}} {{range=@{secondary_weapon_range}}} {{damage=[[@{secondary_weapon_damage}@{secondary_weapon_bonus}]]}} {{type1=@{secondary_weapon_hold}}} {{type2=@{secondary_weapon_type}}} {{effect=@{secondary_weapon_effect}}} {{enhancement=@{secondary_weapon_enhancement}}}'><strong style='font-size: 11px;'>2nd</strong></button>
-        					<input type="checkbox" checked='true' name='attr_secondary_toggle' class="sheet-secondary-weapon-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_secondary_toggle' class="sheet-secondary-weapon-toggle"><span></span><br />
         					<div class='sheet-secondary-weapon-padding-container'>
         						<label class='sheet-weapon-accuracy' data-i18n="w-accuracy-u" >W. ACCURACY</label><input name='attr_secondary_wa' class='sheet-weapon-accuracy-element' type='number' value='0'>
         						<label class='sheet-weapon-range' data-i18n="range-u" >RANGE</label><input name='attr_secondary_weapon_range' class='sheet-weapon-range-element' type='text' value='0'>
-        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label><select name='attr_secondary_weapon_bonus' class='sheet-weapon-bonus-element' type='number' value='0'>
+        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label>
+								<select name='attr_secondary_weapon_bonus' class='sheet-weapon-bonus-element'>
         						    <option value='@{bonus_mod}' data-i18n="yes-u" >YES</option>
         						    <option value='+0' data-i18n="no-u">NO</option>
         						</select>
@@ -1511,11 +1513,12 @@
         					<span class='sheet-third-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_third_weapon_name" value='Weapon Name Goes Here...'/></span>
         					<label class='sheet-weapon-reliability' data-i18n="reliabilit-u" >RELIABILITY</label><input name='attr_third_weapon_reliability' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:weapon} {{name=@{character_name}}} {{weapon-name=@{third_weapon_name}}} {{reliability=@{third_weapon_reliability}}} {{accuracy=@{third_wa}}} {{range=@{third_weapon_range}}} {{damage=[[@{third_weapon_damage}@{third_weapon_bonus}]]}} {{type1=@{third_weapon_hold}}} {{type2=@{third_weapon_type}}} {{effect=@{third_weapon_effect}}} {{enhancement=@{third_weapon_enhancement}}}'><strong style='font-size: 11px;'>3rd</strong></button>
-        					<input type="checkbox" checked='true' name='attr_third_toggle' class="sheet-third-weapon-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_third_toggle' class="sheet-third-weapon-toggle"><span></span><br />
         					<div class='sheet-third-weapon-padding-container'>
         						<label class='sheet-weapon-accuracy' data-i18n="w-accuracy-u" >W. ACCURACY</label><input name='attr_third_wa' class='sheet-weapon-accuracy-element' type='number' value='0'>
         						<label class='sheet-weapon-range' data-i18n="range-u" >RANGE</label><input name='attr_third_weapon_range' class='sheet-weapon-range-element' type='text' value='0'>
-        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label><select name='attr_third_weapon_bonus' class='sheet-weapon-bonus-element' type='number' value='0'>
+        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label>
+								<select name='attr_third_weapon_bonus' class='sheet-weapon-bonus-element'>
         						    <option value='@{bonus_mod}' data-i18n="yes-u" >YES</option>
         						    <option value='+0' data-i18n="no-u">NO</option>
         						</select>
@@ -1538,11 +1541,12 @@
         					<span class='sheet-fourth-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_fourth_weapon_name" value='Weapon Name Goes Here...'/></span>
         					<label class='sheet-weapon-reliability' data-i18n="reliabilit-u" >RELIABILITY</label><input name='attr_fourth_weapon_reliability' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:weapon} {{name=@{character_name}}} {{weapon-name=@{fourth_weapon_name}}} {{reliability=@{fourth_weapon_reliability}}} {{accuracy=@{fourth_wa}}} {{range=@{fourth_weapon_range}}} {{damage=[[@{fourth_weapon_damage}@{fourth_weapon_bonus}]]}} {{type1=@{fourth_weapon_hold}}} {{type2=@{fourth_weapon_type}}} {{effect=@{fourth_weapon_effect}}} {{enhancement=@{fourth_weapon_enhancement}}}'><strong style='font-size: 11px;'>4th</strong></button>
-        					<input type="checkbox" checked='true' name='attr_fourth_toggle' class="sheet-fourth-weapon-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_fourth_toggle' class="sheet-fourth-weapon-toggle"><span></span><br />
         					<div class='sheet-fourth-weapon-padding-container'>
         						<label class='sheet-weapon-accuracy' data-i18n="w-accuracy-u" >W. ACCURACY</label><input name='attr_fourth_wa' class='sheet-weapon-accuracy-element' type='number' value='0'>
         						<label class='sheet-weapon-range' data-i18n="range-u" >RANGE</label><input name='attr_fourth_weapon_range' class='sheet-weapon-range-element' type='text' value='0'>
-        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label><select name='attr_fourth_weapon_bonus' class='sheet-weapon-bonus-element' type='number' value='0'>
+        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label>
+								<select name='attr_fourth_weapon_bonus' class='sheet-weapon-bonus-element'>
         						    <option value='@{bonus_mod}' data-i18n="yes-u" >YES</option>
         						    <option value='+0' data-i18n="no-u">NO</option>
         						</select>
@@ -1565,11 +1569,12 @@
         					<span class='sheet-fifth-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_fifth_weapon_name" value='Weapon Name Goes Here...'/></span>
         					<label class='sheet-weapon-reliability' data-i18n="reliabilit-u" >RELIABILITY</label><input name='attr_fifth_weapon_reliability' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:weapon} {{name=@{character_name}}} {{weapon-name=@{fifth_weapon_name}}} {{reliability=@{fifth_weapon_reliability}}} {{accuracy=@{fifth_wa}}} {{range=@{fifth_weapon_range}}} {{damage=[[@{fifth_weapon_damage}@{fifth_weapon_bonus}]]}} {{type1=@{fifth_weapon_hold}}} {{type2=@{fifth_weapon_type}}} {{effect=@{fifth_weapon_effect}}} {{enhancement=@{fifth_weapon_enhancement}}}'><strong style='font-size: 11px;'>5th</strong></button>
-        					<input type="checkbox" checked='true' name='attr_fifth_toggle' class="sheet-fifth-weapon-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_fifth_toggle' class="sheet-fifth-weapon-toggle"><span></span><br />
         					<div class='sheet-fifth-weapon-padding-container'>
         						<label class='sheet-weapon-accuracy' data-i18n="w-accuracy-u" >W. ACCURACY</label><input name='attr_fifth_wa' class='sheet-weapon-accuracy-element' type='number' value='0'>
         						<label class='sheet-weapon-range' data-i18n="range-u" >RANGE</label><input name='attr_fifth_weapon_range' class='sheet-weapon-range-element' type='text' value='0'>
-        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label><select name='attr_fifth_weapon_bonus' class='sheet-weapon-bonus-element' type='number' value='0'>
+        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label>
+								<select name='attr_fifth_weapon_bonus' class='sheet-weapon-bonus-element'>
         						    <option value='@{bonus_mod}' data-i18n="yes-u" >YES</option>
         						    <option value='+0' data-i18n="no-u">NO</option>
         						</select>
@@ -1592,11 +1597,12 @@
         					<span class='sheet-sixth-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_sixth_weapon_name" value='Weapon Name Goes Here...'/></span>
         					<label class='sheet-weapon-reliability' data-i18n="reliabilit-u" >RELIABILITY</label><input name='attr_sixth_weapon_reliability' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:weapon} {{name=@{character_name}}} {{weapon-name=@{sixth_weapon_name}}} {{reliability=@{sixth_weapon_reliability}}} {{accuracy=@{sixth_wa}}} {{range=@{sixth_weapon_range}}} {{damage=[[@{sixth_weapon_damage}@{sixth_weapon_bonus}]]}} {{type1=@{sixth_weapon_hold}}} {{type2=@{sixth_weapon_type}}} {{effect=@{sixth_weapon_effect}}} {{enhancement=@{sixth_weapon_enhancement}}}'><strong style='font-size: 11px;'>6th</strong></button>
-        					<input type="checkbox" checked='true' name='attr_sixth_toggle' class="sheet-sixth-weapon-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_sixth_toggle' class="sheet-sixth-weapon-toggle"><span></span><br />
         					<div class='sheet-sixth-weapon-padding-container'>
         						<label class='sheet-weapon-accuracy' data-i18n="w-accuracy-u" >W. ACCURACY</label><input name='attr_sixth_wa' class='sheet-weapon-accuracy-element' type='number' value='0'>
         						<label class='sheet-weapon-range' data-i18n="range-u" >RANGE</label><input name='attr_sixth_weapon_range' class='sheet-weapon-range-element' type='text' value='0'>
-        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label><select name='attr_sixth_weapon_bonus' class='sheet-weapon-bonus-element' type='number' value='0'>
+        						<label class='sheet-weapon-bonus' data-i18n="bonus-dmg-u" >BONUS DMG?</label>
+								<select name='attr_sixth_weapon_bonus' class='sheet-weapon-bonus-element'>
         						    <option value='@{bonus_mod}' data-i18n="yes-u" >YES</option>
         						    <option value='+0' data-i18n="no-u">NO</option>
         						</select>
@@ -1620,22 +1626,22 @@
         					<label class='sheet-weapon-rel' data-i18n="held-u" >HELD?</label><input type="checkbox" name='attr_held_toggle' class="sheet-whisper-checkbox" value='@{shieldev}'><span></span>
         					<label class='sheet-weapon-rel' data-i18n="rel-u" >REL.</label><input name='attr_shieldcur' class='sheet-weapon-reliability-element' type='number' value='0'>
         					<button style='margin-left: 10px; margin-right: 20px;' type='roll' class='sheet-weapon-damage-roll' value='@{whisper}&{template:shield} {{name=@{character_name}}} {{shield-name=@{shield_name}}} {{reliability=@{shieldcur}}} {{damage=[[@{punch}@{p_mod}@{shield_size}]]}} {{effect=@{shield_effect}}} {{enhancement=@{shield_enhancement}}}'><span style="font-family: 'Pictos Custom'; font-size: 16px;">e</span></button>
-        					<input type="checkbox" checked='true' name='attr_shield_toggle' class="sheet-shield-toggle"><span></span><br />
+        					<input type="checkbox" checked name='attr_shield_toggle' class="sheet-shield-toggle"><span></span><br />
         					<div class='sheet-shield-padding-container'>
         						<label class='sheet-encumbrance-value' data-i18n="encumbrance-value-u" >ENCUMBRANCE VALUE</label>
-                    <select type='number' name='attr_shieldev' class='sheet-encumbrance-value'>
-                        <option value='0'>0</option>
-                        <option value='1'>1</option>
-                        <option value='2'>2</option>
-                        <option value='3'>3</option>
-                        <option value='4'>4</option>
-                        <option value='5'>5</option>
-                        <option value='6'>6</option>
-                        <option value='7'>7</option>
-                        <option value='8'>8</option>
-                        <option value='9'>9</option>
-                        <option value='10'>10</option>
-                    </select>
+								<select name='attr_shieldev' class='sheet-encumbrance-value'>
+									<option value='0'>0</option>
+									<option value='1'>1</option>
+									<option value='2'>2</option>
+									<option value='3'>3</option>
+									<option value='4'>4</option>
+									<option value='5'>5</option>
+									<option value='6'>6</option>
+									<option value='7'>7</option>
+									<option value='8'>8</option>
+									<option value='9'>9</option>
+									<option value='10'>10</option>
+								</select>
         						<label class='sheet-shieldsize' data-i18n="shield-size-u" >SHIELD SIZE</label><select name='attr_shield_size' class='sheet-shield-size'>
         						    <option value='+0' data-i18n="small-u" >SMALL</option>
         						    <option value='+2' data-i18n="medium-u">MEDIUM</option>
@@ -1661,7 +1667,7 @@
                                     <input type='number' name='attr_toxcur' class='sheet-toxic-amount' value='0'><label class='sheet-toxicpercent'>%</label>
                                     <input type='hidden' value='' name="attr_toxbar" class="sheet-hidden sheet-toxbar" readonly>
                                     <span class="sheet-toxbar"> </span>
-                                    <input type="checkbox" checked='true' name='attr_toxic_unlock' class="sheet-toxic-unlock"><span></span>
+                                    <input type="checkbox" checked name='attr_toxic_unlock' class="sheet-toxic-unlock"><span></span>
         						        <div class='toxic-container'>
         						            <label class='sheet-maxtoxic' data-i18n="max-toxicity-u">SET MAXIMUM TOXICITY:</label><input type='number' name='attr_toxmax' class='sheet-toxic-amount' value='100'><label class='sheet-toxicpercent'>%</label>
         						        </div>
@@ -1897,11 +1903,11 @@
             					<label class='sheet-spell-title' data-i18n="novice-diagrams-and-formulae-u" >NOVICE - DIAGRAMS & FORMULAE</label>
             					<fieldset class="repeating_crafting2" name='attr_crafting2' style='padding: 5px;'>
             					<span class='repeating_crafting_gradient'><input class='repeating_craft_name' type="text" name="attr_recipename" value='Diagram or Formula Name Here...'/></span>
-            					<input type="checkbox" checked='true' class="repeating_craft_toggle"><span></span><br />
+            					<input type="checkbox" checked class="repeating_craft_toggle"><span></span><br />
                 					<div class='repeating_craft_padding_container'>
                 						<div>
                 							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
-                							<select class='repeating_craft_type' type="text" name="attr_crafttype">
+                							<select class='repeating_craft_type' name="attr_crafttype">
                 								<option value="1" data-i18n="diagram-u" >DIAGRAM</option>
                 								<option value="2" data-i18n="formula-u" >FORMULA</option>
                 						  </select>
@@ -1918,26 +1924,26 @@
                                                 <input class="repeating_crafthide repeating_formula" type="checkbox" name="attr_crafttype" value="2" >
                                             <!--HIDDEN CHECKBOX END-->
                     						<div class="repeating_blueprint_diagram">
-                                                <textarea class='repeating_components' type='text' name='attr_craftcomponents' data-i18n="component-list-u">List any diagram components and materials here...</textarea>
+                                                <textarea class='repeating_components' name='attr_craftcomponents' data-i18n="component-list-u">List any diagram components and materials here...</textarea>
                     						</div>
                     						<div class="repeating_blueprint_formula" style='margin-left: -3px;'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vitriol.png">
+                                                <img class='repeating_craft_image' alt="vitriol" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vitriol.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_vitriolshade' name='attr_vitriolamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/rebis.png">
+                                                <img class='repeating_craft_image' alt="rebis" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/rebis.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_rebisshade' name='attr_rebisamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/aether.png">
+                                                <img class='repeating_craft_image' alt="aether" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/aether.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_aethershade' name='attr_aetheramount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/quebrith.png">
+                                                <img class='repeating_craft_image' alt="quebrith" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/quebrith.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_quebrithshade' name='attr_quebrithamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/hydragenum.png">
+                                                <img class='repeating_craft_image' alt="hydragenum" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/hydragenum.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_hydragenumshade' name='attr_hydragenumamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vermilion.png">
+                                                <img class='repeating_craft_image' alt="vermillion" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vermilion.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_vermilionshade' name='attr_vermilionamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/sol.png">
+                                                <img class='repeating_craft_image' alt="sol" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/sol.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_solshade' name='attr_solamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/caelum.png">
+                                                <img class='repeating_craft_image' alt="caelum" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/caelum.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_caelumshade' name='attr_caelumamount' value='0'>
-                                                <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/fulgur.png">
+                                                <img class='repeating_craft_image' alt="fulgur" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/fulgur.png">
                                                 <input type='number' class='repeating_alchemy_amount repeating_fulgurshade' name='attr_fulguramount' value='0'>
                     						</div>
                 						<textarea class='repeating_craft_description' name='attr_recipe_notes' data-i18n="craft-notes-u">Additional crafting and alchemy details go here...</textarea>
@@ -1948,11 +1954,11 @@
             					<label class='sheet-spell-title' data-i18n="journeyman-diagrams-and-formulae-u" >JOURNEYMAN - DIAGRAMS & FORMULAE</label>
             					<fieldset class="repeating_crafting3" name='attr_crafting3' style='padding: 5px;'>
             					<span class='repeating_crafting_gradient'><input class='repeating_craft_name' type="text" name="attr_recipename" value='Diagram or Formula Name Here...'/></span>
-            					<input type="checkbox" checked='true' class="repeating_craft_toggle"><span></span><br />
+            					<input type="checkbox" checked class="repeating_craft_toggle"><span></span><br />
                 					<div class='repeating_craft_padding_container'>
                 						<div>
                 							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
-                							<select class='repeating_craft_type' type="text" name="attr_crafttype">
+                							<select class='repeating_craft_type' name="attr_crafttype">
                 								<option value="1" data-i18n="diagram-u" >DIAGRAM</option>
                 								<option value="2" data-i18n="formula-u" >FORMULA</option>
                 						  </select>
@@ -1969,7 +1975,7 @@
                                                 <input class="repeating_crafthide repeating_formula" type="checkbox" name="attr_crafttype" value="2" >
                                             <!--HIDDEN CHECKBOX END-->
                     						<div class="repeating_blueprint_diagram">
-                                                <textarea class='repeating_components' type='text' name='attr_craftcomponents' data-i18n="component-list-u">List any diagram components and materials here...</textarea>
+                                                <textarea class='repeating_components' name='attr_craftcomponents' data-i18n="component-list-u">List any diagram components and materials here...</textarea>
                     						</div>
                     						<div class="repeating_blueprint_formula" style='margin-left: -3px;'>
                                                 <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vitriol.png">
@@ -1999,11 +2005,11 @@
             					<label class='sheet-spell-title' data-i18n="master-diagrams-and-formulae-u" >MASTER - DIAGRAMS & FORMULAE</label>
             					<fieldset class="repeating_crafting4" name='attr_crafting4' style='padding: 5px;'>
             					<span class='repeating_crafting_gradient'><input class='repeating_craft_name' type="text" name="attr_recipename" value='Diagram or Formula Name Here...'/></span>
-            					<input type="checkbox" checked='true' class="repeating_craft_toggle"><span></span><br />
+            					<input type="checkbox" checked class="repeating_craft_toggle"><span></span><br />
                 					<div class='repeating_craft_padding_container'>
                 						<div>
                 							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
-                							<select class='repeating_craft_type' type="text" name="attr_crafttype">
+                							<select class='repeating_craft_type' name="attr_crafttype">
                 								<option value="1" data-i18n="diagram-u" >DIAGRAM</option>
                 								<option value="2" data-i18n="formula-u" >FORMULA</option>
                 						  </select>
@@ -2020,7 +2026,7 @@
                                                 <input class="repeating_crafthide repeating_formula" type="checkbox" name="attr_crafttype" value="2" >
                                             <!--HIDDEN CHECKBOX END-->
                     						<div class="repeating_blueprint_diagram">
-                                                <textarea class='repeating_components' type='text' name='attr_craftcomponents' data-i18n="component-list-u">List any diagram components and materials here...</textarea>
+                                                <textarea class='repeating_components' name='attr_craftcomponents' data-i18n="component-list-u">List any diagram components and materials here...</textarea>
                     						</div>
                     						<div class="repeating_blueprint_formula" style='margin-left: -3px;'>
                                                 <img class='repeating_craft_image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vitriol.png">
@@ -2074,7 +2080,7 @@
         						<span><label class='sheet-substance-type' data-i18n="vitriol-u" >VITRIOL</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vitriol.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_vitriol_quantity" value='@{vitriol_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_vitriol_wt" value='@{vitriol_total}/10' disabled='true'></span>
-        						<input type="checkbox" checked='true' class="sheet-vitriol-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-vitriol-toggle"><span></span><br />
                 					<div class='sheet-vitriol-container'>
                 					    <fieldset class="repeating_vitriol" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_vitriolname" value='Substance Name...'> |
@@ -2087,7 +2093,7 @@
         						<label class='sheet-substance-type' data-i18n="rebis-u" >REBIS</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/rebis.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_rebis_quantity" value='@{rebis_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_rebis_wt" value='@{rebis_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-rebis-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-rebis-toggle"><span></span><br />
                 					<div class='sheet-rebis-container'>
                 					    <fieldset class="repeating_rebis" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_rebisname" value='Substance Name...'> |
@@ -2100,7 +2106,7 @@
         						<label class='sheet-substance-type' data-i18n="aether-u" >AETHER</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/aether.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_aether_quantity" value='@{aether_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_aether_wt" value='@{aether_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-aether-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-aether-toggle"><span></span><br />
                 					<div class='sheet-aether-container'>
                 					    <fieldset class="repeating_aether" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_aethername" value='Substance Name...'> |
@@ -2113,7 +2119,7 @@
         						<label class='sheet-substance-type' data-i18n="quebrith-u" >QUEBRITH</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/quebrith.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_quebrith_quantity" value='@{quebrith_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_quebrith_wt" value='@{quebrith_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-quebrith-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-quebrith-toggle"><span></span><br />
                 					<div class='sheet-quebrith-container'>
                 					    <fieldset class="repeating_quebrith" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_quebrithname" value='Substance Name...'> |
@@ -2126,7 +2132,7 @@
         						<label class='sheet-substance-type' data-i18n="hydragenum-u" >HYDRAGENUM</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/hydragenum.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_hydragenum_quantity" value='@{hydragenum_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_hydragenum_wt" value='@{hydragenum_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-hydragenum-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-hydragenum-toggle"><span></span><br />
                 					<div class='sheet-hydragenum-container'>
                 					    <fieldset class="repeating_hydragenum" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_hydragenumname" value='Substance Name...'> |
@@ -2139,7 +2145,7 @@
         						<label class='sheet-substance-type' data-i18n="vermilion-u" >VERMILION</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/vermilion.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_vermilion_quantity" value='@{vermilion_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_vermilion_wt" value='@{vermilion_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-vermilion-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-vermilion-toggle"><span></span><br />
                 					<div class='sheet-vermilion-container'>
                 					    <fieldset class="repeating_vermilion" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_vermilionname" value='Substance Name...'> |
@@ -2152,7 +2158,7 @@
         						<label class='sheet-substance-type' data-i18n="sol-u" >SOL</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/sol.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_sol_quantity" value='@{sol_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_sol_wt" value='@{sol_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-sol-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-sol-toggle"><span></span><br />
                 					<div class='sheet-sol-container'>
                 					    <fieldset class="repeating_sol" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_solname" value='Substance Name...'> |
@@ -2165,7 +2171,7 @@
         						<label class='sheet-substance-type' data-i18n="caelum-u" >CAELUM</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/caelum.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_caelum_quantity" value='@{caelum_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_caelum_wt" value='@{caelum_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-caelum-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-caelum-toggle"><span></span><br />
                 					<div class='sheet-caelum-container'>
                 					    <fieldset class="repeating_caelum" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_caelumname" value='Substance Name...'> |
@@ -2178,7 +2184,7 @@
         						<label class='sheet-substance-type' data-i18n="fulgur-u" >FULGUR</label><img class='sheet-alchemical-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/fulgur.png">
         						<input type="text" class='sheet-substance-quantity' name="attr_substance_fulgur_quantity" value='@{fulgur_quantity}' disabled='true'> |
         						<input type="text" class='sheet-substance-weight' name="attr_fulgur_wt" value='@{fulgur_total}/10' disabled='true'>
-        						<input type="checkbox" checked='true' class="sheet-fulgur-toggle"><span></span><br />
+        						<input type="checkbox" checked class="sheet-fulgur-toggle"><span></span><br />
                 					<div class='sheet-fulgur-container'>
                 					    <fieldset class="repeating_fulgur" style='margin-bottom: 10px;'>
                     						<input type="text" class='repeating_sub_name' name="attr_fulgurname" value='Substance Name...'> |
@@ -2257,11 +2263,11 @@
         							<fieldset class="repeating_spells" name='attr_spells' style='padding: 5px;'>
         					<span class='repeating_spell_gradient'><input class='repeating_spell_name' type="text" name="attr_spell_name" value='Spell/Sign/Invocation Name Here...'/></span>
         					<button style='margin-left: -10px; margin-right: 20px;' type='roll' class='repeating_spell_damage_roll' value='@{whisper}&{template:spell} {{spell-name=@{spell_name}}} {{name=@{character_name}}} {{type=@{spell_type}}} {{cost=@{spell_sta}}} {{description=@{spell_description}}} {{duration=@{spell_duration}}} {{range=@{spell_range}}} {{damage=@{spell_damage}}} {{defense=@{spell_defense}}}'></button>
-        					<input type="checkbox" checked='true' class="repeating_spell_toggle"><span></span><br />
+        					<input type="checkbox" checked class="repeating_spell_toggle"><span></span><br />
         					<div class='repeating_spell_padding_container'>
         						<div>
         							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
-        							<select class='repeating_spell_type' type="text" name="attr_spell_type">
+        							<select class='repeating_spell_type' name="attr_spell_type">
         								<option value="Sign" data-i18n="sign-u" >SIGN</option>
         								<option value="Novice Spell" data-i18n="spell-u" >SPELL</option>
         								<option value="Novice Invocation" data-i18n="invocatio-u" >INVOCATION</option></select>
@@ -2293,11 +2299,11 @@
         							<fieldset class="repeating_spells2" name='attr_spells' style='padding: 5px;'>
         					<span class='repeating_spell_gradient'><input class='repeating_spell_name' type="text" name="attr_spell_name" value='Spell/Sign/Invocation Name Here...'/></span>
         					<button style='margin-left: -10px; margin-right: 20px;' type='roll' class='repeating_spell_damage_roll' value='@{whisper}&{template:spell} {{spell-name=@{spell_name}}} {{name=@{character_name}}} {{type=@{spell_type}}} {{cost=@{spell_sta}}} {{description=@{spell_description}}} {{duration=@{spell_duration}}} {{range=@{spell_range}}} {{damage=@{spell_damage}}} {{defense=@{spell_defense}}}'></button>
-        					<input type="checkbox" checked='true' class="repeating_spell_toggle"><span></span><br />
+        					<input type="checkbox" checked class="repeating_spell_toggle"><span></span><br />
         					<div class='repeating_spell_padding_container'>
         						<div>
         							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
-        							<select class='repeating_spell_type' type="text" name="attr_spell_type">
+        							<select class='repeating_spell_type' name="attr_spell_type">
         							    <option value="Alternate Sign" data-i18n="alt-sign-u" >ALT. SIGN</option>
         								<option value="Journeyman Spell" data-i18n="spell-u" >SPELL</option>
         								<option value="Journeyman Invocation" data-i18n="invocatio-u" >INVOCATION</option></select>
@@ -2329,13 +2335,14 @@
         							<fieldset class="repeating_spells3" name='attr_spells' style='padding: 5px;'>
         					<span class='repeating_spell_gradient'><input class='repeating_spell_name' type="text" name="attr_spell_name" value='Spell/Invocation Name Here...'/></span>
         					<button style='margin-left: -10px; margin-right: 20px;' type='roll' class='repeating_spell_damage_roll' value='@{whisper}&{template:spell} {{spell-name=@{spell_name}}} {{name=@{character_name}}} {{type=@{spell_type}}} {{cost=@{spell_sta}}} {{description=@{spell_description}}} {{duration=@{spell_duration}}} {{range=@{spell_range}}} {{damage=@{spell_damage}}} {{defense=@{spell_defense}}}'></button>
-        					<input type="checkbox" checked='true' class="repeating_spell_toggle"><span></span><br />
+        					<input type="checkbox" checked class="repeating_spell_toggle"><span></span><br />
         					<div class='repeating_spell_padding_container'>
         						<div>
         							<label class='repeating_spell_type_title' data-i18n="type-u" >TYPE</label>
-        							<select class='repeating_spell_type' type="text" name="attr_spell_type">
-        								<option value="Master Spell"> SPELL </option>
-        								<option value="Master/AP Invocation" data-i18n="invocatio-u" >INVOCATION</option></select>
+        							<select class='repeating_spell_type' name="attr_spell_type">
+        								<option value="Master Spell"> SPELL</option>
+        								<option value="Master/AP Invocation" data-i18n="invocatio-u" >INVOCATION</option>
+									</select>
         							<label class='repeating_spell_sta_title' data-i18n="sta-cos-u" >STA COST</label><input class='repeating_spell_sta' type='text' name='attr_spell_sta' value='0'><br />
         							<label class='repeating_spell_range_title' data-i18n="range-u" >RANGE</label><input class='repeating_spell_range' type='text' name='attr_spell_range'>
         							<label class='repeating_spell_damage_title' data-i18n="damage-u" >DAMAGE</label><select class='repeating_spell_damage' name='attr_spell_damage'>
@@ -2368,28 +2375,28 @@
         					</div>
         					<div class='sheet-vigor-focus-container'>
         						<label class='sheet-spellfocus-title' data-i18n="1st-focus-u" >1ST FOCUS</label><input name='attr_spellfocus1' class='sheet-spellfocus-element' type='text' value='Name Here...'>
-        						<input type="checkbox" checked='true' name='attr_focus1_toggle' class="sheet-focus1-toggle"><span></span>
+        						<input type="checkbox" checked name='attr_focus1_toggle' class="sheet-focus1-toggle"><span></span>
         					    <div class='sheet-focus1-container'>
         					        <label class='sheet-focus-title' data-i18n="focus-lvl-u" >FOCUS LVL</label><input name='attr_focus1_lvl' class='sheet-spellfocus-stat' type='text' value='0'>
         					        <label class='sheet-greaterfocus-title' data-i18n="greater-focus-u" >GREATER FOCUS?</label><input type='checkbox' class='sheet-whisper-checkbox' name='attr_greaterfocus1_toggle' value='2'><span></span>
         					        <textarea class='sheet-spellfocus-text' name='attr_focus1_description' data-i18n="focus-notes" >Any notes about this focus go here...</textarea>
         					    </div>
         					    <label class='sheet-spellfocus-title' data-i18n="2nd-focus-u" >2ND FOCUS</label><input name='attr_spellfocus2' class='sheet-spellfocus-element' type='text' value='Name Here...'>
-        						<input type="checkbox" checked='true' name='attr_focus2_toggle' class="sheet-focus2-toggle"><span></span>
+        						<input type="checkbox" checked name='attr_focus2_toggle' class="sheet-focus2-toggle"><span></span>
         					    <div class='sheet-focus2-container'>
         					        <label class='sheet-focus-title' data-i18n="focus-lvl-u" >FOCUS LVL</label><input name='attr_focus2_lvl' class='sheet-spellfocus-stat' type='text' value='0'>
         					        <label class='sheet-greaterfocus-title' data-i18n="greater-focus-u" >GREATER FOCUS?</label><input type='checkbox' class='sheet-whisper-checkbox' name='attr_greaterfocus2_toggle' value='2'><span></span>
         					        <textarea class='sheet-spellfocus-text' name='attr_focus2_description' data-i18n="focus-notes" >Any notes about this focus go here...</textarea>
         					    </div>
         					    <label class='sheet-spellfocus-title' data-i18n="3rd-focus-u" >3RD FOCUS</label><input name='attr_spellfocus3' class='sheet-spellfocus-element' type='text' value='Name Here...'>
-        						<input type="checkbox" checked='true' name='attr_focus3_toggle' class="sheet-focus3-toggle"><span></span>
+        						<input type="checkbox" checked name='attr_focus3_toggle' class="sheet-focus3-toggle"><span></span>
         					    <div class='sheet-focus3-container'>
         					        <label class='sheet-focus-title' data-i18n="focus-lvl-u" >FOCUS LVL</label><input name='attr_focus3_lvl' class='sheet-spellfocus-stat' type='text' value='0'>
         					        <label class='sheet-greaterfocus-title' data-i18n="greater-focus-u" >GREATER FOCUS?</label><input type='checkbox' class='sheet-whisper-checkbox' name='attr_greaterfocus3_toggle' value='2'><span></span>
         					        <textarea class='sheet-spellfocus-text' name='attr_focus3_description' data-i18n="focus-notes" >Any notes about this focus go here...</textarea>
         					    </div>
         					    <label class='sheet-spellfocus-title' data-i18n="4th-focus-u" >4TH FOCUS</label><input name='attr_spellfocus4' class='sheet-spellfocus-element' type='text' value='Name Here...'>
-        						<input type="checkbox" checked='true' name='attr_focus4_toggle' class="sheet-focus4-toggle"><span></span>
+        						<input type="checkbox" checked name='attr_focus4_toggle' class="sheet-focus4-toggle"><span></span>
         					    <div class='sheet-focus4-container'>
         					        <label class='sheet-focus-title' data-i18n="focus-lvl-u" >FOCUS LVL</label><input name='attr_focus4_lvl' class='sheet-spellfocus-stat' type='text' value='0'>
         					        <label class='sheet-greaterfocus-title' data-i18n="greater-focus-u" >GREATER FOCUS?</label><input type='checkbox' class='sheet-whisper-checkbox' name='attr_greaterfocus4_toggle' value='2'><span></span>
@@ -2401,14 +2408,14 @@
         							<fieldset class="repeating_rituals" name='attr_rituals' style='padding: 5px;'>
         					<span class='repeating_ritual_gradient'><input class='repeating_ritual_name' type="text" name="attr_ritual_name" value='Ritual Name Here...'/></span>
         					<button style='margin-left: -15px; margin-right: 20px;' type='roll' class='repeating_ritual_damage_roll' name= 'attr_roll_ritual_damage' value='@{whisper}&{template:ritual} {{ritual-name=@{ritual_name}}} {{name=@{character_name}}} {{prep=@{ritual_prep}}} {{cost=@{ritual_sta}}} {{description=@{ritual_description}}} {{DC=@{ritual_dc}}} {{duration=@{ritual_duration}}} {{comp=@{ritual_comp}}}'></button>
-        					<input type="checkbox" checked='true' class="repeating_ritual_toggle"><span></span><br />
+        					<input type="checkbox" checked class="repeating_ritual_toggle"><span></span><br />
         					<div class='repeating_ritual_padding_container'>
         						<label class='repeating_ritual_prep_title' data-i18n="prep-u" >PREP.</label><input class='repeating_ritual_prep' type='text' name='attr_ritual_prep'>
         						<label class='repeating_ritual_sta_title' data-i18n="sta-cos-u" >STA COST</label><input class='repeating_ritual_sta' type='text' name='attr_ritual_sta' value='0'>
         						<textarea class='repeating_ritual_description' name='attr_ritual_description' data-i18n="ritual-description-goes-here" >Ritual description goes here...</textarea><br />
         						<label class='repeating_ritual_dc_title'>DC</label><input class='repeating_ritual_dc' type='text' name='attr_ritual_dc' value='0'>
         						<label class='repeating_ritual_duration_title' data-i18n="duratio-u" >DURATION</label><input class='repeating_ritual_duration' type='text' name='attr_ritual_duration'>
-        						<textarea class='repeating_ritual_comp' type='text' name='attr_ritual_comp' data-i18n="ritual-components-go-here" >Ritual components go here...</textarea>
+        						<textarea class='repeating_ritual_comp' name='attr_ritual_comp' data-i18n="ritual-components-go-here" >Ritual components go here...</textarea>
         					</div>
         							</fieldset>
 
@@ -2416,16 +2423,16 @@
         							<fieldset class="repeating_hexes" name='attr_hexes' style='padding: 5px;'>
         					<span class='repeating_hex_gradient'><input class='repeating_hex_name' type="text" name="attr_hex_name" value='Hex Name Here...'/></span>
         					<button style='margin-left: -15px; margin-right: 20px;' type='roll' class='repeating_hex_damage_roll' name= 'attr_roll_hex_damage' value='@{whisper}&{template:hex} {{hex-name=@{hex_name}}} {{name=@{character_name}}} {{danger=@{hex_danger}}} {{cost=@{hex_sta}}} {{description=@{hex_description}}} {{lift=@{hex_lift}}}'></button>
-        					<input type="checkbox" checked='true' class="repeating_hex_toggle"><span></span><br />
+        					<input type="checkbox" checked class="repeating_hex_toggle"><span></span><br />
         					<div class='repeating_hex_padding_container'>
         						<label class='repeating_hex_danger_title' data-i18n="dange-u" >DANGER</label>
-        						<select class='repeating_hex_danger' type='text' name='attr_hex_danger'>
+        						<select class='repeating_hex_danger' name='attr_hex_danger'>
         							<option value="Low" data-i18n="low-u" >LOW</option>
         							<option value="Medium" data-i18n="medium-u" >MEDIUM</option>
         							<option value="High" data-i18n="high-u" >HIGH</option></select>
         						<label class='repeating_hex_sta_title' data-i18n="sta-cos-u" >STA COST</label><input class='repeating_hex_sta' type='text' name='attr_hex_sta' value='0'>
         						<textarea class='repeating_hex_description' name='attr_hex_description' data-i18n="hex-description" >Hex description goes here...</textarea>
-        						<textarea class='repeating_hex_lift' type='text' name='attr_hex_lift' data-i18n="requirements-to-lift" >Requirements to lift go here...</textarea>
+        						<textarea class='repeating_hex_lift' name='attr_hex_lift' data-i18n="requirements-to-lift" >Requirements to lift go here...</textarea>
         					</div>
         							</fieldset>
         				</div>
@@ -2499,7 +2506,7 @@
         					    </div>
 
         					    <span class='sheet-background-span'><label class='sheet-style-element' data-i18n="siblings-rivals-friends-u" >SIBLINGS, RIVALS & FRIENDS</label></span>
-        				        <input type="checkbox" checked='true' name='attr_friends_toggle' class="sheet-friends-toggle"><span></span>
+        				        <input type="checkbox" checked name='attr_friends_toggle' class="sheet-friends-toggle"><span></span>
             					<div class='sheet-friends-container' style='margin-right: 40px;'>
                 					<fieldset class="repeating_friends" style='margin-bottom: 5px; margin-top: 3px;'>
                 					    <span class='repeating_relationship_span'>
@@ -2514,7 +2521,7 @@
             					</div>
 
             					<span class='sheet-background-span' style='margin-bottom: -0px;'><label class='sheet-style-element' data-i18n="life-event-u" >LIFE EVENTS</label></span>
-        				        <input type="checkbox" checked='true' name='attr_life_events_toggle' class="sheet-life-events-toggle"><span></span>
+        				        <input type="checkbox" checked name='attr_life_events_toggle' class="sheet-life-events-toggle"><span></span>
             					<div class='sheet-events-container' style='margin-right: 40px;'>
                 					<fieldset class="repeating_events">
                 					    <span class='repeating_decade_span'>
@@ -2554,7 +2561,7 @@
         			<label class='sheet-stattitle' data-i18n="body-u" >BODY</label><input name='attr_total_body_npc' title='@{total_body_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_body_npc' title='@{body_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_body_npc}+@{stat_mod_body_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=BODY SAVE}} {{description=To succeed you need to roll below @{body_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="spd-u" >SPD</label><input name='attr_total_spd_npc' title='@{total_spd_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_spd_npc' title='@{spd_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_spd_npc}+@{stat_mod_spd_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=SPD SAVE}} {{description=To succeed you need to roll below @{spd_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="emp-u" >EMP</label><input name='attr_total_emp_npc' title='@{total_emp_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_emp_npc' title='@{emp_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_emp_npc}+@{stat_mod_emp_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=EMP SAVE}} {{description=To succeed you need to roll below @{emp_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="cra-u" >CRA</label><input name='attr_total_cra_npc' npctitle='@{total_cra_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra_npc' title='@{cra_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra_npc}+@{stat_mod_cra_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=CRA SAVE}} {{description=To succeed you need to roll below @{cra_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="cra-u" >CRA</label><input name='attr_total_cra_npc' title='@{total_cra_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra_npc' title='@{cra_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra_npc}+@{stat_mod_cra_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=CRA SAVE}} {{description=To succeed you need to roll below @{cra_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="will-u" >WILL</label><input name='attr_total_will_npc' title='@{total_will_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_will_npc' title='@{will_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_will_npc}+@{stat_mod_will_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=WILL SAVE}} {{description=To succeed you need to roll below @{will_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="luck-u" >LUCK</label><input name='attr_total_luck_npc' title='@{total_luck_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_luck_npc' title='@{luck_npc}' class='sheet-smallbox' type='text' value='0'><br />
         			<label class='sheet-sizetitle' style='margin-top: 7px; margin-left: 28px;' data-i18n="threat-u" >THREAT</label><input name='attr_npc_threat' class='sheet-size-box2' type='text'>
@@ -2614,7 +2621,7 @@
         					</span>
         					<fieldset style='margin-bottom: 10px;' class="repeating_ability">
         					    <input class='repeating_ability_name' name='attr_ability_name' type='text' value='Ability Name Goes Here...'><br />
-        					    <textarea class='repeating_ability_text' name='attr_ability_text' type='text' data-i18n="ability-details" >Ability details go here...</textarea>
+        					    <textarea class='repeating_ability_text' name='attr_ability_text' data-i18n="ability-details" >Ability details go here...</textarea>
         					</fieldset>
     					</div>
     				</div>
@@ -2639,7 +2646,7 @@
         					</span>
         					<fieldset style='margin-bottom: 10px;' class="repeating_vulnerability">
         					    <input class='repeating_vuln_name' name='attr_vuln_name' type='text' value='Vulnerability Goes Here...'><br />
-        					    <textarea class='repeating_vuln_text' name='attr_vuln_text' type='text' data-i18n="list-npcs-vulnerabilities" >List the NPCs vulnerabilities & weaknesses here...</textarea>
+        					    <textarea class='repeating_vuln_text' name='attr_vuln_text' data-i18n="list-npcs-vulnerabilities" >List the NPCs vulnerabilities & weaknesses here...</textarea>
         					</fieldset>
     					</div>
     					<div class='sheet-grid-item' style='margin-left: -5px; margin-right: 30px; margin-top: 10px;'>
@@ -3496,7 +3503,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">HELD: </strong> {{type1}} <br /><strong class="template-title">TYPE: </strong> {{type2}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">MAX RANGE: </strong> {{range}} &#160;| <strong class="template-title"> ACCURACY: </strong> {{accuracy}}</td></tr>
-        <tr><td><strong class="template-title">DMG: </strong> {{damage}} &#160;| <strong class="template-title"> RELIABILITY: </strong> {{reliability}}</th></tr>
+        <tr><td><strong class="template-title">DMG: </strong> {{damage}} &#160;| <strong class="template-title"> RELIABILITY: </strong> {{reliability}}</td></tr>
         <tr><td style='font-size: 12px;'><strong class="template-title">EFFECT: </strong> {{effect}}</td></tr>
         <tr><td style='font-size: 12px;'><strong class="template-title">ENH: </strong> {{enhancement}}</td></tr>
     </table>
@@ -3506,7 +3513,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
     <table>
         <tr><th style='text-transform: uppercase;'>{{shield-name}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
-        <tr><td><strong class="template-title">DMG: </strong> {{damage}} &#160;| <strong class="template-title"> RELIABILITY: </strong> {{reliability}}</th></tr>
+        <tr><td><strong class="template-title">DMG: </strong> {{damage}} &#160;| <strong class="template-title"> RELIABILITY: </strong> {{reliability}}</td></tr>
         <tr><td style='font-size: 12px;'><strong class="template-title">EFFECT: </strong> {{effect}}</td></tr>
         <tr><td style='font-size: 12px;'><strong class="template-title">ENH: </strong> {{enhancement}}</td></tr>
     </table>

From f50424a5488584b88d9bd6df148e13e237b22d22 Mon Sep 17 00:00:00 2001
From: Stexinator <hurricane90@gmx.de>
Date: Mon, 21 Jun 2021 20:42:30 +0200
Subject: [PATCH 3/5] [TheWitcher] change crit/fumble template into fumble only

---
 TheWitcher/translation.json     |  2 +-
 TheWitcher/translations/af.json |  2 +-
 TheWitcher/translations/ca.json |  2 +-
 TheWitcher/translations/cs.json |  2 +-
 TheWitcher/translations/da.json |  2 +-
 TheWitcher/translations/de.json |  2 +-
 TheWitcher/translations/el.json |  2 +-
 TheWitcher/translations/en.json |  2 +-
 TheWitcher/translations/es.json |  2 +-
 TheWitcher/translations/fr.json |  2 +-
 TheWitcher/translations/he.json |  2 +-
 TheWitcher/translations/hu.json |  2 +-
 TheWitcher/translations/it.json |  2 +-
 TheWitcher/translations/ja.json |  2 +-
 TheWitcher/translations/ko.json |  2 +-
 TheWitcher/translations/nl.json |  2 +-
 TheWitcher/translations/pl.json |  2 +-
 TheWitcher/translations/pt.json |  2 +-
 TheWitcher/translations/ru.json |  2 +-
 TheWitcher/translations/sl.json |  2 +-
 TheWitcher/translations/sv.json |  2 +-
 TheWitcher/translations/tr.json |  2 +-
 TheWitcher/translations/uk.json |  2 +-
 TheWitcher/translations/zh.json |  2 +-
 TheWitcher/translations/zu.json |  2 +-
 TheWitcher/witchersheet.css     | 26 +++++++++++++-------------
 TheWitcher/witchersheet.html    | 29 +++++++++++++++--------------
 27 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/TheWitcher/translation.json b/TheWitcher/translation.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translation.json
+++ b/TheWitcher/translation.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/af.json b/TheWitcher/translations/af.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/af.json
+++ b/TheWitcher/translations/af.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/ca.json b/TheWitcher/translations/ca.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/ca.json
+++ b/TheWitcher/translations/ca.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/cs.json b/TheWitcher/translations/cs.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/cs.json
+++ b/TheWitcher/translations/cs.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/da.json b/TheWitcher/translations/da.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/da.json
+++ b/TheWitcher/translations/da.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/de.json b/TheWitcher/translations/de.json
index 5c282dc640..d7319522ad 100644
--- a/TheWitcher/translations/de.json
+++ b/TheWitcher/translations/de.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "Schnelle Würfe",
 	"initiativ-u": "Initiative",
 	"stun-death-save-u": "Rettungswurf Betäubung & Tod",
-	"crit-or-fumbl-u": "Krit / Patzer",
+	"fumble-u": "Patzer",
 	"target-locatio-u": "Ziel Position",
 	"quick-weapon-button-u": "Schnelle Waffe Knopf",
 	"skills--stats-modifier-note-u": "Fertigkeiten, Eigenschaft & Mod. Notizen",
diff --git a/TheWitcher/translations/el.json b/TheWitcher/translations/el.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/el.json
+++ b/TheWitcher/translations/el.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/en.json b/TheWitcher/translations/en.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/en.json
+++ b/TheWitcher/translations/en.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/es.json b/TheWitcher/translations/es.json
index ac11f195e3..ab3157e2ad 100644
--- a/TheWitcher/translations/es.json
+++ b/TheWitcher/translations/es.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "TIRADAS RÁPIDAS",
 	"initiativ-u": "INICIATIVA",
 	"stun-death-save-u": "ATURDIMIENTO & SALVACIÓN VS MUERTE",
-	"crit-or-fumbl-u": "CRÍTICO O PIFIA",
+	"fumble-u": "PIFIA",
 	"target-locatio-u": "GOLPE LOCALIZADO",
 	"quick-weapon-button-u": "ACCESO RÁPIDO ARMAS",
 	"skills--stats-modifier-note-u": "NOTAS DE HABILIDADES, ATRIBUTOS Y MODIFICADORES",
diff --git a/TheWitcher/translations/fr.json b/TheWitcher/translations/fr.json
index a81060d582..f41707f420 100644
--- a/TheWitcher/translations/fr.json
+++ b/TheWitcher/translations/fr.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "BOUTONS DE JET RAPIDE",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "SAUV. VS MORT & ÈTOU",
-	"crit-or-fumbl-u": "CRIT OU MALADRESSE",
+	"fumble-u": "MALADRESSE",
 	"target-locatio-u": "LOCALISATION DE LA CIBLE",
 	"quick-weapon-button-u": "BOUTONS D'ARME RAPIDE",
 	"skills--stats-modifier-note-u": "NOTES DE COMP., STATS & MODIFICATEURS",
diff --git a/TheWitcher/translations/he.json b/TheWitcher/translations/he.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/he.json
+++ b/TheWitcher/translations/he.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/hu.json b/TheWitcher/translations/hu.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/hu.json
+++ b/TheWitcher/translations/hu.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/it.json b/TheWitcher/translations/it.json
index 7c1da42b75..0e037d1ee0 100644
--- a/TheWitcher/translations/it.json
+++ b/TheWitcher/translations/it.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "BOTTONI PER TIRI RAPIDI",
 	"initiativ-u": "INIZIATIVA",
 	"stun-death-save-u": "TIRO SALVEZZA SU GRINTA E MORTE",
-	"crit-or-fumbl-u": "CRITICO O DISASTRO",
+	"fumble-u": "DISASTRO",
 	"target-locatio-u": "LOCALIZZAZIONE DEL DANNO",
 	"quick-weapon-button-u": "BOTTONI PER ARMI RAPIDE",
 	"skills--stats-modifier-note-u": "NOTE SU ABILITÀ, STAT E MODIFICATORI",
diff --git a/TheWitcher/translations/ja.json b/TheWitcher/translations/ja.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/ja.json
+++ b/TheWitcher/translations/ja.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/ko.json b/TheWitcher/translations/ko.json
index 67584cb88e..e4dca063d1 100644
--- a/TheWitcher/translations/ko.json
+++ b/TheWitcher/translations/ko.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/nl.json b/TheWitcher/translations/nl.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/nl.json
+++ b/TheWitcher/translations/nl.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/pl.json b/TheWitcher/translations/pl.json
index cce73eeabc..711966f7b2 100644
--- a/TheWitcher/translations/pl.json
+++ b/TheWitcher/translations/pl.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "SZYBKIE RZUTY",
 	"initiativ-u": "INICJATYWA",
 	"stun-death-save-u": "TEST PRZYTOMNOŚCI & KONANIA",
-	"crit-or-fumbl-u": "SZCZĘŚCIE LUB PECH",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "LOKACJA TRAFIENIA",
 	"quick-weapon-button-u": "SZYBKIE RZUTY NA OBR.",
 	"skills--stats-modifier-note-u": "NOTATKI - STATYSTYKI, UMJ. I MODYF.",
diff --git a/TheWitcher/translations/pt.json b/TheWitcher/translations/pt.json
index 8fea14d18c..38454ae782 100644
--- a/TheWitcher/translations/pt.json
+++ b/TheWitcher/translations/pt.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "BOTÕES DE JOGADAS RÁPIDAS",
 	"initiativ-u": "INICIATIVA",
 	"stun-death-save-u": "RESISTÊNCIA A ATORDOAMENTO E MORTE",
-	"crit-or-fumbl-u": "CRÍTICOS OU VACILOS",
+	"fumble-u": "VACILOS",
 	"target-locatio-u": "LOCAIS DE DANO",
 	"quick-weapon-button-u": "BOTÕES DE ARMAS",
 	"skills--stats-modifier-note-u": "ANOTAÇÕES SOBRE PERÍCIAS, ESTATÍSTICAS E MODIFICADORES",
diff --git a/TheWitcher/translations/ru.json b/TheWitcher/translations/ru.json
index e5b52f0df2..32ca0a037a 100644
--- a/TheWitcher/translations/ru.json
+++ b/TheWitcher/translations/ru.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "Панель быстрых бросков",
 	"initiativ-u": "Инициатива",
 	"stun-death-save-u": "Сопрот. смерти и оглушению",
-	"crit-or-fumbl-u": "Крит. успех или провал",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "Место попадания",
 	"quick-weapon-button-u": "Панель оружия",
 	"skills--stats-modifier-note-u": "Навыки, параметры и эффекты",
diff --git a/TheWitcher/translations/sl.json b/TheWitcher/translations/sl.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/sl.json
+++ b/TheWitcher/translations/sl.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/sv.json b/TheWitcher/translations/sv.json
index d5ae06e5f1..f625df9774 100644
--- a/TheWitcher/translations/sv.json
+++ b/TheWitcher/translations/sv.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/tr.json b/TheWitcher/translations/tr.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/tr.json
+++ b/TheWitcher/translations/tr.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/uk.json b/TheWitcher/translations/uk.json
index d85db03254..0cd177a474 100644
--- a/TheWitcher/translations/uk.json
+++ b/TheWitcher/translations/uk.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "INITIATIVE",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/zh.json b/TheWitcher/translations/zh.json
index 5f5d8f90c7..053fcbb4ea 100644
--- a/TheWitcher/translations/zh.json
+++ b/TheWitcher/translations/zh.json
@@ -117,7 +117,7 @@
 	"quick-roll-button-u": "QUICK ROLL BUTTONS",
 	"initiativ-u": "先攻",
 	"stun-death-save-u": "STUN & DEATH SAVE",
-	"crit-or-fumbl-u": "CRIT OR FUMBLE",
+	"fumble-u": "FUMBLE",
 	"target-locatio-u": "TARGET LOCATION",
 	"quick-weapon-button-u": "QUICK WEAPON BUTTONS",
 	"skills--stats-modifier-note-u": "SKILLS, STATS & MODIFIER NOTES",
diff --git a/TheWitcher/translations/zu.json b/TheWitcher/translations/zu.json
index e552d9faa9..c4eed7d283 100644
--- a/TheWitcher/translations/zu.json
+++ b/TheWitcher/translations/zu.json
@@ -109,7 +109,7 @@
     "quick-roll-button-u": "crwdns128724:0crwdne128724:0",
     "initiativ-u": "crwdns128726:0crwdne128726:0",
     "stun-death-save-u": "crwdns136185:0crwdne136185:0",
-    "crit-or-fumbl-u": "crwdns128730:0crwdne128730:0",
+    "fumble-u": "FUMBLE",
     "target-locatio-u": "crwdns128732:0crwdne128732:0",
     "quick-weapon-button-u": "crwdns128734:0crwdne128734:0",
     "skills--stats-modifier-note-u": "crwdns136187:0crwdne136187:0",
diff --git a/TheWitcher/witchersheet.css b/TheWitcher/witchersheet.css
index c1e3f13832..810a506a48 100644
--- a/TheWitcher/witchersheet.css
+++ b/TheWitcher/witchersheet.css
@@ -1948,7 +1948,7 @@ label.sheet-ip-maintitle {
 
 label.sheet-initiativetitle,
 label.sheet-savetitle,
-label.sheet-crittitle,
+label.sheet-fumbletitle,
 label.sheet-locationtitle {
     display: inline-block;
     margin-top: 10px;
@@ -6087,13 +6087,13 @@ button[type=roll].sheet-initiative-roll:active {
 
 /* Critical */
 
-.charsheet button[type=roll].sheet-critical-roll::before {
+.charsheet button[type=roll].sheet-fumble-roll::before {
     font-family: "pictos custom";
     content: "t";
     font-size: 23px;
 }
 
-button[type=roll].sheet-critical-roll {
+button[type=roll].sheet-fumble-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -6108,13 +6108,13 @@ button[type=roll].sheet-critical-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-critical-roll:hover {
+button[type=roll].sheet-fumble-roll:hover {
     color: #968754;
     border-color: #968754;
     border: 1px solid;
 }
 
-button[type=roll].sheet-critical-roll:active {
+button[type=roll].sheet-fumble-roll:active {
     color: #ffe387;
     border-color: #ffe387;
     border: 1px solid;
@@ -6506,7 +6506,7 @@ button[type=roll].repeating_npc_skill_roll:active {
 .sheet-rolltemplate-statistics2 table,
 .sheet-rolltemplate-statistics table,
 .sheet-rolltemplate-target table,
-.sheet-rolltemplate-crit table,
+.sheet-rolltemplate-fumble table,
 .sheet-rolltemplate-save table,
 .sheet-rolltemplate-initiative table {
     width: 95%;
@@ -6532,7 +6532,7 @@ button[type=roll].repeating_npc_skill_roll:active {
 .sheet-rolltemplate-statistics2 th,
 .sheet-rolltemplate-statistics th,
 .sheet-rolltemplate-target th,
-.sheet-rolltemplate-crit th,
+.sheet-rolltemplate-fumble th,
 .sheet-rolltemplate-save th,
 .sheet-rolltemplate-initiative th {
 	color: #ffffff;
@@ -6559,7 +6559,7 @@ button[type=roll].repeating_npc_skill_roll:active {
 .sheet-rolltemplate-statistics2 .userscript-template-title,
 .sheet-rolltemplate-statistics .userscript-template-title,
 .sheet-rolltemplate-target .userscript-template-title,
-.sheet-rolltemplate-crit .userscript-template-title,
+.sheet-rolltemplate-fumble .userscript-template-title,
 .sheet-rolltemplate-save .userscript-template-title,
 .sheet-rolltemplate-initiative .userscript-template-title {
 	font-weight: bold;
@@ -6581,7 +6581,7 @@ button[type=roll].repeating_npc_skill_roll:active {
 .sheet-rolltemplate-statistics2 td,
 .sheet-rolltemplate-statistics td,
 .sheet-rolltemplate-target td,
-.sheet-rolltemplate-crit td,
+.sheet-rolltemplate-fumble td,
 .sheet-rolltemplate-save td,
 .sheet-rolltemplate-initiative td {
 	padding: 8px;
@@ -6604,7 +6604,7 @@ button[type=roll].repeating_npc_skill_roll:active {
 .sheet-rolltemplate-statistics2 .inlinerollresult,
 .sheet-rolltemplate-statistics .inlinerollresult,
 .sheet-rolltemplate-target .inlinerollresult,
-.sheet-rolltemplate-crit .inlinerollresult,
+.sheet-rolltemplate-fumble .inlinerollresult,
 .sheet-rolltemplate-save .inlinerollresult,
 .sheet-rolltemplate-initiative .inlinerollresult  {
 	display: inline-block;
@@ -6645,15 +6645,15 @@ button[type=roll].repeating_npc_skill_roll:active {
 
 /* Crit/Fumble */
 
-.sheet-rolltemplate-crit th {
+.sheet-rolltemplate-fumble th {
 	background-color: #968754;
 }
 
-.sheet-rolltemplate-crit tr:nth-child(odd) {
+.sheet-rolltemplate-fumble tr:nth-child(odd) {
 	background-color: #d8d0b1;
 }
 
-.sheet-rolltemplate-crit tr:nth-child(even) {
+.sheet-rolltemplate-fumble tr:nth-child(even) {
 	background-color: #e0e0e0;
 }
 
diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index 019fda798b..625b4fc7c8 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -1212,7 +1212,7 @@
         						<hr style='margin-bottom: 10px; margin-top: 5px;'>
         						<label class='sheet-initiativetitle' data-i18n="initiativ-u" >INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]&{tracker}+?{INITIATIVE MOD? (Bonuses/Penalties etc)|0}[MOD]]]}}'></button><br />
                                 <label class='sheet-savetitle' data-i18n="stun-death-save-u" >STUN & DEATH SAVE</label><button class='sheet-save-roll' type='roll' value= '@{whisper}&{template:save} {{title=STUN/DEATH SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below [[@{stun}+?{STUN/DEATH SAVE MOD? (Bonuses/Penalties etc)|0}[MOD]]]}} {{roll=[[1d10]]}}'></button><br />
-        						<label class='sheet-crittitle' data-i18n="crit-or-fumbl-u" >FUMBLE</label><button class='sheet-critical-roll' type='roll' value= '@{whisper}&{template:crit} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10+1]]}}'></button><br />
+        						<label class='sheet-fumbletitle' data-i18n="fumble-u" >FUMBLE</label><button class='sheet-fumble-roll' type='roll' value= '@{whisper}&{template:fumble} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10+1]]}}'></button><br />
         						<label class='sheet-locationtitle' data-i18n="target-locatio-u" >TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
         					    <hr style='margin-bottom: 10px; margin-top: 5px;'>
         					    <label class='sheet-quick-button-maintitle' style='font-size: 17px; margin-top: 18px' data-i18n="quick-weapon-button-u" >QUICK WEAPON BUTTONS</label><br />
@@ -2687,7 +2687,7 @@
 						<hr style='margin-bottom: 10px; margin-top: 5px;'>
 						<label class='sheet-initiativetitle' data-i18n="initiativ-u" >INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref_npc}[STAT]&{tracker}]]}}'></button><br />
 						<label class='sheet-savetitle' data-i18n="stun-death-save-u" >STUN & DEATH SAVE</label><button class='sheet-save-roll' type='roll' value= '@{whisper}&{template:save} {{title=STUN/DEATH SAVE}} {{name=@{character_name}}} {{description= To succeed you need to roll below [[@{stun_npc}]].}} {{roll=[[1d10]]}}'></button><br />
-						<label class='sheet-crittitle' data-i18n="crit-or-fumbl-u" >FUMBLE</label><button class='sheet-critical-roll' type='roll' name="roll_Fumble" value= '@{whisper}&{template:crit} {{title=CRIT/FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button><br />
+						<label class='sheet-fumbletitle' data-i18n="fumble-u" >FUMBLE</label><button class='sheet-fumble-roll' type='roll' name="roll_Fumble" value= '@{whisper}&{template:fumble} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10!]]}}'></button><br />
 						<label class='sheet-locationtitle' data-i18n="target-locatio-u" >TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
 					</div>
 				</div>
@@ -3379,7 +3379,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3390,9 +3390,9 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">1ST ATTACK: </strong> {{roll}}</td></tr>
         <tr><td><strong class="template-title">2ND ATTACK: </strong> {{roll2}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your first attack.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your first attack.</td></tr>{{/rollWasFumble() roll}}
         {{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll2}}
-        {{#rollWasFumble() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your second attack.</td></tr>{{/rollWasFumble() roll2}}
+        {{#rollWasFumble() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your second attack.</td></tr>{{/rollWasFumble() roll2}}
     </table>
 </rolltemplate>
 
@@ -3415,13 +3415,14 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
     </table>
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-crit">
+<rolltemplate class="sheet-rolltemplate-fumble">
     <table>
         <tr><th>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
-        <tr><td><strong class="template-title">CRIT/FUMBLE ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">ROLL AGAIN: </strong> <span style='color: #66c600;'>**Add**</span>/<span style='color: #c60000;'>**Subtract**</span> this to/from your total score, roll again!</td></tr>{{/rollWasCrit() roll}}
-    </table>
+		<tr>
+			<td><strong class="template-title">FUMBLE ROLL: </strong> {{roll}}</td>
+		</tr>
+	</table>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-target">
@@ -3458,7 +3459,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong>{{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3469,7 +3470,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3480,7 +3481,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3491,7 +3492,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3580,6 +3581,6 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">REPUTATION: </strong> {{reputation}}</td></tr>
         <tr><td><strong class="template-title">REP ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Critical/Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>

From b97bebaa7e55362fff4cb5ed5b0ca94787dca21f Mon Sep 17 00:00:00 2001
From: Stexinator <hurricane90@gmx.de>
Date: Fri, 25 Jun 2021 18:25:40 +0200
Subject: [PATCH 4/5] [TheWitcher] add chat button for improved qol

---
 TheWitcher/witchersheet.html | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index 625b4fc7c8..0c0a4f63a3 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -1212,7 +1212,7 @@
         						<hr style='margin-bottom: 10px; margin-top: 5px;'>
         						<label class='sheet-initiativetitle' data-i18n="initiativ-u" >INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]&{tracker}+?{INITIATIVE MOD? (Bonuses/Penalties etc)|0}[MOD]]]}}'></button><br />
                                 <label class='sheet-savetitle' data-i18n="stun-death-save-u" >STUN & DEATH SAVE</label><button class='sheet-save-roll' type='roll' value= '@{whisper}&{template:save} {{title=STUN/DEATH SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below [[@{stun}+?{STUN/DEATH SAVE MOD? (Bonuses/Penalties etc)|0}[MOD]]]}} {{roll=[[1d10]]}}'></button><br />
-        						<label class='sheet-fumbletitle' data-i18n="fumble-u" >FUMBLE</label><button class='sheet-fumble-roll' type='roll' value= '@{whisper}&{template:fumble} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10+1]]}}'></button><br />
+        						<label class='sheet-fumbletitle' data-i18n="fumble-u" >FUMBLE</label><button class='sheet-fumble-roll' type='roll' name="roll_fumble" value= '@{whisper}&{template:fumble} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10!+1]]}}'></button><br />
         						<label class='sheet-locationtitle' data-i18n="target-locatio-u" >TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
         					    <hr style='margin-bottom: 10px; margin-top: 5px;'>
         					    <label class='sheet-quick-button-maintitle' style='font-size: 17px; margin-top: 18px' data-i18n="quick-weapon-button-u" >QUICK WEAPON BUTTONS</label><br />
@@ -2687,7 +2687,7 @@
 						<hr style='margin-bottom: 10px; margin-top: 5px;'>
 						<label class='sheet-initiativetitle' data-i18n="initiativ-u" >INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref_npc}[STAT]&{tracker}]]}}'></button><br />
 						<label class='sheet-savetitle' data-i18n="stun-death-save-u" >STUN & DEATH SAVE</label><button class='sheet-save-roll' type='roll' value= '@{whisper}&{template:save} {{title=STUN/DEATH SAVE}} {{name=@{character_name}}} {{description= To succeed you need to roll below [[@{stun_npc}]].}} {{roll=[[1d10]]}}'></button><br />
-						<label class='sheet-fumbletitle' data-i18n="fumble-u" >FUMBLE</label><button class='sheet-fumble-roll' type='roll' name="roll_Fumble" value= '@{whisper}&{template:fumble} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10!]]}}'></button><br />
+						<label class='sheet-fumbletitle' data-i18n="fumble-u" >FUMBLE</label><button class='sheet-fumble-roll' type='roll' value= '@{whisper}&{template:fumble} {{title=FUMBLE}} {{name=@{character_name}}} {{roll=[[1d10!+1]]}}'></button><br />
 						<label class='sheet-locationtitle' data-i18n="target-locatio-u" >TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
 					</div>
 				</div>
@@ -3379,7 +3379,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3390,9 +3390,9 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">1ST ATTACK: </strong> {{roll}}</td></tr>
         <tr><td><strong class="template-title">2ND ATTACK: </strong> {{roll2}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your first attack.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your first attack.</td></tr>{{/rollWasFumble() roll}}
         {{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll2}}
-        {{#rollWasFumble() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your second attack.</td></tr>{{/rollWasFumble() roll2}}
+        {{#rollWasFumble() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your second attack.</td></tr>{{/rollWasFumble() roll2}}
     </table>
 </rolltemplate>
 
@@ -3417,8 +3417,12 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
 
 <rolltemplate class="sheet-rolltemplate-fumble">
     <table>
-        <tr><th>{{title}}</th></tr>
-        <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
+        <tr>
+			<th>{{title}}</th>
+		</tr>
+        <tr>
+			<td><strong class="template-title">NAME: </strong> {{name}}</td>
+		</tr>
 		<tr>
 			<td><strong class="template-title">FUMBLE ROLL: </strong> {{roll}}</td>
 		</tr>
@@ -3459,7 +3463,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong>{{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3470,7 +3474,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3481,7 +3485,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3492,7 +3496,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3581,6 +3585,6 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">REPUTATION: </strong> {{reputation}}</td></tr>
         <tr><td><strong class="template-title">REP ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the Fumble button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>

From 0826517a25d95e0912cd0ac57ad3df29650c8c17 Mon Sep 17 00:00:00 2001
From: Stexinator <hurricane90@gmx.de>
Date: Mon, 28 Jun 2021 23:27:17 +0200
Subject: [PATCH 5/5] [TheWitcher] style rollbutton and add safeguard for 10
 then 1 roll

---
 TheWitcher/witchersheet.css  | 14 +++++++
 TheWitcher/witchersheet.html | 73 +++++++++++++++++++++++++++++++-----
 2 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/TheWitcher/witchersheet.css b/TheWitcher/witchersheet.css
index 810a506a48..083d3e9281 100644
--- a/TheWitcher/witchersheet.css
+++ b/TheWitcher/witchersheet.css
@@ -6847,3 +6847,17 @@ button[type=roll].repeating_npc_skill_roll:active {
 .sheet-rolltemplate-reputation tr:nth-child(even) {
 	background-color: #e0e0e0;
 }
+
+/* API Button */
+.sheet-rolltemplate-statistics2 a[href^="~"],
+.sheet-rolltemplate-statistics3 a[href^="~"],
+.sheet-rolltemplate-mainskill a[href^="~"],
+.sheet-rolltemplate-blueskill a[href^="~"],
+.sheet-rolltemplate-greenskill a[href^="~"],
+.sheet-rolltemplate-redskill a[href^="~"],
+.sheet-rolltemplate-reputation a[href^="~"] {
+    background-color: #968754;
+    padding: 2px 4px 2px 4px;
+    color: white;
+    display: inline-block;
+}
\ No newline at end of file
diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index 0c0a4f63a3..ee64ee0977 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -3379,7 +3379,15 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'>
+			<td>
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.
+			</td>
+		</tr>
+		{{/^rollWasCrit() roll}}
+		{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3390,9 +3398,25 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">1ST ATTACK: </strong> {{roll}}</td></tr>
         <tr><td><strong class="template-title">2ND ATTACK: </strong> {{roll2}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your first attack.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'>
+			<td>
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your first attack.
+			</td>
+		</tr>
+		{{/^rollWasCrit() roll}}
+		{{/rollWasFumble() roll}}
         {{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll2}}
-        {{#rollWasFumble() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your second attack.</td></tr>{{/rollWasFumble() roll2}}
+        {{#rollWasFumble() roll2}}
+		{{#^rollWasCrit() roll2}}
+		<tr style='text-align: justify; font-size: 12px;'>
+			<td>
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your second attack.
+			</td>
+		</tr>
+		{{/^rollWasCrit() roll2}}
+		{{/rollWasFumble() roll2}}
     </table>
 </rolltemplate>
 
@@ -3463,7 +3487,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong>{{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		{{/^rollWasCrit() roll}}
+		{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3474,7 +3502,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		{{/^rollWasCrit() roll}}
+		{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3485,7 +3517,10 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3496,7 +3531,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
         <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		{{/^rollWasCrit() roll}}
+		{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>
 
@@ -3583,8 +3622,22 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><th>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">REPUTATION: </strong> {{reputation}}</td></tr>
-        <tr><td><strong class="template-title">REP ROLL: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [fumble](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>{{/rollWasFumble() roll}}
+        <tr>
+			<td><strong class="template-title">REP ROLL: </strong> {{roll}}</td>
+		</tr>
+        {{#rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'>
+			<td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td>
+		</tr>
+		{{/rollWasCrit() roll}}
+        {{#rollWasFumble() roll}}
+		{{#^rollWasCrit() roll}}
+		<tr style='text-align: justify; font-size: 12px;'>
+			<td>
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.
+			</td>
+		</tr>
+		{{/^rollWasCrit() roll}}
+		{{/rollWasFumble() roll}}
     </table>
 </rolltemplate>