diff --git a/TheWitcher/witcherpreview.png b/TheWitcher/witcherpreview.png
index 26f1335875..c137f582ba 100644
Binary files a/TheWitcher/witcherpreview.png and b/TheWitcher/witcherpreview.png differ
diff --git a/TheWitcher/witchersheet.css b/TheWitcher/witchersheet.css
index 7859a1c10d..d4d9fdf628 100644
--- a/TheWitcher/witchersheet.css
+++ b/TheWitcher/witchersheet.css
@@ -425,7 +425,7 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
 
 /* SECTION TABS SETUP */
 
-.charsheet div[class^="sheet-section"] { 	
+.charsheet div[class^="sheet-section"] {
 	display: none;
 }
 
@@ -437,14 +437,14 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
 	display: block;
 }
 
-.charsheet input.sheet-tab99:checked ~ div[class^="sheet-section"] { 	
+.charsheet input.sheet-tab99:checked ~ div[class^="sheet-section"] {
 	display: block;
 }
 
 .charsheet input.sheet-tab {
     	width: 185px;
     	height: 40px;
-    	cursor: pointer;	
+    	cursor: pointer;
 	position: relative;
 	opacity: 0;
 	z-index: 9999;
@@ -454,7 +454,7 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
     	width: 185px;
     	height: 40px;
     	margin-left: 10px;
-    	cursor: pointer;	
+    	cursor: pointer;
 	position: relative;
 	opacity: 0;
 	z-index: 9999;
@@ -463,14 +463,14 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
 .charsheet span.sheet-tab {
 	text-align: center;
     display: inline-block;
-	font-size: 11px;	
+	font-size: 11px;
 	background: #c1c1c1;
 	color: #000;
 	font-weight: bold;
-	
+
 	width: 145px;
     	height: 40px;
-    	cursor: pointer;	
+    	cursor: pointer;
 	vertical-align: middle;
 	margin-left: -185px;
 	border:1px solid #000;
@@ -480,16 +480,16 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
 .charsheet span.sheet-tab-right {
 	text-align: center;
     	display: inline-block;
-	font-size: 11px;	
+	font-size: 11px;
 	background: #c1c1c1;
 	color: #000;
 	font-weight: bold;
 	border-top-right-radius: 50px;
     border-bottom-right-radius: 50px;
-	
+
 	width: 145px;
     	height: 40px;
-    	cursor: pointer;	
+    	cursor: pointer;
 	vertical-align: middle;
 	margin-left: -185px;
 	border:1px solid #000;
@@ -499,16 +499,16 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
 .charsheet span.sheet-tab-left {
 	text-align: center;
     	display: inline-block;
-	font-size: 11px;	
+	font-size: 11px;
 	background: #c1c1c1;
 	color: #000;
 	font-weight: bold;
 	border-top-left-radius: 50px;
     border-bottom-left-radius: 50px;
-	
+
 	width: 145px;
     	height: 40px;
-    	cursor: pointer;	
+    	cursor: pointer;
 	position: relative;
 	vertical-align: middle;
 	margin-left: -200px;
@@ -523,10 +523,10 @@ input[type="checkbox"].sheet-block-switch:checked + span::before {
 .charsheet input.sheet-tab4:checked + span.sheet-tab4,
 .charsheet input.sheet-tab5:checked + span.sheet-tab5,
 .charsheet input.sheet-tab99:checked + span.sheet-tab99 {
-    
+
     	background: #3d3d3d;
     	color: #FFF;
-    	
+
 }
 
 /* SHEET IMG TITLES */
@@ -568,7 +568,7 @@ select option {
 }
 
 .sheet-full-page {
-    
+
 }
 
 .sheet-top-grid {
@@ -605,7 +605,7 @@ label.sheet-legend-top {
 	width: 182px;
 	text-align: right;
 	font-size: 10px;
-    
+
 }
 
 label.sheet-legend {
@@ -685,6 +685,18 @@ label.sheet-toggle-whisper {
     z-index: 1;
 }
 
+label.sheet-toggle-skills {
+    display: inline-block;
+    margin-top: 20px;
+    margin-left: -5px;
+    font-size: 11px;
+    text-align: right;
+    color: #939393;
+    font-weight: 1;
+    width: 100px;
+    z-index: 1;
+}
+
 /* MAJOR STAT & CHARACTER SECTION */
 
 label.sheet-stattitle {
@@ -692,7 +704,7 @@ label.sheet-stattitle {
 	width: 90px;
 	text-align: right;
 	font-size: 14px;
-    
+
 }
 
 label.sheet-stattotal {
@@ -702,7 +714,7 @@ label.sheet-stattotal {
 	width: 75px;
 	text-align: right;
 	font-size: 12px;
-    
+
 }
 
 label.sheet-skilltotal {
@@ -720,7 +732,7 @@ label.sheet-stattitle2 {
 	margin-left: 25px;
 	text-align: right;
 	font-size: 14px;
-    
+
 }
 
 label.sheet-woundtitle {
@@ -1330,7 +1342,7 @@ label.sheet-helper-info {
 
 /* Mod Boxes & Skill Titles */
 
-.sheet-stat-mod-box label, 
+.sheet-stat-mod-box label,
 .sheet-combat-mod-box label,
 .sheet-button-box label {
     color: #FFFFFF;
@@ -1524,10 +1536,10 @@ span.sheet-main-skill-span2 {
 
 span.sheet-red1-skill-span2,
 span.sheet-red2-skill-span2,
-span.sheet-red3-skill-span2, 
+span.sheet-red3-skill-span2,
 span.sheet-green1-skill-span2,
 span.sheet-green2-skill-span2,
-span.sheet-green3-skill-span2, 
+span.sheet-green3-skill-span2,
 span.sheet-blue1-skill-span2,
 span.sheet-blue2-skill-span2,
 span.sheet-blue3-skill-span2 {
@@ -1962,7 +1974,7 @@ span.sheet-sixth-weapon-gradient {
 
 .sheet-primary-weapon-padding-container,
 .sheet-secondary-weapon-padding-container,
-.sheet-third-weapon-padding-container, 
+.sheet-third-weapon-padding-container,
 .sheet-fourth-weapon-padding-container,
 .sheet-fifth-weapon-padding-container,
 .sheet-sixth-weapon-padding-container {
@@ -2802,7 +2814,7 @@ label.sheet-vigor-title {
 	font-weight: 1;
 	font-size: 15px;
 	color: #FFF;
-    
+
 }
 
 label.sheet-cur-sta-title {
@@ -2813,7 +2825,7 @@ label.sheet-cur-sta-title {
 	font-weight: 1;
 	font-size: 15px;
 	color: #FFF;
-    
+
 }
 
 .sheet-vigor-total-container {
@@ -2926,7 +2938,8 @@ textarea.sheet-spellfocus-text {
 
 input[type="checkbox"].sheet-focus1-toggle,
 input[type="checkbox"].sheet-focus2-toggle,
-input[type="checkbox"].sheet-focus3-toggle {
+input[type="checkbox"].sheet-focus3-toggle,
+input[type="checkbox"].sheet-focus4-toggle  {
     opacity: 0;
     width: 30px;
     height: 25px;
@@ -2941,7 +2954,8 @@ input[type="checkbox"].sheet-focus3-toggle {
 
 input[type="checkbox"].sheet-focus1-toggle + span::before,
 input[type="checkbox"].sheet-focus2-toggle + span::before,
-input[type="checkbox"].sheet-focus3-toggle + span::before {
+input[type="checkbox"].sheet-focus3-toggle + span::before,
+input[type="checkbox"].sheet-focus4-toggle + span::before {
     margin-right: -20px;
     line-height: 14px;
     text-align: center;
@@ -2956,14 +2970,16 @@ input[type="checkbox"].sheet-focus3-toggle + span::before {
 
 input[type="checkbox"].sheet-focus1-toggle:checked + span::before,
 input[type="checkbox"].sheet-focus2-toggle:checked + span::before,
-input[type="checkbox"].sheet-focus3-toggle:checked + span::before {
+input[type="checkbox"].sheet-focus3-toggle:checked + span::before,
+input[type="checkbox"].sheet-focus4-toggle:checked + span::before {
     content: "►";
     color: #FFF;
 }
 
 input.sheet-focus1-toggle:checked ~ div.sheet-focus1-container,
 input.sheet-focus2-toggle:checked ~ div.sheet-focus2-container,
-input.sheet-focus3-toggle:checked ~ div.sheet-focus3-container {
+input.sheet-focus3-toggle:checked ~ div.sheet-focus3-container,
+input.sheet-focus4-toggle:checked ~ div.sheet-focus4-container {
     display: none;
 }
 
@@ -4052,7 +4068,7 @@ textarea.sheet-campaign-text {
     font-size: 16px;
 }
 
-button[type=roll].sheet-stat-roll { 
+button[type=roll].sheet-stat-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4065,20 +4081,20 @@ button[type=roll].sheet-stat-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-stat-roll:hover { 
+button[type=roll].sheet-stat-roll:hover {
     color: #5e0000;
     border-color: #5e0000;
     border: 1px solid;
 }
 
-button[type=roll].sheet-stat-roll:active { 
+button[type=roll].sheet-stat-roll:active {
     color: #bc0000;
     border-color: #bc0000;
     border: 1px solid;
     box-shadow: inset 1px 1px 1px 1px #5e0000;
 }
 
-/* save */
+/* death save */
 
 .charsheet button[type=roll].sheet-save-roll::before {
     font-family: "pictos";
@@ -4086,7 +4102,7 @@ button[type=roll].sheet-stat-roll:active {
     font-size: 25px;
 }
 
-button[type=roll].sheet-save-roll { 
+button[type=roll].sheet-save-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4101,13 +4117,49 @@ button[type=roll].sheet-save-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-save-roll:hover { 
+button[type=roll].sheet-save-roll:hover {
     color: #6d1a02;
     border-color: #6d1a02;
     border: 1px solid;
 }
 
-button[type=roll].sheet-save-roll:active { 
+button[type=roll].sheet-save-roll:active {
+    color: #ff3700;
+    border-color: #ff3700;
+    border: 1px solid;
+    box-shadow: inset 2px 1px 1px 1px #6d1a02;
+}
+
+/* stun save */
+
+.charsheet button[type=roll].sheet-stun-roll::before {
+    font-family: "pictos";
+    content: "S";
+    font-size: 25px;
+}
+
+button[type=roll].sheet-stun-roll {
+    color: #000;
+    background-color: #e8e8e8;
+    text-align: center;
+    font-weight: bold;
+    padding-top: 4px;
+    margin-top: 2px;
+    width:30px;
+    height:30px;
+    border-radius: 100px;
+    border-color: #000;
+    border: 1px solid;
+    box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
+}
+
+button[type=roll].sheet-stun-roll:hover {
+    color: #6d1a02;
+    border-color: #6d1a02;
+    border: 1px solid;
+}
+
+button[type=roll].sheet-stun-roll:active {
     color: #ff3700;
     border-color: #ff3700;
     border: 1px solid;
@@ -4122,7 +4174,7 @@ button[type=roll].sheet-save-roll:active {
     font-size: 25px;
 }
 
-button[type=roll].sheet-initiative-roll { 
+button[type=roll].sheet-initiative-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4137,13 +4189,13 @@ button[type=roll].sheet-initiative-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-initiative-roll:hover { 
+button[type=roll].sheet-initiative-roll:hover {
     color: #026d52;
     border-color: #026d52;
     border: 1px solid;
 }
 
-button[type=roll].sheet-initiative-roll:active { 
+button[type=roll].sheet-initiative-roll:active {
     color: #02ffbf;
     border-color: #02ffbf;
     border: 1px solid;
@@ -4158,7 +4210,7 @@ button[type=roll].sheet-initiative-roll:active {
     font-size: 23px;
 }
 
-button[type=roll].sheet-critical-roll { 
+button[type=roll].sheet-critical-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4173,13 +4225,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-critical-roll:hover {
     color: #968754;
     border-color: #968754;
     border: 1px solid;
 }
 
-button[type=roll].sheet-critical-roll:active { 
+button[type=roll].sheet-critical-roll:active {
     color: #ffe387;
     border-color: #ffe387;
     border: 1px solid;
@@ -4195,7 +4247,7 @@ button[type=roll].sheet-critical-roll:active {
     font-size: 24px;
 }
 
-button[type=roll].sheet-target-roll { 
+button[type=roll].sheet-target-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4210,13 +4262,13 @@ button[type=roll].sheet-target-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-target-roll:hover { 
+button[type=roll].sheet-target-roll:hover {
     color: #546696;
     border-color: #546696;
     border: 1px solid;
 }
 
-button[type=roll].sheet-target-roll:active { 
+button[type=roll].sheet-target-roll:active {
     color: #8eacff;
     border-color: #8eacff;
     border: 1px solid;
@@ -4233,7 +4285,7 @@ button[type=roll].sheet-target-roll:active {
     display: block;
 }
 
-button[type=roll].sheet-prof-skill-roll { 
+button[type=roll].sheet-prof-skill-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4247,13 +4299,13 @@ button[type=roll].sheet-prof-skill-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-prof-skill-roll:hover { 
+button[type=roll].sheet-prof-skill-roll:hover {
     color: #828282;
     border-color: #828282;
     border: 1px solid;
 }
 
-button[type=roll].sheet-prof-skill-roll:active { 
+button[type=roll].sheet-prof-skill-roll:active {
     color: #afafaf;
     border-color: #afafaf;
     border: 1px solid;
@@ -4268,7 +4320,7 @@ button[type=roll].sheet-prof-skill-roll:active {
     font-weight: bold;
 }
 
-button[type=roll].sheet-weapon-damage-roll { 
+button[type=roll].sheet-weapon-damage-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4280,13 +4332,13 @@ button[type=roll].sheet-weapon-damage-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-weapon-damage-roll:hover { 
+button[type=roll].sheet-weapon-damage-roll:hover {
     color: #750000;
     border-color: #750000;
     border: 1px solid;
 }
 
-button[type=roll].sheet-weapon-damage-roll:active { 
+button[type=roll].sheet-weapon-damage-roll:active {
     color: #cc0000;
     border-color: #cc0000;
     border: 1px solid;
@@ -4301,7 +4353,7 @@ button[type=roll].sheet-weapon-damage-roll:active {
     font-size: 18px;
 }
 
-button[type=roll].repeating_spell_damage_roll { 
+button[type=roll].repeating_spell_damage_roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4314,13 +4366,13 @@ button[type=roll].repeating_spell_damage_roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].repeating_spell_damage_roll:hover { 
+button[type=roll].repeating_spell_damage_roll:hover {
     color: #9a1e50;
     border-color: #9a1e50;
     border: 1px solid;
 }
 
-button[type=roll].repeating_spell_damage_roll:active { 
+button[type=roll].repeating_spell_damage_roll:active {
     color: #ff0c6e;
     border-color: #ff0c6e;
     border: 1px solid;
@@ -4335,7 +4387,7 @@ button[type=roll].repeating_spell_damage_roll:active {
     font-size: 18px;
 }
 
-button[type=roll].repeating_ritual_damage_roll { 
+button[type=roll].repeating_ritual_damage_roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4348,13 +4400,13 @@ button[type=roll].repeating_ritual_damage_roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].repeating_ritual_damage_roll:hover { 
+button[type=roll].repeating_ritual_damage_roll:hover {
     color: #7f682b;
     border-color: #7f682b;
     border: 1px solid;
 }
 
-button[type=roll].repeating_ritual_damage_roll:active { 
+button[type=roll].repeating_ritual_damage_roll:active {
     color: #ffce49;
     border-color: #ffce49;
     border: 1px solid;
@@ -4369,7 +4421,7 @@ button[type=roll].repeating_ritual_damage_roll:active {
     font-size: 18px;
 }
 
-button[type=roll].repeating_hex_damage_roll { 
+button[type=roll].repeating_hex_damage_roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4382,13 +4434,13 @@ button[type=roll].repeating_hex_damage_roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].repeating_hex_damage_roll:hover { 
+button[type=roll].repeating_hex_damage_roll:hover {
     color: #748718;
     border-color: #748718;
     border: 1px solid;
 }
 
-button[type=roll].repeating_hex_damage_roll:active { 
+button[type=roll].repeating_hex_damage_roll:active {
     color: #dafc2f;
     border-color: #dafc2f;
     border: 1px solid;
@@ -4403,7 +4455,7 @@ button[type=roll].repeating_hex_damage_roll:active {
     font-size: 18px;
 }
 
-button[type=roll].sheet-rep-roll { 
+button[type=roll].sheet-rep-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -4416,13 +4468,13 @@ button[type=roll].sheet-rep-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-rep-roll:hover { 
+button[type=roll].sheet-rep-roll:hover {
     color: #2a72a3;
     border-color: #2a72a3;
     border: 1px solid;
 }
 
-button[type=roll].sheet-rep-roll:active { 
+button[type=roll].sheet-rep-roll:active {
     color: #42b2ff;
     border-color: #42b2ff;
     border: 1px solid;
@@ -4437,7 +4489,7 @@ button[type=roll].sheet-rep-roll:active {
     font-size: 17px;
 }
 
-button[type=roll].repeating_npc_skill_roll { 
+button[type=roll].repeating_npc_skill_roll {
     color: #000;
     display: inline-block;
     background-color: #e8e8e8;
@@ -4452,13 +4504,13 @@ button[type=roll].repeating_npc_skill_roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].repeating_npc_skill_roll:hover { 
+button[type=roll].repeating_npc_skill_roll:hover {
     color: #878787;
     border-color: #878787;
     border: 1px solid;
 }
 
-button[type=roll].repeating_npc_skill_roll:active { 
+button[type=roll].repeating_npc_skill_roll:active {
     color: #d6d6d6;
     border-color: #d6d6d6;
     border: 1px solid;
diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index 8d04944e63..4e804d54ac 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -3,29 +3,30 @@
     <div class='sheet-filter'>
         <label class='sheet-toggle-whisper'>WHISPER ROLLS?</label><input type="checkbox" name='attr_whisper' class="sheet-whisper-checkbox" value='/w gm '><span></span>
         <label class='sheet-toggle-npc'>NPC SHEET?</label><input type="checkbox" name='attr_pc_npc_toggle' class="sheet-block-switch"><span></span>
+        <label class='sheet-toggle-skills'>COUNT x2 SKILLS</label><input type="checkbox" name='attr_cc_skills' class="sheet-whisper-checkbox" title='Difficult skills cost extra points.&#10;Checking this will add these extra points towards your skill total.' value='1'><span></span>
 
         <div class="sheet-block-pc" style='margin-top: 90px;'>
         	<!-----Name, Stats & Character Module----->
         	<div class='sheet-top-grid'>
         		<div class='sheet-grid-item'>
         			<label class='sheet-legend-top' style='margin-left: 15px;' title='MAX = The maximum of that stat/skill. This is to remind players of what it was before if it is modified in Current. | CURRENT = The stat/skill that is used for a roll. Change this to reflect long term bonuses or penalties to skills. Use the Stat Modifier box for changes to a stat.'>Maximum / Current</label><br />
-        			<label class='sheet-stattitle'>INT</label><input name='attr_total_int' title='@{total_int}' class='sheet-smallbox' type='number' value='0'><input name='attr_int' title='@{int}' class='sheet-smallbox' type='text' value='[[floor((@{total_int}+@{stat_mod_int})@{wound_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=INT SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{int}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>REF</label><input name='attr_total_ref' title='@{total_ref}' class='sheet-smallbox' type='number' value='0'><input name='attr_ref' title='@{ref}' class='sheet-smallbox' type='text' value='[[floor((@{total_ref}+@{stat_mod_ref})@{wound_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=REF SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{ref}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>DEX</label><input name='attr_total_dex' title='@{total_dex}' class='sheet-smallbox' type='number' value='0'><input name='attr_dex' title='@{dex}' class='sheet-smallbox' type='text' value='[[floor((@{total_dex}+@{stat_mod_dex})@{wound_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=DEX SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{dex}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>BODY</label><input name='attr_total_body' title='@{total_body}' class='sheet-smallbox' type='number' value='0'><input name='attr_body' title='@{body}' class='sheet-smallbox' type='text' value='[[floor((@{total_body}+@{stat_mod_body})@{death_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=BODY SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{body}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>SPD</label><input name='attr_total_spd' title='@{total_spd}' class='sheet-smallbox' type='number' value='0'><input name='attr_spd' title='@{spd}' class='sheet-smallbox' type='text' value='[[floor((@{total_spd}+@{stat_mod_spd})@{death_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=SPD SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{spd}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>EMP</label><input name='attr_total_emp' title='@{total_emp}' class='sheet-smallbox' type='number' value='0'><input name='attr_emp' title='@{emp}' class='sheet-smallbox' type='text' value='[[floor((@{total_emp}+@{stat_mod_emp})@{death_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=EMP SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{emp}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>CRA</label><input name='attr_total_cra' title='@{total_cra}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra' title='@{cra}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra}+@{stat_mod_cra})@{death_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=CRA SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{cra}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>WILL</label><input name='attr_total_will' title='@{total_will}' class='sheet-smallbox' type='number' value='0'><input name='attr_will' title='@{will}' class='sheet-smallbox' type='text' value='[[floor((@{total_will}+@{stat_mod_will})@{wound_mod})]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=WILL SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{will}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle'>LUCK</label><input name='attr_total_luck' title='@{total_luck}' class='sheet-smallbox' type='number' value='0'><input name='attr_luck' title='@{luck}' class='sheet-smallbox' type='text' value='0'><br />
-        			<label class='sheet-stattotal'>STAT TOTAL</label><input name='attr_max_stat_total' class='sheet-smallbox' type='text' value='[[0+@{total_int}+@{ref}+@{total_dex}+@{total_body}+@{total_spd}+@{total_emp}+@{total_cra}+@{total_will}+@{total_luck}]]' disabled='true'>
-        				
+        			<label class='sheet-stattitle'>INT</label><input name='attr_total_int' title='@{total_int}' class='sheet-smallbox' type='number' value='1'><input name='attr_int' title='@{int}' class='sheet-smallbox' type='text' value='[[((floor((@{total_int}+@{stat_mod_int})@{wound_mod})+1)+abs((floor((@{total_int}+@{stat_mod_int})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=INT SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{int}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>REF</label><input name='attr_total_ref' title='@{total_ref}' class='sheet-smallbox' type='number' value='1'><input name='attr_ref' title='@{ref}' class='sheet-smallbox' type='text' value='[[((floor((@{total_ref}+@{stat_mod_ref})@{wound_mod})+1)+abs((floor((@{total_ref}+@{stat_mod_ref})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=REF SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{ref}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>DEX</label><input name='attr_total_dex' title='@{total_dex}' class='sheet-smallbox' type='number' value='1'><input name='attr_dex' title='@{dex}' class='sheet-smallbox' type='text' value='[[((floor((@{total_dex}+@{stat_mod_dex})@{wound_mod})+1)+abs((floor((@{total_dex}+@{stat_mod_dex})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=DEX SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{dex}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>BODY</label><input name='attr_total_body' title='@{total_body}' class='sheet-smallbox' type='number' value='1'><input name='attr_body' title='@{body}' class='sheet-smallbox' type='text' value='[[((floor((@{total_body}+@{stat_mod_body})@{wound_mod})+1)+abs((floor((@{total_body}+@{stat_mod_body})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=BODY SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{body}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>SPD</label><input name='attr_total_spd' title='@{total_spd}' class='sheet-smallbox' type='number' value='1'><input name='attr_spd' title='@{spd}' class='sheet-smallbox' type='text' value='[[((floor((@{total_spd}+@{stat_mod_spd})@{wound_mod})+1)+abs((floor((@{total_spd}+@{stat_mod_spd})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=SPD SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{spd}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>EMP</label><input name='attr_total_emp' title='@{total_emp}' class='sheet-smallbox' type='number' value='1'><input name='attr_emp' title='@{emp}' class='sheet-smallbox' type='text' value='[[((floor((@{total_emp}+@{stat_mod_emp})@{wound_mod})+1)+abs((floor((@{total_emp}+@{stat_mod_emp})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=EMP SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{emp}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>CRA</label><input name='attr_total_cra' title='@{total_cra}' class='sheet-smallbox' type='number' value='1'><input name='attr_cra' title='@{cra}' class='sheet-smallbox' type='text' value='[[((floor((@{total_cra}+@{stat_mod_cra})@{wound_mod})+1)+abs((floor((@{total_cra}+@{stat_mod_cra})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=CRA SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{cra}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>WILL</label><input name='attr_total_will' title='@{total_will}' class='sheet-smallbox' type='number' value='1'><input name='attr_will' title='@{will}' class='sheet-smallbox' type='text' value='[[((floor((@{total_will}+@{stat_mod_will})@{wound_mod})+1)+abs((floor((@{total_will}+@{stat_mod_will})@{wound_mod}))-1))/2]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{title=WILL SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{will}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle'>LUCK</label><input name='attr_total_luck' title='@{total_luck}' class='sheet-smallbox' type='number' value='1'><input name='attr_luck' title='@{luck}' class='sheet-smallbox' type='text' value='0'><br />
+        			<label class='sheet-stattotal'>STAT TOTAL</label><input name='attr_max_stat_total' class='sheet-smallbox' type='text' value='[[0+@{total_int}+@{total_ref}+@{total_dex}+@{total_body}+@{total_spd}+@{total_emp}+@{total_cra}+@{total_will}+@{total_luck}]]' disabled='true'>
+
         				<!-- STAT SWITCHBOARD, KEEP HIDDEN -->
         				<input name='attr_wound_mod' type='hidden' value=''>
         				<input name='attr_death_mod' type='hidden' value=''>
         				<input name='attr_physical_mod' type='hidden' value='floor((@{body}+@{will})/2)' disabled='true'>
         				<!-- END SWITCHBOARD -->
-        		
+
         		</div>
         		<div class='sheet-character-box' style='margin-left: 10px;'>
         			<img class='sheet-logo' src='https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/witcher_player_motif.png'><br />
@@ -36,12 +37,11 @@
         			<label class='sheet-proftitle'>PROF</label><input name='attr_char_prof' class='sheet-prof-box' type='text'>
         			<label class='sheet-origintitle'>ORIGIN</label><input name='attr_char_origin' class='sheet-origin-box' type='text'><br />
         			<label style='font-size: 9px; margin-left: 5px;'>Note: Wound Threshold & Death State are automatically applied. Increase 'Current' HP above your 'Wound Threshold' to see stats at their full value.</label>
-        				
+
         		</div>
         		<div class='sheet-grid-item' style='margin-left: 10px;'>
         			<label class='sheet-legend-top' style='margin-left: 14px;' title='MAX = The maximum of that stat/skill. This is to remind players of what it was before if it is modified in Current. | CURRENT = The stat/skill that is used for a roll. Change this to reflect long term bonuses or penalties to skills. Use the Stat Modifier box for changes to a stat.'> Maximum / Current</label><br />
-        			<label class='sheet-stattitle'>STUN</label><input name='attr_stun_max' title='@{stun_max}' class='sheet-smallbox' type='text' value='floor(((@{total_body}+@{stat_mod_body})+(@{total_will}+@{stat_mod_will}))/2)' disabled='true'><input name='attr_stun' title='@{stun}' class='sheet-smallbox' type='number' value='0'>
-        			<label class='sheet-stattitle'>RUN</label><input name='attr_run_max' title='@{run_max}' class='sheet-smallbox' type='text' value='floor(@{spd}*3)' disabled='true'><input name='attr_run' title='@{run}' class='sheet-smallbox' type='number' value='0'><br>
+              <label class='sheet-stattitle'>STUN</label><input name='attr_stun_max' title='@{stun_max}' class='sheet-smallbox' type='text' value='floor(((@{total_body}+@{stat_mod_body})+(@{total_will}+@{stat_mod_will}))/2)' disabled='true'><input name='attr_stun' title='@{stun}' class='sheet-smallbox' type='number' value='0'>        			<label class='sheet-stattitle'>RUN</label><input name='attr_run_max' title='@{run_max}' class='sheet-smallbox' type='text' value='floor(@{spd}*3)' disabled='true'><input name='attr_run' title='@{run}' class='sheet-smallbox' type='number' value='0'><br>
         			<label class='sheet-stattitle'>LEAP</label><input name='attr_leap_max' title='@{leap_max}' class='sheet-smallbox' type='text' value='floor(@{run}/5)' disabled='true'><input name='attr_leap' title='@{leap}' class='sheet-smallbox' type='number' value='0'><br>
         			<label class='sheet-stattitle'>HP</label><input name='attr_hp_max' title='@{hp_max}' class='sheet-smallbox2' type='text' value='floor(@{physical_mod}*5)' disabled='true'><input name='attr_hp' title='@{hp}' class='sheet-smallbox2' type='number' value='0'><br>
         			<label class='sheet-stattitle'>STA</label><input name='attr_sta_max' title='@{sta_max}' class='sheet-smallbox2' type='text' value='floor(@{physical_mod}*5)' disabled='true'><input name='attr_sta' title='@{sta}' class='sheet-smallbox2' type='number' value='0'><br>
@@ -52,20 +52,20 @@
         			<label class='sheet-woundtitle'>BONUS MELEE DMG.</label><input name='attr_bonus_damage'  title='@{bonus_damage}' class='sheet-smallbox-wound' type='text' value='@{bonus_mod}' disabled='true'>
         		</div>
         	</div>
-        
+
         	<div style='width: 840px; margin-left: 55px; margin-top: 40px;'>
         		<!-- Set up the Tabs -->
-        		<input type="radio" class="sheet-tab-1 sheet-tab1" name="attr_core-tab" value="1" title="Skills & Modifiers" checked="checked"/> 
+        		<input type="radio" class="sheet-tab-1 sheet-tab1" name="attr_core-tab" value="1" title="Skills & Modifiers" checked="checked"/>
         		<span class="sheet-tab-left sheet-tab1" style='line-height: 40px;'>SKILLS & MODIFIERS</span>
-        		<input type="radio" class="sheet-tab sheet-tab2" name="attr_core-tab" value="2" title="Profession Skills"/> 
+        		<input type="radio" class="sheet-tab sheet-tab2" name="attr_core-tab" value="2" title="Profession Skills"/>
         		<span class="sheet-tab sheet-tab2" style='line-height: 40px;'>PROFESSION SKILLS</span>
-        		<input type="radio" class="sheet-tab sheet-tab3" name="attr_core-tab" value="3" title="Gear & Inventory"/> 
+        		<input type="radio" class="sheet-tab sheet-tab3" name="attr_core-tab" value="3" title="Gear & Inventory"/>
         		<span class="sheet-tab sheet-tab3" style='line-height: 40px;'>GEAR & INVENTORY</span>
-        		<input type="radio" class="sheet-tab sheet-tab4" name="attr_core-tab" value="4" title="Magic & Spells"/> 
+        		<input type="radio" class="sheet-tab sheet-tab4" name="attr_core-tab" value="4" title="Magic & Spells"/>
         		<span class="sheet-tab sheet-tab4" style='line-height: 40px;'>MAGIC & SPELLS</span>
-        		<input type="radio" class="sheet-tab sheet-tab5" name="attr_core-tab" value="5" title="Background"/> 
+        		<input type="radio" class="sheet-tab sheet-tab5" name="attr_core-tab" value="5" title="Background"/>
         		<span class="sheet-tab-right sheet-tab5" style='line-height: 40px;'>BACKGROUND</span>
-        		
+
         	<!-----Skills Section----->
         		<div class="sheet-section-skills" style='margin-left: -10px;'>
         			<div class='sheet-middle-grid' style='margin-top: 20px;'>
@@ -87,9 +87,9 @@
         							<label class='sheet-skilltitle'>TACTICS*</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         							<label class='sheet-skilltitle'>TEACHING</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         							<label class='sheet-skilltitle'>WILDERNESS SURVIVAL</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
-        						    <input name='attr_int_total' type='hidden' value='[[0+@{awareness}+@{business}+@{deduction}+@{education}+@{nordling}+@{elder_speech}+@{dwarven}+@{monster_lore}+@{social_etiquette}+@{streetwise}+@{tactics}+@{teaching}+@{wilderness_survival}]]' disabled='true'>
+        						    <input name='attr_int_total' type='hidden' value='[[0+@{awareness}+@{business}+@{deduction}+@{education}+(@{nordling}+@{nordling}*@{cc_skills})+(@{elder_speech}+@{elder_speech}*@{cc_skills})+(@{dwarven}+@{dwarven}*@{cc_skills})+(@{monster_lore}+@{monster_lore}*@{cc_skills})+@{social_etiquette}+@{streetwise}+(@{tactics}+@{tactics}*@{cc_skills})+@{teaching}+@{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-skilltitle'>BRAWLING</label><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;Joint&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/Tail/Wing&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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
@@ -102,7 +102,7 @@
         							<label class='sheet-skilltitle'>SWORDSMANSHIP</label><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;Joint&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/Tail/Wing&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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         						    <input name='attr_ref_total' type='hidden' value='[[0+@{brawling}+@{dodge_escape}+@{melee}+@{riding}+@{sailing}+@{small_blades}+@{staff_spear}+@{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-skilltitle'>ARCHERY</label><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/Tail/Wingl&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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
@@ -113,7 +113,7 @@
         						    <input name='attr_dex_total' type='hidden' value='[[0+@{archery}+@{athletics}+@{crossbow}+@{sleight_of_hand}+@{stealth}]]' disabled='true'>
         						</div>
         						<hr style='border: 0.5px solid #5e0000; margin-left: 50px; margin-right: 40px; margin-top: 10px; margin-bottom: 10px;'>
-        						<label class='sheet-skilltotal'>SKILL TOTAL</label><input name='attr_max_skill_total' class='sheet-smallbox' type='text' value='[[0+@{int_total}+@{ref_total}+@{dex_total}+@{body_total}+@{emp_total}+@{cra_total}+@{will_total}]]' disabled='true'>
+        						<label class='sheet-skilltotal'>SKILL TOTAL</label><input name='attr_max_skill_total' class='sheet-smallbox' type='text' value='[[0+@{int_total}+@{ref_total}+@{dex_total}+@{body_total}+@{emp_total}+@{cra_total}+@{will_total}+@{prof_main_stat}+@{prof_blue1_stat}+@{prof_blue2_stat}+@{prof_blue3_stat}+@{prof_green1_stat}+@{prof_green2_stat}+@{prof_green3_stat}+@{prof_red1_stat}+@{prof_red2_stat}+@{prof_red3_stat}]]' disabled='true'>
         					</div>
         					<div class='sheet-grid-item' style='margin-left: -30px; margin-right: 10px; margin-top: 10px;'>
         						<label class='sheet-skilltitle-body'>BODY</label><input type="checkbox" name='attr_body_toggle' class="sheet-body-toggle"><span></span>
@@ -122,7 +122,7 @@
         							<label class='sheet-skilltitle'>ENDURANCE</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         						    <input name='attr_body_total' type='hidden' value='[[0+@{physique}+@{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-skilltitle'>CHARISMA</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
@@ -137,7 +137,7 @@
         							<label class='sheet-skilltitle'>SEDUCTION</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         						    <input name='attr_emp_total' type='hidden' value='[[0+@{charisma}+@{deceit}+@{fine_arts}+@{gambling}+@{grooming_and_style}+@{human_perception}+@{leadership}+@{persuasion}+@{performance}+@{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-skilltitle'>ALCHEMY*</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
@@ -147,9 +147,9 @@
         							<label class='sheet-skilltitle'>FORGERY</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         							<label class='sheet-skilltitle'>PICK LOCK</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         							<label class='sheet-skilltitle'>TRAP CRAFTING*</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
-        						    <input name='attr_cra_total' type='hidden' value='[[0+@{alchemy}+@{crafting}+@{disguise}+@{first_aid}+@{forgery}+@{pick_lock}+@{trap_crafting}]]' disabled='true'>
+        						    <input name='attr_cra_total' type='hidden' value='[[0+(@{alchemy}+@{alchemy}*@{cc_skills})+(@{crafting}+@{crafting}*@{cc_skills})+@{disguise}+@{first_aid}+@{forgery}+@{pick_lock}+(@{trap_crafting}+@{trap_crafting}*@{cc_skills})]]' 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-skilltitle'>COURAGE</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
@@ -159,7 +159,7 @@
         							<label class='sheet-skilltitle'>RESIST MAGIC*</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         							<label class='sheet-skilltitle'>RESIST COERCION</label><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? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
         							<label class='sheet-skilltitle'>RITUAL CRAFTING*</label><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]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button><br />
-        						    <input name='attr_will_total' type='hidden' value='[[0+@{courage}+@{hex_weaving}+@{intimidation}+@{spell_casting}+@{resist_magic}+@{resist_coercion}+@{ritual_crafting}]]' disabled='true'>
+        						    <input name='attr_will_total' type='hidden' value='[[0+@{courage}+(@{hex_weaving}+@{hex_weaving}*@{cc_skills})+@{intimidation}+(@{spell_casting}+@{spell_casting}*@{cc_skills})+(@{resist_magic}+@{resist_magic}*@{cc_skills})+@{resist_coercion}+(@{ritual_crafting}+@{ritual_crafting}*@{cc_skills})]]' disabled='true'>
         						</div>
         					</div>
         				</div>
@@ -182,7 +182,7 @@
         						<label class='sheet-quick-button-maintitle'>QUICK ROLL BUTTONS</label><br />
         						<hr style='margin-bottom: 10px; margin-top: 5px;'>
         						<label class='sheet-initiativetitle'>INITIATIVE</label><button class='sheet-initiative-roll' type='roll' value= '@{whisper}&{template:initiative} {{title=INITIATIVE}} {{name=@{character_name}}} {{roll=[[1d10+@{ref}[STAT]&{tracker}]]}}'></button><br />
-        						<label class='sheet-savetitle'>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}]].}} {{roll=[[1d10]]}}'></button><br />
+                    <label class='sheet-savetitle'>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}]].}} {{roll=[[1d10]]}}'></button><br />
         						<label class='sheet-crittitle'>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-locationtitle'>TARGET LOCATION</label><button class='sheet-target-roll' type='roll' value= '@{whisper}&{template:target} {{title=TARGET LOCATION}} {{name=@{character_name}}} {{roll=[[1d10]]}}'></button>
         					</div>
@@ -207,7 +207,7 @@
         			</div>
         			<hr>
         		</div title='skills-tab-close'>
-        
+
         		<!----- Profession Abilities ------>
         		<div class="sheet-section-abilities" style='margin-left: -10px;'>
         		    <div class='sheet-middle-grid' style='margin-top: 20px;'>
@@ -220,7 +220,7 @@
         					</div>
         				</div>
         			</div>
-        			
+
         			        <span class='sheet-main-skill-span'><input style='margin-left: 210px;' class='sheet-prof-main-name' type='text' name='attr_prof_main_name' value='Main Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_main_choice'>
 				                <option value='0'>(N/A)</option>
@@ -235,10 +235,10 @@
 				            </select></span><br />
 				            <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'>SKILL LEVEL</label>
-				            <input class='sheet-prof-skill-stat' name='attr_prof_main_stat' title='@{prof_main_stat}' type='text' value='0'>
+				            <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>
 				            </span>
-				            
+
 				    <div class='sheet-middle-skill-grid' style='margin-left: -10px; margin-right: 40px;'>
 				        <div class='sheet-grid-item'>
 				            <span class='sheet-blue1-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue1_name' value='1st Skill Name...'>
@@ -258,7 +258,7 @@
 				            <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>
 				            </span>
-				            
+
 				            <span class='sheet-blue2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue2_name' value='2nd Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_blue2_choice'>
 				                <option value='0'>(N/A)</option>
@@ -276,7 +276,7 @@
 				            <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>
 				            </span>
-				            
+
 				            <span class='sheet-blue3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue3_name' value='3rd Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_blue3_choice'>
 				                <option value='0'>(N/A)</option>
@@ -295,7 +295,7 @@
 				            <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>
-				        
+
 				        <div class='sheet-grid-item'>
 				            <span class='sheet-green1-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green1_name' value='1st Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_green1_choice'>
@@ -314,7 +314,7 @@
 				            <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>
 				            </span>
-				            
+
 				            <span class='sheet-green2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green2_name' value='2nd Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_green2_choice'>
 				                <option value='0'>(N/A)</option>
@@ -332,7 +332,7 @@
 				            <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>
 				            </span>
-				            
+
 				            <span class='sheet-green3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green3_name' value='3rd Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_green3_choice'>
 				                <option value='0'>(N/A)</option>
@@ -351,7 +351,7 @@
 				            <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>
-				        
+
 				        <div class='sheet-grid-item'>
 				            <span class='sheet-red1-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red1_name' value='1st Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_red1_choice'>
@@ -370,7 +370,7 @@
 				            <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>
 				            </span>
-				            
+
 				            <span class='sheet-red2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red2_name' value='2nd Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_red2_choice'>
 				                <option value='0'>(N/A)</option>
@@ -388,7 +388,7 @@
 				            <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>
 				            </span>
-				            
+
 				            <span class='sheet-red3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red3_name' value='3rd Skill Name...'>
 				            <select class='sheet-prof-skill-choice' name='attr_prof_red3_choice'>
 				                <option value='0'>(N/A)</option>
@@ -409,9 +409,9 @@
 				        </div>
 				    </div>
         		</div title='abilities-tab-close'>
-        
+
         		<!------ Arms, Gear & Bags ------>
-        		<div class="sheet-section-gear" style='margin-left: -10px;'>	
+        		<div class="sheet-section-gear" style='margin-left: -10px;'>
         			<div class='sheet-middle-grid' style='margin-top: 20px;'>
         				<div class='sheet-grid-column'>
         					<img class='sheet-top-title-image' src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/TheWitcher/images/gear_and_inventory.png"><br />
@@ -455,7 +455,7 @@
         						<label class='sheet-weapon-effect'>EFFECT</label><input name='attr_primary_weapon_effect' class='sheet-weapon-effect-element' type='text'><br />
         						<label class='sheet-weapon-enhancement'>ENHANCEMENT</label><input name='attr_primary_weapon_enhancement' class='sheet-weapon-enhancement-element' type='text'>
         					</div>
-        							
+
         					<span class='sheet-secondary-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_secondary_weapon_name" value='2nd'/></span>
         					<label class='sheet-weapon-reliability'>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>
@@ -495,7 +495,7 @@
         						<label class='sheet-weapon-effect'>EFFECT</label><input name='attr_secondary_weapon_effect' class='sheet-weapon-effect-element' type='text'><br />
         						<label class='sheet-weapon-enhancement'>ENHANCEMENT</label><input name='attr_secondary_weapon_enhancement' class='sheet-weapon-enhancement-element' type='text'>
         					</div>
-        							
+
         					<span class='sheet-third-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_third_weapon_name" value='3rd'/></span>
         					<label class='sheet-weapon-reliability'>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>
@@ -535,7 +535,7 @@
         						<label class='sheet-weapon-effect'>EFFECT</label><input name='attr_third_weapon_effect' class='sheet-weapon-effect-element' type='text'><br />
         						<label class='sheet-weapon-enhancement'>ENHANCEMENT</label><input name='attr_third_weapon_enhancement' class='sheet-weapon-enhancement-element' type='text'>
         					</div>
-        							
+
         					<span class='sheet-fourth-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_fourth_weapon_name" value='4th'/></span>
         					<label class='sheet-weapon-reliability'>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>
@@ -575,7 +575,7 @@
         						<label class='sheet-weapon-effect'>EFFECT</label><input name='attr_fourth_weapon_effect' class='sheet-weapon-effect-element' type='text'><br />
         						<label class='sheet-weapon-enhancement'>ENHANCEMENT</label><input name='attr_fourth_weapon_enhancement' class='sheet-weapon-enhancement-element' type='text'>
         					</div>
-        							
+
         					<span class='sheet-fifth-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_fifth_weapon_name" value='5th'/></span>
         					<label class='sheet-weapon-reliability'>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>
@@ -615,7 +615,7 @@
         						<label class='sheet-weapon-effect'>EFFECT</label><input name='attr_fifth_weapon_effect' class='sheet-weapon-effect-element' type='text'><br />
         						<label class='sheet-weapon-enhancement'>ENHANCEMENT</label><input name='attr_fifth_weapon_enhancement' class='sheet-weapon-enhancement-element' type='text'>
         					</div>
-        					    
+
         					<span class='sheet-sixth-weapon-gradient'><input class='sheet-weapon-name' type="text" name="attr_sixth_weapon_name" value='6th'/></span>
         					<label class='sheet-weapon-reliability'>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>
@@ -664,7 +664,7 @@
         					    <input name='attr_kick' class='sheet-unarmed-dmg-element' type='text' value='1d6'>
         					    <input name='attr_k_mod' class='sheet-unarmed-element' type='text' value='@{kick_mod}' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:punchkick} {{title=KICK}} {{name=@{character_name}}} {{roll=[[@{kick}@{kick_mod}]]}}'></button>
         					</div>
-        				</div>			
+        				</div>
         				<div class='sheet-grid-column' style='margin-left: -20px;  margin-right: 20px;'>
         					<div class='sheet-weight-container'>
         					    <label class='sheet-weight-title'>TOTAL WEIGHT</label>
@@ -676,7 +676,7 @@
         					    <label class='sheet-equipped-armor-maintitle'>EQUIPPED ARMOR</label><br />
         						<hr style='margin-bottom: 10px; margin-top: -10px; margin-left: 10px; margin-right: 10px;'>
         					    <label class='sheet-armor-sp'>MAX SP</label><label class='sheet-armor-dmg'>/  CUR. SP</label><br />
-        					    
+
         					    <label class='sheet-armor-title' style='margin-left: 10px;'>HEAD</label><input name='attr_max_head_sp' class='sheet-armor1-element' type='number' value='0'><input name='attr_current_head_sp' class='sheet-armor2-element' type='number' value='0'>
                                 <input type="checkbox" checked='true' name='attr_armor1_toggle' class="sheet-armor1-toggle"><span></span>
         					    <div class='sheet-armor-details1-container'>
@@ -770,7 +770,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_vitriolweight" value='0'>
                     					</fieldset>
                 				    </div>
-                				    
+
                 				<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -783,7 +783,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_rebisweight" value='0'>
                     					</fieldset>
                 					</div>
-                					
+
                                 <hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -796,7 +796,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_aetherweight" value='0'>
                     					</fieldset>
                 					</div>
-                					
+
         						<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -809,7 +809,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_quebrithweight" value='0'>
                     					</fieldset>
                 					</div>
-                					
+
         						<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -822,7 +822,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_hydragenumweight" value='0'>
                     					</fieldset>
                 					</div>
-                					
+
         						<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -835,7 +835,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_vermilionweight" value='0'>
                     					</fieldset>
                 					</div>
-                					
+
         						<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -848,7 +848,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_solweight" value='0'>
                     					</fieldset>
                 					</div>
-                					
+
         						<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -861,7 +861,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_caelumweight" value='0'>
                     					</fieldset>
                 					</div>
-        						
+
         						<hr style='margin-top: 0px; margin-bottom: 0px;'>
         						<label class='sheet-substance-type'>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'> |
@@ -874,7 +874,7 @@
                     						<input type="text" class='repeating_sub_weight' name="attr_fulgurweight" value='0'>
                     					</fieldset>
                 					</div>
-        						
+
         						<span class='sheet-component-span' style='margin-bottom: 10px; margin-top: 10px;'>
         						<label class='sheet-alchemical-substances2'>COMPONENT NAME</label>
         						<label class='sheet-alchemical-quantity2'>QTY.</label>
@@ -894,7 +894,7 @@
         					<input type="hidden" name="attr_weight_sub" value='[[@{vitriol_wt}+@{rebis_wt}+@{aether_wt}+@{quebrith_wt}+@{hydragenum_wt}+@{vermilion_wt}+@{sol_wt}+@{caelum_wt}+@{fulgur_wt}]]'>
         					<input type="hidden" name="attr_weight_comp" value='0'>
         					<input type="hidden" name="attr_weight_gear" value='0'>
-        					
+
         					<input type="hidden" name="attr_vitriol_total" value='[[round(@{weight_vitriol}*10)]]'>
         					<input type="hidden" name="attr_weight_vitriol" value='0'>
         					<input type="hidden" name="attr_rebis_total" value='[[round(@{weight_rebis}*10)]]'>
@@ -913,7 +913,7 @@
         					<input type="hidden" name="attr_weight_caelum" value='0'>
         					<input type="hidden" name="attr_fulgur_total" value='[[round(@{weight_fulgur}*10)]]'>
         					<input type="hidden" name="attr_weight_fulgur" value='0'>
-        					
+
         					<input type="hidden" name="attr_vitriol_quantity" value='[[@{quantity_vitriol}]]'>
         					<input type="hidden" name="attr_quantity_vitriol" value='0'>
         					<input type="hidden" name="attr_rebis_quantity" value='[[@{quantity_rebis}]]'>
@@ -932,9 +932,9 @@
         					<input type="hidden" name="attr_quantity_caelum" value='0'>
         					<input type="hidden" name="attr_fulgur_quantity" value='[[@{quantity_fulgur}]]'>
         					<input type="hidden" name="attr_quantity_fulgur" value='0'>
-        
+
         		</div title='gear-tab-close'>
-        
+
         		<!----- Spells & Magic ------>
         		<div class="sheet-section-spells" style='margin-left: -10px;'>
         			<div class='sheet-middle-grid' style='margin-top: 20px;'>
@@ -974,7 +974,7 @@
         							<label class='repeating_spell_defense_title'>DEFENSE</label><input class='repeating_spell_defense' type='text' name='attr_spell_defense'>
         						</div>
         						<textarea class='repeating_spell_description' name='attr_spell_description'>Spell description goes here...</textarea>
-        					</div>	
+        					</div>
         							</fieldset>
         							<label class='sheet-spell-title'>JOURNEYMAN - SPELLS, ALTERNATE SIGNS & INVOCATIONS</label>
         							<fieldset class="repeating_spells2" name='attr_spells' style='padding: 5px;'>
@@ -1010,7 +1010,7 @@
         							<label class='repeating_spell_defense_title'>DEFENSE</label><input class='repeating_spell_defense' type='text' name='attr_spell_defense'>
         						</div>
         						<textarea class='repeating_spell_description' name='attr_spell_description'>Spell description goes here...</textarea>
-        					</div>	
+        					</div>
         							</fieldset>
         					<label class='sheet-spell-title'>MASTER/ARCH PRIEST - SPELLS & INVOCATIONS</label>
         							<fieldset class="repeating_spells3" name='attr_spells' style='padding: 5px;'>
@@ -1045,7 +1045,7 @@
         							<label class='repeating_spell_defense_title'>DEFENSE</label><input class='repeating_spell_defense' type='text' name='attr_spell_defense'>
         						</div>
         						<textarea class='repeating_spell_description' name='attr_spell_description'>Spell description goes here...</textarea>
-        					</div>	
+        					</div>
         							</fieldset>
         				</div>
         				<div class='sheet-grid-column' style='margin-left: -20px;'>
@@ -1083,7 +1083,7 @@
         					        <textarea class='sheet-spellfocus-text' name='attr_focus4_description'>Any notes about this focus go here...</textarea>
         					    </div>
         					</div>
-        					
+
         					<label class='sheet-ritual-title'>RITUALS</label>
         							<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>
@@ -1098,7 +1098,7 @@
         						<textarea class='repeating_ritual_comp' type='text' name='attr_ritual_comp'>Ritual components go here...</textarea>
         					</div>
         							</fieldset>
-        						
+
         					<label class='sheet-hex-title'>HEXES</label>
         							<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>
@@ -1118,7 +1118,7 @@
         				</div>
         			</div>
         		</div title='spells-tab-close'>
-        		
+
         		<!----- Background------>
         		<div class="sheet-section-background" style='margin-left: -10px;'>
         		    <div class='sheet-middle-grid' style='margin-top: 20px;'>
@@ -1145,7 +1145,7 @@
             					    </div>
                 					<label class='sheet-style2-title'>FEELINGS ON PEOPLE</label>
                 				    <textarea class='sheet-style2-text' name='attr_feelings'></textarea>
-        					    
+
         					    <span class='sheet-background2-span'><label class='sheet-style2-element'>EARLY LIFE</label></span>
         					    <label class='sheet-toggle-witcher'>WITCHER TRAINING?</label><input type="checkbox" name='attr_witcher_toggle' class="sheet-witcher-switch"><span></span>
                 				    <div class="sheet-witcher-standard">
@@ -1184,7 +1184,7 @@
                     				    <label class='sheet-style2-title'>MOST IMPORTANT EVENT</label>
                     				    <textarea class='sheet-style2-text' name='attr_el5' style='margin-bottom: 5px;'></textarea>
         					    </div>
-        					    
+
         					    <span class='sheet-background-span'><label class='sheet-style-element'>SIBLINGS, RIVALS & FRIENDS</label></span>
         				        <input type="checkbox" checked='true' name='attr_friends_toggle' class="sheet-friends-toggle"><span></span>
             					<div class='sheet-friends-container' style='margin-right: 40px;'>
@@ -1199,7 +1199,7 @@
                 						</span>
                 					</fieldset>
             					</div>
-            					
+
             					<span class='sheet-background-span' style='margin-bottom: -0px;'><label class='sheet-style-element'>LIFE EVENTS</label></span>
         				        <input type="checkbox" checked='true' name='attr_life_events_toggle' class="sheet-life-events-toggle"><span></span>
             					<div class='sheet-events-container' style='margin-right: 40px;'>
@@ -1210,7 +1210,7 @@
                 						</span>
                 					</fieldset>
             					</div>
-        				</div>			
+        				</div>
         				<div class='sheet-grid-column' style='margin-left: -20px;  margin-right: 20px; margin-top: 10px;'>
         				    <div class='sheet-reputation-container'>
         					    <label class='sheet-reputation-maintitle'>REPUTATION</label>
@@ -1251,7 +1251,7 @@
         	</div>
         </div>
         <div class="sheet-block-npc" style='margin-top: 90px;'>
-            
+
             <div class='sheet-top-grid'>
         		<div class='sheet-grid-item'>
         			<label class='sheet-legend-top' style='margin-left: 15px;'>Maximum / Current</label><br />
@@ -1274,7 +1274,7 @@
         			<label class='sheet-environmenttitle'>ENVIRONMENT</label><input name='attr_npc_environment' class='sheet-background-box' type='text'>
         			<label class='sheet-environmenttitle'>INTELLIGENCE</label><input name='attr_npc_intelligence' class='sheet-background-box' type='text'>
         			<label class='sheet-environmenttitle'>ORGANISATION</label><input name='attr_npc_organisation' class='sheet-background-box' type='text'><br />
-        				
+
         		</div>
         		<div class='sheet-grid-item' style='margin-left: 10px; margin-top: 18px;'>
         			<label class='sheet-stattitle2'>STUN</label><input name='attr_stun_npc' title='@{stun_npc}' class='sheet-smallbox3' type='number' value='0'>
@@ -1359,7 +1359,7 @@
     					</div>
     				</div>
 				</div>
-				
+
 				<!---Modifiers Table--->
 				<div class='sheet-grid-item' style='margin-top: -68px; margin-left: -20px; margin-right: 60px;'>
 					<div class='sheet-npc-armor-box'>
@@ -1409,7 +1409,7 @@ on("sheet:opened change:total_body change:total_will change:stat_mod_body change
       let second = total_body + stat_mod_body;
       let third = first + second;
       let fourth = third / 2;
-      
+
       setAttrs({
         "threshold_mod":fourth
       });
@@ -1422,7 +1422,7 @@ on("sheet:opened change:total_body change:stat_mod_body", function() {
         let body_mod = one + two;
         let kick_mod = "";
         console.log("bd: " + body_mod);
-        
+
         if (body_mod == 1) {
             kick_mod = "+0";
         } else if (body_mod == 2) {
@@ -1467,7 +1467,7 @@ on("sheet:opened change:total_body change:stat_mod_body", function() {
             kick_mod = "+0";
         }
         console.log("km: " + kick_mod);
-        setAttrs({                            
+        setAttrs({
             "kick_mod":kick_mod
         });
   });
@@ -1479,7 +1479,7 @@ on("sheet:opened change:total_body change:stat_mod_body", function() {
         let body_mod = one + two;
         let bonus_mod = "";
         console.log("bd: " + body_mod);
-        
+
         if (body_mod == 1) {
             bonus_mod = "-4";
         } else if (body_mod == 2) {
@@ -1524,7 +1524,7 @@ on("sheet:opened change:total_body change:stat_mod_body", function() {
             bonus_mod = "+0";
         }
         console.log("bm: " + bonus_mod);
-        setAttrs({                            
+        setAttrs({
             "bonus_mod":bonus_mod
         });
   });
@@ -1536,8 +1536,8 @@ on("sheet:opened change:hp change:threshold_mod", function() {
         let wound_mod = "";
         console.log("wt: " + threshold_mod);
         console.log("hp: " + hp);
-        
-        if (hp < 0) {
+
+        if (hp <= 0) {
             wound_mod = "/3";
         } else if (threshold_mod > hp) {
             wound_mod = "/2";
@@ -1545,7 +1545,7 @@ on("sheet:opened change:hp change:threshold_mod", function() {
             wound_mod = "/1";
         }
         console.log("wm: " + wound_mod);
-        setAttrs({                            
+        setAttrs({
             "wound_mod":wound_mod
         });
   });
@@ -1555,14 +1555,14 @@ on("sheet:opened change:hp", function() {
         let hp = parseInt(values.hp)||0;
         let death_mod = "";
         console.log("hp: " + hp);
-        
-        if (hp < 0) {
+
+        if (hp <= 0) {
             death_mod = "/3";
         } else {
             death_mod = "/1";
         }
         console.log("dm: " + death_mod);
-        setAttrs({                            
+        setAttrs({
             "death_mod":death_mod
         });
   });
@@ -1632,11 +1632,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
     // destination = the name of the attribute that stores the total weight
     // section = name for/of repeating fieldset, without the repeating_
     // fieldsum = the name of the "weight" field to be summed
-    // fieldmult = the name of quantity field, that multiplies weight. 
+    // fieldmult = the name of quantity field, that multiplies weight.
     //      Leave as "false" if ignored. If using a checkbox rather than a number input, set its value to 1.
     // totalmult = a multiplier to ever item in the fieldset. For instance, coinage might be 0.02 each, so multiple the final total by 0.02
     // you can leave fieldmult and totalmult off.
-    
+
 	var repSection = "repeating_"+section;
 	let multiplier = true;
 	if (fieldmult === undefined || fieldmult === false || fieldmult === 'false') multiplier = false;
@@ -1649,7 +1649,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
 			sumFields[sumFields.length] = repSection + "_" + idArray[a] + "_" + fieldsum;
 			if(multiplier) multFields[multFields.length] = repSection + "_" + idArray[a] + "_" + fieldmult;
 		}
-		
+
 		getAttrs(sumFields.concat(multFields), function(v) {
 			console.log("%%% values of v: "+ JSON.stringify(v) +" %%%");
 			let sumTotal = 0;
@@ -1664,7 +1664,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
 			}
 			var setSumValue = {};
 			setSumValue[destination]=sumTotal * totalmult;
-			setAttrs(setSumValue);	
+			setAttrs(setSumValue);
 		});
 	});
 }
@@ -1733,7 +1733,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
 		{{#rollBetween() roll 6 7}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">RIGHT LIMB (MONSTER):</strong> If successful, your attack will deal half damage.</td></tr>{{/rollBetween() roll 6 7}}
 		{{#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>
     </table>
 </rolltemplate>