diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index 25a33ac57e..b43c513d79 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -73,44 +73,44 @@
         					<label class='sheet-skilltitle-int'>INTELLIGENCE</label><input type="checkbox" name='attr_int_toggle' class="sheet-int-toggle"><span></span>
         						<div class='sheet-int-container'>
         							<label class='sheet-legend'> Maximum / Current.</label><br />
-        							<label class='sheet-skilltitle'>AWARENESS</label><input name='attr_max_awareness' title='@{max_awareness}' class='sheet-smallbox' type='number' value='0'><input name='attr_awareness' title='@{awareness}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{awareness}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>BUSINESS</label><input name='attr_max_business' title='@{max_business}' class='sheet-smallbox' type='number' value='0'><input name='attr_business' title='@{business}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{business}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>DEDUCTION</label><input name='attr_max_deduction' title='@{max_deduction}' class='sheet-smallbox' type='number' value='0'><input name='attr_deduction' title='@{deduction}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{deduction}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>EDUCATION</label><input name='attr_max_education' title='@{max_education}' class='sheet-smallbox' type='number' value='0'><input name='attr_education' title='@{education}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{education}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>NORDLING*</label><input name='attr_max_nordling' title='@{max_nordling}' class='sheet-smallbox' type='number' value='0'><input name='attr_nordling' title='@{nordling}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{nordling}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>ELDER SPEECH*</label><input name='attr_max_elder_speech' title='@{max_elder_speech}' class='sheet-smallbox' type='number' value='0'><input name='attr_elder_speech' title='@{elder_speech}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{elder_speech}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>DWARVEN*</label><input name='attr_max_dwarven' title='@{max_dwarven}' class='sheet-smallbox' type='number' value='0'><input name='attr_dwarven' title='@{dwarven}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{dwarven}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>MONSTER LORE*</label><input name='attr_max_monster_lore' title='@{max_monster_lore}' class='sheet-smallbox' type='number' value='0'><input name='attr_monster_lore' title='@{monster_lore}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{monster_lore}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SOCIAL ETIQUETTE</label><input name='attr_max_social_etiquette' title='@{max_social_etiquette}' class='sheet-smallbox' type='number' value='0'><input name='attr_social_etiquette' title='@{social_etiquette}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{social_etiquette}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>STREETWISE</label><input name='attr_max_streetwise' title='@{max_streetwise}' class='sheet-smallbox' type='number' value='0'><input name='attr_streetwise' title='@{streetwise}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{streetwise}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>TACTICS*</label><input name='attr_max_tactics' title='@{max_tactics}' class='sheet-smallbox' type='number' value='0'><input name='attr_tactics' title='@{tactics}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{tactics}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>TEACHING</label><input name='attr_max_teaching' title='@{max_teaching}' class='sheet-smallbox' type='number' value='0'><input name='attr_teaching' title='@{teaching}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{teaching}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>W. SURVIVAL</label><input name='attr_max_wilderness_survival' title='@{max_wilderness_survival}' class='sheet-smallbox' type='number' value='0'><input name='attr_wilderness_survival' title='@{wilderness_survival}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10+@{int}+@{wilderness_survival}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>AWARENESS</label><input name='attr_max_awareness' title='@{max_awareness}' class='sheet-smallbox' type='number' value='0'><input name='attr_awareness' title='@{awareness}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{awareness}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>BUSINESS</label><input name='attr_max_business' title='@{max_business}' class='sheet-smallbox' type='number' value='0'><input name='attr_business' title='@{business}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{business}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>DEDUCTION</label><input name='attr_max_deduction' title='@{max_deduction}' class='sheet-smallbox' type='number' value='0'><input name='attr_deduction' title='@{deduction}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{deduction}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>EDUCATION</label><input name='attr_max_education' title='@{max_education}' class='sheet-smallbox' type='number' value='0'><input name='attr_education' title='@{education}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{education}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>NORDLING*</label><input name='attr_max_nordling' title='@{max_nordling}' class='sheet-smallbox' type='number' value='0'><input name='attr_nordling' title='@{nordling}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{nordling}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>ELDER SPEECH*</label><input name='attr_max_elder_speech' title='@{max_elder_speech}' class='sheet-smallbox' type='number' value='0'><input name='attr_elder_speech' title='@{elder_speech}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{elder_speech}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>DWARVEN*</label><input name='attr_max_dwarven' title='@{max_dwarven}' class='sheet-smallbox' type='number' value='0'><input name='attr_dwarven' title='@{dwarven}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{dwarven}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>MONSTER LORE*</label><input name='attr_max_monster_lore' title='@{max_monster_lore}' class='sheet-smallbox' type='number' value='0'><input name='attr_monster_lore' title='@{monster_lore}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{monster_lore}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SOCIAL ETIQUETTE</label><input name='attr_max_social_etiquette' title='@{max_social_etiquette}' class='sheet-smallbox' type='number' value='0'><input name='attr_social_etiquette' title='@{social_etiquette}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{social_etiquette}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>STREETWISE</label><input name='attr_max_streetwise' title='@{max_streetwise}' class='sheet-smallbox' type='number' value='0'><input name='attr_streetwise' title='@{streetwise}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{streetwise}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>TACTICS*</label><input name='attr_max_tactics' title='@{max_tactics}' class='sheet-smallbox' type='number' value='0'><input name='attr_tactics' title='@{tactics}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{tactics}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>TEACHING</label><input name='attr_max_teaching' title='@{max_teaching}' class='sheet-smallbox' type='number' value='0'><input name='attr_teaching' title='@{teaching}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{teaching}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>W. SURVIVAL</label><input name='attr_max_wilderness_survival' title='@{max_wilderness_survival}' class='sheet-smallbox' type='number' value='0'><input name='attr_wilderness_survival' title='@{wilderness_survival}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10+@{int}[STAT]+@{wilderness_survival}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_int_total' type='hidden' value='[[0+@{max_awareness}+@{max_business}+@{max_deduction}+@{max_education}+(@{max_nordling}*2)+(@{max_elder_speech}*2)+(@{max_dwarven}*2)+(@{max_monster_lore}*2)+@{max_social_etiquette}+@{max_streetwise}+(@{max_tactics}*2)+@{max_teaching}+@{max_wilderness_survival}]]' disabled='true'>
         						</div>
         					
         						<label class='sheet-skilltitle-ref'>REFLEXES</label><input type="checkbox" name='attr_ref_toggle' class="sheet-ref-toggle"><span></span>
         						<div class='sheet-ref-container'>
         							<label class='sheet-legend'> Maximum / Current</label><br />
-        							<label class='sheet-skilltitle'>BRAWLING</label><input name='attr_max_brawling' title='@{max_brawling}' class='sheet-smallbox' type='number' value='0'><input name='attr_brawling' title='@{brawling}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{brawling}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;+?{WEAPON SELECTION&amp;#124;Unarmed&amp;#44;0&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Disarm (Take Weapon)&amp;#44;-3&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>DODGE/ESCAPE</label><input name='attr_max_dodge_escape' title='@{max_dodge_escape}' class='sheet-smallbox' type='number' value='0'><input name='attr_dodge_escape' title='@{dodge_escape}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{dodge_escape}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>MELEE</label><input name='attr_max_melee' title='@{max_melee}' class='sheet-smallbox' type='number' value='0'><input name='attr_melee' title='@{melee}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{melee}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Block (With Shield)&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>RIDING</label><input name='attr_max_riding' title='@{max_riding}' class='sheet-smallbox' type='number' value='0'><input name='attr_riding' title='@{riding}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{riding}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SAILING</label><input name='attr_max_sailing' title='@{max_sailing}' class='sheet-smallbox' type='number' value='0'><input name='attr_sailing' title='@{sailing}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{sailing}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SMALL BLADES</label><input name='attr_max_small_blades' title='@{max_small_blades}' class='sheet-smallbox' type='number' value='0'><input name='attr_small_blades' title='@{small_blades}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{small_blades}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>STAFF/SPEAR</label><input name='attr_max_staff_spear' title='@{max_staff_spear}' class='sheet-smallbox' type='number' value='0'><input name='attr_staff_spear' title='@{staff_spear}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{staff_spear}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SWORDSMANSHIP</label><input name='attr_max_swordsmanship' title='@{max_swordsmanship}' class='sheet-smallbox' type='number' value='0'><input name='attr_swordsmanship' title='@{swordsmanship}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}+@{swordsmanship}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>BRAWLING</label><input name='attr_max_brawling' title='@{max_brawling}' class='sheet-smallbox' type='number' value='0'><input name='attr_brawling' title='@{brawling}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{brawling}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;[ATTACK ACTION]+?{WEAPON SELECTION&amp;#124;Unarmed&amp;#44;0&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Disarm (Take Weapon)&amp;#44;-3&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>DODGE/ESCAPE</label><input name='attr_max_dodge_escape' title='@{max_dodge_escape}' class='sheet-smallbox' type='number' value='0'><input name='attr_dodge_escape' title='@{dodge_escape}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{dodge_escape}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>MELEE</label><input name='attr_max_melee' title='@{max_melee}' class='sheet-smallbox' type='number' value='0'><input name='attr_melee' title='@{melee}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{melee}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;[ATTACK ACTION]+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Block (With Shield)&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>RIDING</label><input name='attr_max_riding' title='@{max_riding}' class='sheet-smallbox' type='number' value='0'><input name='attr_riding' title='@{riding}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{riding}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SAILING</label><input name='attr_max_sailing' title='@{max_sailing}' class='sheet-smallbox' type='number' value='0'><input name='attr_sailing' title='@{sailing}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{sailing}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SMALL BLADES</label><input name='attr_max_small_blades' title='@{max_small_blades}' class='sheet-smallbox' type='number' value='0'><input name='attr_small_blades' title='@{small_blades}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{small_blades}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;[ATTACK ACTION]+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>STAFF/SPEAR</label><input name='attr_max_staff_spear' title='@{max_staff_spear}' class='sheet-smallbox' type='number' value='0'><input name='attr_staff_spear' title='@{staff_spear}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{staff_spear}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;+0&amp;#125;[ATTACK ACTION]+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SWORDSMANSHIP</label><input name='attr_max_swordsmanship' title='@{max_swordsmanship}' class='sheet-smallbox' type='number' value='0'><input name='attr_swordsmanship' title='@{swordsmanship}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]+@{swordsmanship}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]?{ATTACK ACTION &amp;#124;Fast Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#124;Charge&amp;#44;-3&amp;#124;Special&amp;#44;[ATTACK ACTION]+0&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_ref_total' type='hidden' value='[[0+@{max_brawling}+@{max_dodge_escape}+@{max_melee}+@{max_riding}+@{max_sailing}+@{max_small_blades}+@{max_staff_spear}+@{max_swordsmanship}]]' disabled='true'>
         						</div>
         					
         						<label class='sheet-skilltitle-dex'>DEXTERITY</label><input type="checkbox" name='attr_dex_toggle' class="sheet-dex-toggle"><span></span>
         						<div class='sheet-dex-container'>
         							<label class='sheet-legend'> Maximum / Current</label><br />
-        							<label class='sheet-skilltitle'>ARCHERY</label><input name='attr_max_archery' title='@{max_archery}' class='sheet-smallbox' type='number' value='0'><input name='attr_archery' title='@{archery}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}+@{archery}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;?{ATTACK ACTION &amp;#124;Standard Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{FIRING RANGE &amp;#124;Point Blank (Touch Range)&amp;#44;+5&amp;#124;Close (1/4 Listed Range)&amp;#44;+0&amp;#124;Medium (1/2 Listed Range)&amp;#44;-2&amp;#124;Long (Listed Range)&amp;#44;-4&amp;#124;Extreme (2x Listed Range)&amp;#44;-6&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>ATHLETICS</label><input name='attr_max_athletics' title='@{max_athletics}' class='sheet-smallbox' type='number' value='0'><input name='attr_athletics' title='@{athletics}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}+@{athletics}?{ACTION TYPE|Standard,+0|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{FIRING RANGE &amp;#124;Point Blank (Touch Range)&amp;#44;+5&amp;#124;Close (1/4 Listed Range)&amp;#44;+0&amp;#124;Medium (1/2 Listed Range)&amp;#44;-2&amp;#124;Long (Listed Range)&amp;#44;-4&amp;#124;Extreme (2x Listed Range)&amp;#44;-6&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend (Reposition),+0}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>CROSSBOW</label><input name='attr_max_crossbow' title='@{max_crossbow}' class='sheet-smallbox' type='number' value='0'><input name='attr_crossbow' title='@{crossbow}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=CROSSBOW}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}+@{crossbow}?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;?{FIRING RANGE &amp;#124;Point Blank (Touch Range)&amp;#44;+5&amp;#124;Close (1/4 Listed Range)&amp;#44;+0&amp;#124;Medium (1/2 Listed Range)&amp;#44;-2&amp;#124;Long (Listed Range)&amp;#44;-4&amp;#124;Extreme (2x Listed Range)&amp;#44;-6&amp;#125;?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SLEIGHT OF HAND</label><input name='attr_max_sleight_of_hand' title='@{max_sleight_of_hand}' class='sheet-smallbox' type='number' value='0'><input name='attr_sleight_of_hand' title='@{sleight_of_hand}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}+@{sleight_of_hand}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>STEALTH</label><input name='attr_max_stealth' title='@{max_stealth}' class='sheet-smallbox' type='number' value='0'><input name='attr_stealth' title='@{stealth}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}+@{stealth}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>ARCHERY</label><input name='attr_max_archery' title='@{max_archery}' class='sheet-smallbox' type='number' value='0'><input name='attr_archery' title='@{archery}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{archery}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]?{ATTACK ACTION &amp;#124;Standard Strike&amp;#44;+0&amp;#124;Strong Strike&amp;#44;-3&amp;#125;[ATTACK ACTION]+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{FIRING RANGE &amp;#124;Point Blank (Touch Range)&amp;#44;+5&amp;#124;Close (1/4 Listed Range)&amp;#44;+0&amp;#124;Medium (1/2 Listed Range)&amp;#44;-2&amp;#124;Long (Listed Range)&amp;#44;-4&amp;#124;Extreme (2x Listed Range)&amp;#44;-6&amp;#125;[RANGE]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>ATHLETICS</label><input name='attr_max_athletics' title='@{max_athletics}' class='sheet-smallbox' type='number' value='0'><input name='attr_athletics' title='@{athletics}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{athletics}[SKILL]?{ACTION TYPE|Standard,+0|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{FIRING RANGE &amp;#124;Point Blank (Touch Range)&amp;#44;+5&amp;#124;Close (1/4 Listed Range)&amp;#44;+0&amp;#124;Medium (1/2 Listed Range)&amp;#44;-2&amp;#124;Long (Listed Range)&amp;#44;-4&amp;#124;Extreme (2x Listed Range)&amp;#44;-6&amp;#125;[RANGE]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend (Reposition),+0[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>CROSSBOW</label><input name='attr_max_crossbow' title='@{max_crossbow}' class='sheet-smallbox' type='number' value='0'><input name='attr_crossbow' title='@{crossbow}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=CROSSBOW}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{crossbow}[SKILL]?{ACTION TYPE|Attack,?{EXTRA ACTION &amp;#124;No&amp;#44;+0&amp;#124;Yes&amp;#44;-3&amp;#125;[EXTRA ACTION]+?{WEAPON SELECTION&amp;#124;@{primary_weapon_name}&amp;#44;@{primary_wa}&amp;#124;@{secondary_weapon_name}&amp;#44;@{secondary_wa}&amp;#124; @{third_weapon_name}&amp;#44; @{third_wa}&amp;#124; @{fourth_weapon_name}&amp;#44;@{fourth_wa}&amp;#124;@{fifth_weapon_name}&amp;#44;@{fifth_wa}&amp;#124;@{sixth_weapon_name}&amp;#44;@{sixth_wa}&amp;#125;[WEAP. ACC]?{FIRING RANGE &amp;#124;Point Blank (Touch Range)&amp;#44;+5&amp;#124;Close (1/4 Listed Range)&amp;#44;+0&amp;#124;Medium (1/2 Listed Range)&amp;#44;-2&amp;#124;Long (Listed Range)&amp;#44;-4&amp;#124;Extreme (2x Listed Range)&amp;#44;-6&amp;#125;[RANGE]?{TARGET LOCATION &amp;#124;Random&amp;#44;+0&amp;#124;Head&amp;#44;-6&amp;#124;Torso&amp;#44;-1&amp;#124;Arm/Limb&amp;#44;-3&amp;#124;Leg/Special&amp;#44;-2&amp;#125;[LOCATION]|Defend,?{DEFENSE ACTION &amp;#124;Block&amp;#44;+0&amp;#124;Parry&amp;#44;-3&amp;#124;Parry (Thrown)&amp;#44;-5&amp;#125;[DEFENSE ACTION]}+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SLEIGHT OF HAND</label><input name='attr_max_sleight_of_hand' title='@{max_sleight_of_hand}' class='sheet-smallbox' type='number' value='0'><input name='attr_sleight_of_hand' title='@{sleight_of_hand}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{sleight_of_hand}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>STEALTH</label><input name='attr_max_stealth' title='@{max_stealth}' class='sheet-smallbox' type='number' value='0'><input name='attr_stealth' title='@{stealth}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10+@{dex}[STAT]+@{stealth}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_dex_total' type='hidden' value='[[0+@{max_archery}+@{max_athletics}+@{max_crossbow}+@{max_sleight_of_hand}+@{max_stealth}]]' disabled='true'>
         						</div>
         						<hr style='border: 0.5px solid #5e0000; margin-left: 50px; margin-right: 40px; margin-top: 10px; margin-bottom: 10px;'>
@@ -120,50 +120,50 @@
         						<label class='sheet-skilltitle-body'>BODY</label><input type="checkbox" name='attr_body_toggle' class="sheet-body-toggle"><span></span>
         						<div class='sheet-body-container'>
         							<label class='sheet-legend'> Maximum / Current</label><br />
-        							<label class='sheet-skilltitle'>PHYSIQUE</label><input name='attr_max_physique' title='@{max_physique}' class='sheet-smallbox' type='number' value='0'><input name='attr_physique' title='@{physique}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10+@{body}+@{physique}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>ENDURANCE</label><input name='attr_max_endurance' title='@{max_endurance}' class='sheet-smallbox' type='number' value='0'><input name='attr_endurance' title='@{endurance}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10+@{body}+@{endurance}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>PHYSIQUE</label><input name='attr_max_physique' title='@{max_physique}' class='sheet-smallbox' type='number' value='0'><input name='attr_physique' title='@{physique}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10+@{body}[STAT]+@{physique}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>ENDURANCE</label><input name='attr_max_endurance' title='@{max_endurance}' class='sheet-smallbox' type='number' value='0'><input name='attr_endurance' title='@{endurance}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10+@{body}[STAT]+@{endurance}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_body_total' type='hidden' value='[[0+@{max_physique}+@{max_endurance}]]' disabled='true'>
         						</div>
         						
         						<label class='sheet-skilltitle-emp'>EMPATHY</label><input type="checkbox" name='attr_emp_toggle' class="sheet-emp-toggle"><span></span>
         						<div class='sheet-emp-container'>
         							<label class='sheet-legend'> Maximum / Current</label><br />
-        							<label class='sheet-skilltitle'>CHARISMA</label><input name='attr_max_charisma' title='@{max_charisma}' class='sheet-smallbox' type='number' value='0'><input name='attr_charisma' title='@{charisma}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{charisma}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>DECEIT</label><input name='attr_max_deceit' title='@{max_deceit}' class='sheet-smallbox' type='number' value='0'><input name='attr_deceit' title='@{deceit}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{deceit}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>FINE ARTS</label><input name='attr_max_fine_arts' title='@{max_fine_arts}' class='sheet-smallbox' type='number' value='0'><input name='attr_fine_arts' title='@{fine_arts}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{fine_arts}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>GAMBLING</label><input name='attr_max_gambling' title='@{max_gambling}' class='sheet-smallbox' type='number' value='0'><input name='attr_gambling' title='@{gambling}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{gambling}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>GROOM. & STYLE</label><input name='attr_max_grooming_and_style' title='@{max_grooming_and_style}' class='sheet-smallbox' type='number' value='0'><input name='attr_grooming_and_style' title='@{grooming_and_style}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{grooming_and_style}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>H. PERCEPTION</label><input name='attr_max_human_perception' title='@{max_human_perception}' class='sheet-smallbox' type='number' value='0'><input name='attr_human_perception' title='@{human_perception}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{human_perception}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>LEADERSHIP</label><input name='attr_max_leadership' title='@{max_leadership}' class='sheet-smallbox' type='number' value='0'><input name='attr_leadership' title='@{leadership}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{leadership}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>PERSUASION</label><input name='attr_max_persuasion' title='@{max_persuasion}' class='sheet-smallbox' type='number' value='0'><input name='attr_persuasion' title='@{persuasion}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{persuasion}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>PERFORMANCE</label><input name='attr_max_performance' title='@{max_performance}' class='sheet-smallbox' type='number' value='0'><input name='attr_performance' title='@{performance}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{performance}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SEDUCTION</label><input name='attr_max_seduction' title='@{max_seduction}' class='sheet-smallbox' type='number' value='0'><input name='attr_seduction' title='@{seduction}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}+@{seduction}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>CHARISMA</label><input name='attr_max_charisma' title='@{max_charisma}' class='sheet-smallbox' type='number' value='0'><input name='attr_charisma' title='@{charisma}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{charisma}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>DECEIT</label><input name='attr_max_deceit' title='@{max_deceit}' class='sheet-smallbox' type='number' value='0'><input name='attr_deceit' title='@{deceit}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{deceit}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>FINE ARTS</label><input name='attr_max_fine_arts' title='@{max_fine_arts}' class='sheet-smallbox' type='number' value='0'><input name='attr_fine_arts' title='@{fine_arts}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=FINE ARTS}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{fine_arts}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>GAMBLING</label><input name='attr_max_gambling' title='@{max_gambling}' class='sheet-smallbox' type='number' value='0'><input name='attr_gambling' title='@{gambling}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{gambling}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>GROOM. & STYLE</label><input name='attr_max_grooming_and_style' title='@{max_grooming_and_style}' class='sheet-smallbox' type='number' value='0'><input name='attr_grooming_and_style' title='@{grooming_and_style}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{grooming_and_style}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>H. PERCEPTION</label><input name='attr_max_human_perception' title='@{max_human_perception}' class='sheet-smallbox' type='number' value='0'><input name='attr_human_perception' title='@{human_perception}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{human_perception}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>LEADERSHIP</label><input name='attr_max_leadership' title='@{max_leadership}' class='sheet-smallbox' type='number' value='0'><input name='attr_leadership' title='@{leadership}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{leadership}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>PERSUASION</label><input name='attr_max_persuasion' title='@{max_persuasion}' class='sheet-smallbox' type='number' value='0'><input name='attr_persuasion' title='@{persuasion}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{persuasion}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>PERFORMANCE</label><input name='attr_max_performance' title='@{max_performance}' class='sheet-smallbox' type='number' value='0'><input name='attr_performance' title='@{performance}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PERFORMANCE}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{performance}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SEDUCTION</label><input name='attr_max_seduction' title='@{max_seduction}' class='sheet-smallbox' type='number' value='0'><input name='attr_seduction' title='@{seduction}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10+@{emp}[STAT]+@{seduction}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_emp_total' type='hidden' value='[[0+@{max_charisma}+@{max_deceit}+@{max_fine_arts}+@{max_gambling}+@{max_grooming_and_style}+@{max_human_perception}+@{max_leadership}+@{max_persuasion}+@{max_performance}+@{max_seduction}]]' disabled='true'>
         						</div>
         						
         						<label class='sheet-skilltitle-cra'>CRAFT</label><input type="checkbox" name='attr_cra_toggle' class="sheet-cra-toggle"><span></span>
         						<div class='sheet-cra-container'>
         							<label class='sheet-legend'> Maximum / Current</label><br />
-        							<label class='sheet-skilltitle'>ALCHEMY*</label><input name='attr_max_alchemy' title='@{max_alchemy}' class='sheet-smallbox' type='number' value='0'><input name='attr_alchemy' title='@{alchemy}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{alchemy}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>CRAFTING*</label><input name='attr_max_crafting' title='@{max_crafting}' class='sheet-smallbox' type='number' value='0'><input name='attr_crafting' title='@{crafting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{crafting}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>DISGUISE</label><input name='attr_max_disguise' title='@{max_disguise}' class='sheet-smallbox' type='number' value='0'><input name='attr_disguise' title='@{disguise}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{disguise}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>FIRST AID</label><input name='attr_max_first_aid' title='@{max_first_aid}' class='sheet-smallbox' type='number' value='0'><input name='attr_first_aid' title='@{first_aid}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{first_aid}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>FORGERY</label><input name='attr_max_forgery' title='@{max_forgery}' class='sheet-smallbox' type='number' value='0'><input name='attr_forgery' title='@{forgery}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{forgery}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>PICK LOCK</label><input name='attr_max_pick_lock' title='@{max_pick_lock}' class='sheet-smallbox' type='number' value='0'><input name='attr_pick_lock' title='@{pick_lock}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{pick_lock}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>TRAP CRAFTING*</label><input name='attr_max_trap_crafting' title='@{max_trap_crafting}' class='sheet-smallbox' type='number' value='0'><input name='attr_trap_crafting' title='@{trap_crafting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}+@{trap_crafting}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>ALCHEMY*</label><input name='attr_max_alchemy' title='@{max_alchemy}' class='sheet-smallbox' type='number' value='0'><input name='attr_alchemy' title='@{alchemy}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{alchemy}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>CRAFTING*</label><input name='attr_max_crafting' title='@{max_crafting}' class='sheet-smallbox' type='number' value='0'><input name='attr_crafting' title='@{crafting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{crafting}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>DISGUISE</label><input name='attr_max_disguise' title='@{max_disguise}' class='sheet-smallbox' type='number' value='0'><input name='attr_disguise' title='@{disguise}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{disguise}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>FIRST AID</label><input name='attr_max_first_aid' title='@{max_first_aid}' class='sheet-smallbox' type='number' value='0'><input name='attr_first_aid' title='@{first_aid}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{first_aid}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>FORGERY</label><input name='attr_max_forgery' title='@{max_forgery}' class='sheet-smallbox' type='number' value='0'><input name='attr_forgery' title='@{forgery}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{forgery}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>PICK LOCK</label><input name='attr_max_pick_lock' title='@{max_pick_lock}' class='sheet-smallbox' type='number' value='0'><input name='attr_pick_lock' title='@{pick_lock}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{pick_lock}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>TRAP CRAFTING*</label><input name='attr_max_trap_crafting' title='@{max_trap_crafting}' class='sheet-smallbox' type='number' value='0'><input name='attr_trap_crafting' title='@{trap_crafting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{cra}[STAT]+@{trap_crafting}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_cra_total' type='hidden' value='[[0+(@{max_alchemy}*2)+(@{max_crafting}*2)+@{max_disguise}+@{max_first_aid}+@{max_forgery}+@{max_pick_lock}+(@{max_trap_crafting}*2)]]' disabled='true'>
         						</div>
         						
         						<label class='sheet-skilltitle-will'>WILL</label><input type="checkbox" name='attr_will_toggle' class="sheet-will-toggle"><span></span>
         						<div class='sheet-will-container'>
         							<label class='sheet-legend'> Maximum / Current</label><br />
-        							<label class='sheet-skilltitle'>COURAGE</label><input name='attr_max_courage' title='@{max_courage}' class='sheet-smallbox' type='number' value='0'><input name='attr_courage' title='@{courage}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{courage}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>HEX WEAVING*</label><input name='attr_max_hex_weaving' title='@{max_hex_weaving}' class='sheet-smallbox' type='number' value='0'><input name='attr_hex_weaving' title='@{hex_weaving}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{hex_weaving}?{EXTRA ACTION|No,+0|Yes,-3}+?{ADDITIONAL MODS?|0}]]}}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>INTIMIDATION</label><input name='attr_max_intimidation' title='@{max_intimidation}' class='sheet-smallbox' type='number' value='0'><input name='attr_intimidation' title='@{intimidation}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{intimidation}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>SPELL CASTING*</label><input name='attr_max_spell_casting' title='@{max_spell_casting}' class='sheet-smallbox' type='number' value='0'><input name='attr_spell_casting' title='@{spell_casting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{spell_casting}?{EXTRA ACTION|No,+0|Yes,-3}+?{SELECT FOCUS|@{spellfocus1},@{greaterfocus1_toggle}|@{spellfocus2},@{greaterfocus2_toggle}|@{spellfocus3},@{greaterfocus3_toggle}}?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Special,-2}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>RESIST MAGIC*</label><input name='attr_max_resist_magic' title='@{max_resist_magic}' class='sheet-smallbox' type='number' value='0'><input name='attr_resist_magic' title='@{resist_magic}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{resist_magic}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>RESIST COERCION</label><input name='attr_max_resist_coercion' title='@{max_resist_coercion}' class='sheet-smallbox' type='number' value='0'><input name='attr_resist_coercion' title='@{resist_coercion}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{resist_coercion}?{EXTRA ACTION|No,+0|Yes,-3}+?{SELECT FOCUS|@{spellfocus1},@{greaterfocus1_toggle}|@{spellfocus2},@{greaterfocus2_toggle}|@{spellfocus3},@{greaterfocus3_toggle}}+?{ADDITIONAL MODS?|0}]]}}'></button><br />
-        							<label class='sheet-skilltitle'>RITUAL CRAFTING*</label><input name='attr_max_ritual_crafting' title='@{max_ritual_crafting}' class='sheet-smallbox' type='number' value='0'><input name='attr_ritual_crafting' title='@{ritual_crafting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}+@{ritual_crafting}+?{SELECT FOCUS|@{spellfocus1},@{greaterfocus1_toggle}|@{spellfocus2},@{greaterfocus2_toggle}|@{spellfocus3},@{greaterfocus3_toggle}}+?{ADDITIONAL MODS?|0}]]}}]]}}'></button><br />
+        							<label class='sheet-skilltitle'>COURAGE</label><input name='attr_max_courage' title='@{max_courage}' class='sheet-smallbox' type='number' value='0'><input name='attr_courage' title='@{courage}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{courage}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>HEX WEAVING*</label><input name='attr_max_hex_weaving' title='@{max_hex_weaving}' class='sheet-smallbox' type='number' value='0'><input name='attr_hex_weaving' title='@{hex_weaving}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{hex_weaving}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+?{SELECT FOCUS|@{spellfocus1},@{greaterfocus1_toggle}|@{spellfocus2},@{greaterfocus2_toggle}|@{spellfocus3},@{greaterfocus3_toggle}}[GREATER FOCUS]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>INTIMIDATION</label><input name='attr_max_intimidation' title='@{max_intimidation}' class='sheet-smallbox' type='number' value='0'><input name='attr_intimidation' title='@{intimidation}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{intimidation}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>SPELL CASTING*</label><input name='attr_max_spell_casting' title='@{max_spell_casting}' class='sheet-smallbox' type='number' value='0'><input name='attr_spell_casting' title='@{spell_casting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{spell_casting}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+?{SELECT FOCUS|@{spellfocus1},@{greaterfocus1_toggle}|@{spellfocus2},@{greaterfocus2_toggle}|@{spellfocus3},@{greaterfocus3_toggle}}[GREATER FOCUS]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Special,-2}[LOCATION]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>RESIST MAGIC*</label><input name='attr_max_resist_magic' title='@{max_resist_magic}' class='sheet-smallbox' type='number' value='0'><input name='attr_resist_magic' title='@{resist_magic}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{resist_magic}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>RESIST COERCION</label><input name='attr_max_resist_coercion' title='@{max_resist_coercion}' class='sheet-smallbox' type='number' value='0'><input name='attr_resist_coercion' title='@{resist_coercion}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{resist_coercion}[SKILL]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
+        							<label class='sheet-skilltitle'>RITUAL CRAFTING*</label><input name='attr_max_ritual_crafting' title='@{max_ritual_crafting}' class='sheet-smallbox' type='number' value='0'><input name='attr_ritual_crafting' title='@{ritual_crafting}' class='sheet-smallbox' type='number' value='0'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics2} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10+@{will}[STAT]+@{ritual_crafting}[SKILL]+?{SELECT FOCUS|@{spellfocus1},@{greaterfocus1_toggle}|@{spellfocus2},@{greaterfocus2_toggle}|@{spellfocus3},@{greaterfocus3_toggle}}[GREATER FOCUS]+?{ADDITIONAL MODS?|0}[MOD]]]}}'></button><br />
         						    <input name='attr_will_total' type='hidden' value='[[0+@{max_courage}+(@{max_hex_weaving}*2)+@{max_intimidation}+(@{max_spell_casting}*2)+(@{max_resist_magic}*2)+@{max_resist_coercion}+(@{max_ritual_crafting}*2)]]' disabled='true'>
         						</div>
         					</div>