diff --git a/Zweihänder Grim & Perilous/Zweihander.html b/Zweihänder Grim & Perilous/Zweihander.html
index 74135fe8db..6b568df51e 100644
--- a/Zweihänder Grim & Perilous/Zweihander.html	
+++ b/Zweihänder Grim & Perilous/Zweihander.html	
@@ -197,7 +197,7 @@
             <input type="text" class="text-input" name="attr_tier" placeholder="Basic" spellcheck="false" title="@{tier}"/>
         </div> <!-- END OF ROW ONE -->
         <div class="grid-item span-one-two">
-            <button type="roll" class="sheet-attrib_btn" name="roll_combat" value="&{template:zweihander} {{name=^{combat} }} {{character=@{character_name} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[ 1d100 ]] }} {{rating=[[ @{combat} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|combat}" data-i18n="combat">Combat</button>
+            <button type="roll" class="sheet-attrib_btn" name="roll_combat" value="&{template:zweihander} {{name=^{combat} }} {{character=@{character_name} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[ 1d100 ]] }} {{rating=[[ @{combat} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|combat}" data-i18n="combat">Combat</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -219,7 +219,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item">
-            <button type="roll" class="sheet-skill_btn" name="roll_martial_melee" value="&{template:zweihander} {{name=^{Martial Melee} }} {{character=@{character_name} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill=^{Martial Melee} }} {{skill_rank=[[ @{martial_melee} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{combat} + [[ @{martial_melee} ]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{martial_melee_focus_1} }} {{focus2=@{martial_melee_focus_2} }} {{focus3=@{martial_melee_focus_3} }} {{focus4=@{martial_melee_focus_4} }} {{focus5=@{martial_melee_focus_5} }} {{focus6=@{martial_melee_focus_6} }}" title="%{Character_Name|martial_melee}" data-i18n="martial-melee*" >Martial Melee*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_martial_melee" value="&{template:zweihander} {{name=^{Martial Melee} }} {{character=@{character_name} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill=^{Martial Melee} }} {{skill_rank=[[ @{martial_melee} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{combat} + [[ @{martial_melee} ]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{martial_melee_focus_1} }} {{focus2=@{martial_melee_focus_2} }} {{focus3=@{martial_melee_focus_3} }} {{focus4=@{martial_melee_focus_4} }} {{focus5=@{martial_melee_focus_5} }} {{focus6=@{martial_melee_focus_6} }}" title="%{Character_Name|martial_melee}" data-i18n="martial-melee*" >Martial Melee*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_martial_melee_1" value="10" title="@{martial_melee_1}" /><span></span>
@@ -260,7 +260,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_combat_advance_2" value="1" title="@{combat_advance_2}" /><span></span>
         </div>
         <div class="grid-item">
-            <button type="roll" class="sheet-skill_btn" name="roll_martial_ranged" value="&{template:zweihander} {{name=^{Martial Ranged} }} {{skill=^{Martial Ranged} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{martial_ranged} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]]}} {{rating=[[ @{combat} + [[@{martial_ranged}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{martial_ranged_focus_1} }} {{focus2=@{martial_ranged_focus_2} }} {{focus3=@{martial_ranged_focus_3} }} {{focus4=@{martial_ranged_focus_4} }} {{focus5=@{martial_ranged_focus_5} }} {{focus6=@{martial_ranged_focus_6} }}" title="%{Character_Name|martial_ranged}" data-i18n="martial-ranged*" >Martial Ranged*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_martial_ranged" value="&{template:zweihander} {{name=^{Martial Ranged} }} {{skill=^{Martial Ranged} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{martial_ranged} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]]}} {{rating=[[ @{combat} + [[@{martial_ranged}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{martial_ranged_focus_1} }} {{focus2=@{martial_ranged_focus_2} }} {{focus3=@{martial_ranged_focus_3} }} {{focus4=@{martial_ranged_focus_4} }} {{focus5=@{martial_ranged_focus_5} }} {{focus6=@{martial_ranged_focus_6} }}" title="%{Character_Name|martial_ranged}" data-i18n="martial-ranged*" >Martial Ranged*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_martial_ranged_1" value="10" title="@{martial_ranged_1}" /><span></span>
@@ -297,7 +297,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_combat_advance_4" value="1"/ title="@{combat_advance_4}" ><span></span>
         </div>
         <div class="grid-item">
-            <button type="roll" class="sheet-skill_btn" name="roll_simple_melee" value="&{template:zweihander} {{name=^{Simple Melee} }} {{skill=^{Simple Melee} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{simple_melee} ]] }} {{mod=?{@{bonusmacro}|0} }} {{roll=[[1d100]]}} {{rating=[[ @{combat} + [[ @{simple_melee} ]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{simple_melee_focus_1} }} {{focus2=@{simple_melee_focus_2} }} {{focus3=@{simple_melee_focus_3} }} {{focus4=@{simple_melee_focus_4} }} {{focus5=@{simple_melee_focus_5} }} {{focus6=@{simple_melee_focus_6} }}" title="%{Character_Name|simple_melee}" data-i18n="simple-melee" >Simple Melee</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_simple_melee" value="&{template:zweihander} {{name=^{Simple Melee} }} {{skill=^{Simple Melee} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{simple_melee} ]] }} {{mod=?{@{bonusmacro}|0} }} {{roll=[[1d100]]}} {{rating=[[ @{combat} + [[ @{simple_melee} ]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{simple_melee_focus_1} }} {{focus2=@{simple_melee_focus_2} }} {{focus3=@{simple_melee_focus_3} }} {{focus4=@{simple_melee_focus_4} }} {{focus5=@{simple_melee_focus_5} }} {{focus6=@{simple_melee_focus_6} }}" title="%{Character_Name|simple_melee}" data-i18n="simple-melee" >Simple Melee</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_simple_melee_1" value="10" title="@{simple_melee_1}" /><span></span>
@@ -331,7 +331,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_combat_advance_6" value="1" title="@{combat_advance_6}" /><span></span>
         </div>
         <div class="grid-item">
-            <button type="roll" class="sheet-skill_btn" name="roll_simple_ranged" value="&{template:zweihander} {{name=^{Simple Ranged} }} {{skill=^{Simple Ranged} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{simple_ranged} ]] }} {{mod=?{@{bonusmacro}|0} }} {{roll=[[1d100]] }} {{rating=[[ @{combat} + [[@{simple_ranged}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{simple_ranged_focus_1} }} {{focus2=@{simple_ranged_focus_2} }} {{focus3=@{simple_ranged_focus_3} }} {{focus4=@{simple_ranged_focus_4} }} {{focus5=@{simple_ranged_focus_5} }} {{focus6=@{simple_ranged_focus_6} }}" title="%{Character_Name|simple_ranged}" data-i18n="simple-ranged" >Simple Ranged</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_simple_ranged" value="&{template:zweihander} {{name=^{Simple Ranged} }} {{skill=^{Simple Ranged} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{simple_ranged} ]] }} {{mod=?{@{bonusmacro}|0} }} {{roll=[[1d100]] }} {{rating=[[ @{combat} + [[@{simple_ranged}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{simple_ranged_focus_1} }} {{focus2=@{simple_ranged_focus_2} }} {{focus3=@{simple_ranged_focus_3} }} {{focus4=@{simple_ranged_focus_4} }} {{focus5=@{simple_ranged_focus_5} }} {{focus6=@{simple_ranged_focus_6} }}" title="%{Character_Name|simple_ranged}" data-i18n="simple-ranged" >Simple Ranged</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_simple_ranged_1" value="10" title="@{simple_ranged_1}" /><span></span>
@@ -355,7 +355,7 @@
             <span class="input-label-header" data-i18n="peril-condition-track" >Peril Condition Track</span>
         </div> <!-- END OF ROW SIX -->
         <div class="grid-item span-one-two">
-            <button type="roll" class="sheet-attrib_btn" name="roll_brawn" value="&{template:zweihander} {{name=^{brawn} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|brawn}" data-i18n="brawn" >Brawn</button>
+            <button type="roll" class="sheet-attrib_btn" name="roll_brawn" value="&{template:zweihander} {{name=^{brawn} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|brawn}" data-i18n="brawn" >Brawn</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -376,7 +376,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_athletics" value="&{template:zweihander} {{name=^{athletics} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill=^{athletics} }} {{skill_rank=[[ @{athletics} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{athletics}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{athletics_focus_1} }} {{focus2=@{athletics_focus_2} }} {{focus3=@{athletics_focus_3} }} {{focus4=@{athletics_focus_4} }} {{focus5=@{athletics_focus_5} }} {{focus6=@{athletics_focus_6} }}" title="%{Character_Name|athletics}" data-i18n="athletics" >Athletics</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_athletics" value="&{template:zweihander} {{name=^{athletics} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill=^{athletics} }} {{skill_rank=[[ @{athletics} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{athletics}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{athletics_focus_1} }} {{focus2=@{athletics_focus_2} }} {{focus3=@{athletics_focus_3} }} {{focus4=@{athletics_focus_4} }} {{focus5=@{athletics_focus_5} }} {{focus6=@{athletics_focus_6} }}" title="%{Character_Name|athletics}" data-i18n="athletics" >Athletics</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_athletics_1" value="10" title="@{athletics_1}" /><span></span>
@@ -409,7 +409,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_brawn_advance_2" value="1" title="@{brawn_advance_2}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_drive" value="&{template:zweihander} {{name=^{drive*} }} {{skill=^{drive*} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{drive} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{drive}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{drive_focus_1} }} {{focus2=@{drive_focus_2} }} {{focus3=@{drive_focus_3} }} {{focus4=@{drive_focus_4} }} {{focus5=@{drive_focus_5} }} {{focus6=@{drive_focus_6} }}" title="%{Character_Name|drive}" data-i18n="drive*" >Drive*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_drive" value="&{template:zweihander} {{name=^{drive*} }} {{skill=^{drive*} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{drive} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{drive}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{drive_focus_1} }} {{focus2=@{drive_focus_2} }} {{focus3=@{drive_focus_3} }} {{focus4=@{drive_focus_4} }} {{focus5=@{drive_focus_5} }} {{focus6=@{drive_focus_6} }}" title="%{Character_Name|drive}" data-i18n="drive*" >Drive*</button>
         </div>
         <div class="grid-item">
             <input type="checkbox" class="sheet-circle" name="attr_drive_1" value="10" title="@{drive_1}" /><span></span>
@@ -442,7 +442,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_brawn_advance_4" value="1"/ title="@{brawn_advance_4}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_intimidate" value="&{template:zweihander} {{name=^{intimidate} }} {{skill=^{intimidate} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{intimidate} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{intimidate}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{intimidate_focus_1} }} {{focus2=@{intimidate_focus_2} }} {{focus3=@{intimidate_focus_3} }} {{focus4=@{intimidate_focus_4} }} {{focus5=@{intimidate_focus_5} }} {{focus6=@{intimidate_focus_6} }}" title="%{Character_Name|intimidate}" data-i18n="intimidate" >Intimidate</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_intimidate" value="&{template:zweihander} {{name=^{intimidate} }} {{skill=^{intimidate} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{intimidate} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{intimidate}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{intimidate_focus_1} }} {{focus2=@{intimidate_focus_2} }} {{focus3=@{intimidate_focus_3} }} {{focus4=@{intimidate_focus_4} }} {{focus5=@{intimidate_focus_5} }} {{focus6=@{intimidate_focus_6} }}" title="%{Character_Name|intimidate}" data-i18n="intimidate" >Intimidate</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_intimidate_1" value="10" title="@{intimidate_1}" /><span></span>
@@ -478,7 +478,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_brawn_advance_6" value="1" title="@{brawn_advance_6}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_toughness" value="&{template:zweihander} {{name=^{toughness} }} {{skill=^{toughness} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{toughness} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{toughness}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{toughness_focus_1} }} {{focus2=@{toughness_focus_2} }} {{focus3=@{toughness_focus_3} }} {{focus4=@{toughness_focus_4} }} {{focus5=@{toughness_focus_5} }} {{focus6=@{toughness_focus_6} }}" title="%{Character_Name|toughness}" data-i18n="toughness" >Toughness</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_toughness" value="&{template:zweihander} {{name=^{toughness} }} {{skill=^{toughness} }} {{attrib=^{brawn} }} {{attrib_rank=[[ @{brawn} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{toughness} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{brawn} + [[@{toughness}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{toughness_focus_1} }} {{focus2=@{toughness_focus_2} }} {{focus3=@{toughness_focus_3} }} {{focus4=@{toughness_focus_4} }} {{focus5=@{toughness_focus_5} }} {{focus6=@{toughness_focus_6} }}" title="%{Character_Name|toughness}" data-i18n="toughness" >Toughness</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_toughness_1" value="10" title="@{toughness_1}" /><span></span>
@@ -504,7 +504,7 @@
             </div>
         </div> <!-- END OF ROW ELEVEN -->
         <div class="grid-item span-one-two">
-            <button type="roll" class="sheet-attrib_btn" name="roll_agility" value="&{template:zweihander} {{name=^{agility} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|agility}" data-i18n="agility" >Agility</button>
+            <button type="roll" class="sheet-attrib_btn" name="roll_agility" value="&{template:zweihander} {{name=^{agility} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|agility}" data-i18n="agility" >Agility</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -527,7 +527,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_coordination" value="&{template:zweihander} {{name=^{coordination} }} {{skill=^{coordination} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{coordination} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{coordination}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{coordination_focus_1} }} {{focus2=@{coordination_focus_2} }} {{focus3=@{coordination_focus_3} }} {{focus4=@{coordination_focus_4} }} {{focus5=@{coordination_focus_5} }} {{focus6=@{coordination_focus_6} }}" title="%{Character_Name|coordination}" data-i18n="coordination" >Coordination</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_coordination" value="&{template:zweihander} {{name=^{coordination} }} {{skill=^{coordination} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{coordination} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{coordination}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{coordination_focus_1} }} {{focus2=@{coordination_focus_2} }} {{focus3=@{coordination_focus_3} }} {{focus4=@{coordination_focus_4} }} {{focus5=@{coordination_focus_5} }} {{focus6=@{coordination_focus_6} }}" title="%{Character_Name|coordination}" data-i18n="coordination" >Coordination</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_coordination_1" value="10" title="@{coordination_1}" /><span></span>
@@ -558,7 +558,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_agility_advance_2" value="1" title="@{agility_advance_2}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_pilot" value="&{template:zweihander} {{name=^{pilot*} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill=^{pilot*} }} {{skill_rank=[[@{pilot} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{pilot}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{pilot_focus_1} }} {{focus2=@{pilot_focus_2} }} {{focus3=@{pilot_focus_3} }} {{focus4=@{pilot_focus_4} }} {{focus5=@{pilot_focus_5} }} {{focus6=@{pilot_focus_6} }}" title="%{Character_Name|pilot}" data-i18n="pilot*" >Pilot*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_pilot" value="&{template:zweihander} {{name=^{pilot*} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill=^{pilot*} }} {{skill_rank=[[@{pilot} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{pilot}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{pilot_focus_1} }} {{focus2=@{pilot_focus_2} }} {{focus3=@{pilot_focus_3} }} {{focus4=@{pilot_focus_4} }} {{focus5=@{pilot_focus_5} }} {{focus6=@{pilot_focus_6} }}" title="%{Character_Name|pilot}" data-i18n="pilot*" >Pilot*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_pilot_1" value="10" title="@{pilot_1}" /><span></span>
@@ -589,7 +589,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_agility_advance_4" value="1"/ title="@{agility_advance_4}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_ride" value="&{template:zweihander} {{name=^{ride*} }} {{skill=^{ride*} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{ride} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{ride}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{ride_focus_1} }} {{focus2=@{ride_focus_2} }} {{focus3=@{ride_focus_3} }} {{focus4=@{ride_focus_4} }} {{focus5=@{ride_focus_5} }} {{focus6=@{ride_focus_6} }}" title="%{Character_Name|ride}" data-i18n="ride*" >Ride*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_ride" value="&{template:zweihander} {{name=^{ride*} }} {{skill=^{ride*} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{ride} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{ride}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{ride_focus_1} }} {{focus2=@{ride_focus_2} }} {{focus3=@{ride_focus_3} }} {{focus4=@{ride_focus_4} }} {{focus5=@{ride_focus_5} }} {{focus6=@{ride_focus_6} }}" title="%{Character_Name|ride}" data-i18n="ride*" >Ride*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_ride_1" value="10" title="@{ride_1}" /><span></span>
@@ -620,7 +620,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_agility_advance_6" value="1"/ title="@{agility_advance_6}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_skulduggery" value="&{template:zweihander} {{name=^{skulduggery*} }} {{skill=^{skulduggery*} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{skulduggery} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{skulduggery}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{skulduggery_focus_1} }} {{focus2=@{skulduggery_focus_2} }} {{focus3=@{skulduggery_focus_3} }} {{focus4=@{skulduggery_focus_4} }} {{focus5=@{skulduggery_focus_5} }} {{focus6=@{skulduggery_focus_6} }}" title="%{Character_Name|skulduggery}" data-i18n="skulduggery*" >Skulduggery*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_skulduggery" value="&{template:zweihander} {{name=^{skulduggery*} }} {{skill=^{skulduggery*} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{skulduggery} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{skulduggery}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{skulduggery_focus_1} }} {{focus2=@{skulduggery_focus_2} }} {{focus3=@{skulduggery_focus_3} }} {{focus4=@{skulduggery_focus_4} }} {{focus5=@{skulduggery_focus_5} }} {{focus6=@{skulduggery_focus_6} }}" title="%{Character_Name|skulduggery}" data-i18n="skulduggery*" >Skulduggery*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_skulduggery_1" value="10" title="@{skulduggery_1}" /><span></span>
@@ -653,7 +653,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_stealth" value="&{template:zweihander} {{name=^{stealth} }} {{skill=^{stealth} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{stealth} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{stealth}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{stealth_focus_1} }} {{focus2=@{stealth_focus_2} }} {{focus3=@{stealth_focus_3} }} {{focus4=@{stealth_focus_4} }} {{focus5=@{stealth_focus_5} }} {{focus6=@{stealth_focus_6} }}" title="%{Character_Name|stealth}" data-i18n="stealth" >Stealth</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_stealth" value="&{template:zweihander} {{name=^{stealth} }} {{skill=^{stealth} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[ @{stealth} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{agility} + [[@{stealth}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{stealth_focus_1} }} {{focus2=@{stealth_focus_2} }} {{focus3=@{stealth_focus_3} }} {{focus4=@{stealth_focus_4} }} {{focus5=@{stealth_focus_5} }} {{focus6=@{stealth_focus_6} }}" title="%{Character_Name|stealth}" data-i18n="stealth" >Stealth</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_stealth_1" value="10" title="@{stealth_1}" /><span></span>
@@ -677,7 +677,7 @@
             <input type="text" class="sheet-text1" name="attr_trait_4" title="@{trait_4}" spellcheck="false" />
         </div> <!-- END OF ROW SEVENTEEN -->
         <div class="grid-item span-one-two">
-            <button type="roll" class="sheet-attrib_btn" name="roll_perception" value="&{template:zweihander} {{name=^{perception} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|perception}" data-i18n="perception" >Perception</button>
+            <button type="roll" class="sheet-attrib_btn" name="roll_perception" value="&{template:zweihander} {{name=^{perception} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|perception}" data-i18n="perception" >Perception</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -698,7 +698,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_awareness" value="&{template:zweihander} {{name=^{awareness} }} {{skill=^{awareness} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{awareness} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{awareness}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{awareness_focus_1} }} {{focus2=@{awareness_focus_2} }} {{focus3=@{awareness_focus_3} }} {{focus4=@{awareness_focus_4} }} {{focus5=@{awareness_focus_5} }} {{focus6=@{awareness_focus_6} }}" title="%{Character_Name|awareness}" data-i18n="awareness" >Awareness</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_awareness" value="&{template:zweihander} {{name=^{awareness} }} {{skill=^{awareness} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{awareness} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{awareness}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{awareness_focus_1} }} {{focus2=@{awareness_focus_2} }} {{focus3=@{awareness_focus_3} }} {{focus4=@{awareness_focus_4} }} {{focus5=@{awareness_focus_5} }} {{focus6=@{awareness_focus_6} }}" title="%{Character_Name|awareness}" data-i18n="awareness" >Awareness</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_awareness_1" value="10" title="@{awareness_1}" /><span></span>
@@ -729,7 +729,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_perception_advance_2" value="1" title="@{perception_advance_2}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_eavesdrop" value="&{template:zweihander} {{name=^{eavesdrop} }} {{skill=^{eavesdrop} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{eavesdrop} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{eavesdrop}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{eavesdrop_focus_1} }} {{focus2=@{eavesdrop_focus_2} }} {{focus3=@{eavesdrop_focus_3} }} {{focus4=@{eavesdrop_focus_4} }} {{focus5=@{eavesdrop_focus_5} }} {{focus6=@{eavesdrop_focus_6} }}" title="%{Character_Name|eavesdrop}" data-i18n="eavesdrop" >Eavesdrop</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_eavesdrop" value="&{template:zweihander} {{name=^{eavesdrop} }} {{skill=^{eavesdrop} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{eavesdrop} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{eavesdrop}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{eavesdrop_focus_1} }} {{focus2=@{eavesdrop_focus_2} }} {{focus3=@{eavesdrop_focus_3} }} {{focus4=@{eavesdrop_focus_4} }} {{focus5=@{eavesdrop_focus_5} }} {{focus6=@{eavesdrop_focus_6} }}" title="%{Character_Name|eavesdrop}" data-i18n="eavesdrop" >Eavesdrop</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_eavesdrop_1" value="10" title="@{eavesdrop_1}" /><span></span>
@@ -760,7 +760,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_perception_advance_4" value="1"/ title="@{perception_advance_4}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_scrutinize" value="&{template:zweihander} {{name=^{scrutinize} }} {{skill=^{scrutinize} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{scrutinize} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{scrutinize}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{scrutinize_focus_1} }} {{focus2=@{scrutinize_focus_2} }} {{focus3=@{scrutinize_focus_3} }} {{focus4=@{scrutinize_focus_4} }} {{focus5=@{scrutinize_focus_5} }} {{focus6=@{scrutinize_focus_6} }}" title="%{Character_Name|scrutinize}" data-i18n="scrutinize" >Scrutinize</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_scrutinize" value="&{template:zweihander} {{name=^{scrutinize} }} {{skill=^{scrutinize} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{scrutinize} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{scrutinize}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{scrutinize_focus_1} }} {{focus2=@{scrutinize_focus_2} }} {{focus3=@{scrutinize_focus_3} }} {{focus4=@{scrutinize_focus_4} }} {{focus5=@{scrutinize_focus_5} }} {{focus6=@{scrutinize_focus_6} }}" title="%{Character_Name|scrutinize}" data-i18n="scrutinize" >Scrutinize</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_scrutinize_1" value="10" title="@{scrutinize_1}" /><span></span>
@@ -794,7 +794,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_perception_advance_6" value="1"/ title="@{perception_advance_6}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_survival" value="&{template:zweihander} {{name=^{survival} }} {{skill=^{survival} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{survival} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{survival}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{survival_focus_1} }} {{focus2=@{survival_focus_2} }} {{focus3=@{survival_focus_3} }} {{focus4=@{survival_focus_4} }} {{focus5=@{survival_focus_5} }} {{focus6=@{survival_focus_6} }}" title="%{Character_Name|survival}" data-i18n="survival" >Survival</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_survival" value="&{template:zweihander} {{name=^{survival} }} {{skill=^{survival} }} {{attrib=^{perception} }} {{attrib_rank=[[ @{perception} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{survival} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{perception} + [[@{survival}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{survival_focus_1} }} {{focus2=@{survival_focus_2} }} {{focus3=@{survival_focus_3} }} {{focus4=@{survival_focus_4} }} {{focus5=@{survival_focus_5} }} {{focus6=@{survival_focus_6} }}" title="%{Character_Name|survival}" data-i18n="survival" >Survival</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_survival_1" value="10" title="@{survival_1}" /><span></span>
@@ -818,7 +818,7 @@
             <input type="text" class="sheet-text1" name="attr_trait_9" title="@{trait_9}" spellcheck="false" />
         </div> <!-- END OF ROW TWENTY-TWO -->
         <div class="grid-item span-one-two">
-             <button type="roll" class="sheet-attrib_btn" name="roll_intelligence" value="&{template:zweihander} {{name=^{intelligence} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|intelligence}" data-i18n="intelligence" >Intelligence</button>
+             <button type="roll" class="sheet-attrib_btn" name="roll_intelligence" value="&{template:zweihander} {{name=^{intelligence} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|intelligence}" data-i18n="intelligence" >Intelligence</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -839,7 +839,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_alchemy" value="&{template:zweihander} {{name=^{alchemy*} }} {{skill=^{alchemy*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{alchemy} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{alchemy}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{alchemy_focus_1} }} {{focus2=@{alchemy_focus_2} }} {{focus3=@{alchemy_focus_3} }} {{focus4=@{alchemy_focus_4} }} {{focus5=@{alchemy_focus_5} }} {{focus6=@{alchemy_focus_6} }}" title="%{Character_Name|alchemy}" data-i18n="alchemy*" >Alchemy*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_alchemy" value="&{template:zweihander} {{name=^{alchemy*} }} {{skill=^{alchemy*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{alchemy} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{alchemy}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{alchemy_focus_1} }} {{focus2=@{alchemy_focus_2} }} {{focus3=@{alchemy_focus_3} }} {{focus4=@{alchemy_focus_4} }} {{focus5=@{alchemy_focus_5} }} {{focus6=@{alchemy_focus_6} }}" title="%{Character_Name|alchemy}" data-i18n="alchemy*" >Alchemy*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_alchemy_1" value="10" title="@{alchemy_1}" /><span></span>
@@ -870,7 +870,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_intelligence_advance_2" value="1" title="@{intelligence_advance_2}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_counterfeit" value="&{template:zweihander} {{name=^{counterfeit*} }} {{skill=^{counterfeit*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{counterfeit} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{counterfeit}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{counterfeit_focus_1} }} {{focus2=@{counterfeit_focus_2} }} {{focus3=@{counterfeit_focus_3} }} {{focus4=@{counterfeit_focus_4} }} {{focus5=@{counterfeit_focus_5} }} {{focus6=@{counterfeit_focus_6} }}" title="%{Character_Name|counterfeit}" data-i18n="counterfeit*" >Counterfeit*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_counterfeit" value="&{template:zweihander} {{name=^{counterfeit*} }} {{skill=^{counterfeit*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{counterfeit} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{counterfeit}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{counterfeit_focus_1} }} {{focus2=@{counterfeit_focus_2} }} {{focus3=@{counterfeit_focus_3} }} {{focus4=@{counterfeit_focus_4} }} {{focus5=@{counterfeit_focus_5} }} {{focus6=@{counterfeit_focus_6} }}" title="%{Character_Name|counterfeit}" data-i18n="counterfeit*" >Counterfeit*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_counterfeit_1" value="10" title="@{counterfeit_1}" /><span></span>
@@ -901,7 +901,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_intelligence_advance_4" value="1"/ title="@{intelligence_advance_4}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_education" value="&{template:zweihander} {{name=^{education*} }} {{skill=^{education*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{education} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{education}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{education_focus_1} }} {{focus2=@{education_focus_2} }} {{focus3=@{education_focus_3} }} {{focus4=@{education_focus_4} }} {{focus5=@{education_focus_5} }} {{focus6=@{education_focus_6} }}" title="%{Character_Name|education}" data-i18n="education*" >Education*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_education" value="&{template:zweihander} {{name=^{education*} }} {{skill=^{education*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{education} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{education}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{education_focus_1} }} {{focus2=@{education_focus_2} }} {{focus3=@{education_focus_3} }} {{focus4=@{education_focus_4} }} {{focus5=@{education_focus_5} }} {{focus6=@{education_focus_6} }}" title="%{Character_Name|education}" data-i18n="education*" >Education*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_education_1" value="10" title="@{education_1}" /><span></span>
@@ -932,7 +932,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_intelligence_advance_6" value="1"/ title="@{intelligence_advance_6}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_folklore" value="&{template:zweihander} {{name=^{folklore} }} {{skill=^{folklore} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{folklore} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{folklore}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{folklore_focus_1} }} {{focus2=@{folklore_focus_2} }} {{focus3=@{folklore_focus_3} }} {{focus4=@{folklore_focus_4} }} {{focus5=@{folklore_focus_5} }} {{focus6=@{folklore_focus_6} }}" title="%{Character_Name|folklore}" data-i18n="folklore" >Folklore</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_folklore" value="&{template:zweihander} {{name=^{folklore} }} {{skill=^{folklore} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{folklore} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{folklore}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{folklore_focus_1} }} {{focus2=@{folklore_focus_2} }} {{focus3=@{folklore_focus_3} }} {{focus4=@{folklore_focus_4} }} {{focus5=@{folklore_focus_5} }} {{focus6=@{folklore_focus_6} }}" title="%{Character_Name|folklore}" data-i18n="folklore" >Folklore</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_folklore_1" value="10" title="@{folklore_1}" /><span></span>
@@ -959,7 +959,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_gamble" value="&{template:zweihander} {{name=^{gamble} }} {{skill=^{gamble} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{gamble} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{gamble}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{gamble_focus_1} }} {{focus2=@{gamble_focus_2} }} {{focus3=@{gamble_focus_3} }} {{focus4=@{gamble_focus_4} }} {{focus5=@{gamble_focus_5} }} {{focus6=@{gamble_focus_6} }}" title="%{Character_Name|gamble}" data-i18n="gamble" >Gamble</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_gamble" value="&{template:zweihander} {{name=^{gamble} }} {{skill=^{gamble} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{gamble} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{gamble}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{gamble_focus_1} }} {{focus2=@{gamble_focus_2} }} {{focus3=@{gamble_focus_3} }} {{focus4=@{gamble_focus_4} }} {{focus5=@{gamble_focus_5} }} {{focus6=@{gamble_focus_6} }}" title="%{Character_Name|gamble}" data-i18n="gamble" >Gamble</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_gamble_1" value="10" title="@{gamble_1}" /><span></span>
@@ -986,7 +986,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_heal" value="&{template:zweihander} {{name=^{heal*} }} {{skill=^{heal*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{heal} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{heal}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{heal_focus_1} }} {{focus2=@{heal_focus_2} }} {{focus3=@{heal_focus_3} }} {{focus4=@{heal_focus_4} }} {{focus5=@{heal_focus_5} }} {{focus6=@{heal_focus_6} }}" title="%{Character_Name|heal}" data-i18n="heal*" >Heal*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_heal" value="&{template:zweihander} {{name=^{heal*} }} {{skill=^{heal*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{heal} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{heal}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{heal_focus_1} }} {{focus2=@{heal_focus_2} }} {{focus3=@{heal_focus_3} }} {{focus4=@{heal_focus_4} }} {{focus5=@{heal_focus_5} }} {{focus6=@{heal_focus_6} }}" title="%{Character_Name|heal}" data-i18n="heal*" >Heal*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_heal_1" value="10" title="@{heal_1}" /><span></span>
@@ -1013,7 +1013,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_navigation" value="&{template:zweihander} {{name=^{navigation*} }} {{skill=^{navigation*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{navigation} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{navigation}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{navigation_focus_1} }} {{focus2=@{navigation_focus_2} }} {{focus3=@{navigation_focus_3} }} {{focus4=@{navigation_focus_4} }} {{focus5=@{navigation_focus_5} }} {{focus6=@{navigation_focus_6} }}" title="%{Character_Name|navigation}" data-i18n="navigation*" >Navigation*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_navigation" value="&{template:zweihander} {{name=^{navigation*} }} {{skill=^{navigation*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{navigation} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{navigation}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{navigation_focus_1} }} {{focus2=@{navigation_focus_2} }} {{focus3=@{navigation_focus_3} }} {{focus4=@{navigation_focus_4} }} {{focus5=@{navigation_focus_5} }} {{focus6=@{navigation_focus_6} }}" title="%{Character_Name|navigation}" data-i18n="navigation*" >Navigation*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_navigation_1" value="10" title="@{navigation_1}" /><span></span>
@@ -1046,7 +1046,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_warfare" value="&{template:zweihander} {{name=^{warfare*} }} {{skill=^{warfare*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{warfare} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{warfare}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{warfare_focus_1} }} {{focus2=@{warfare_focus_2} }} {{focus3=@{warfare_focus_3} }} {{focus4=@{warfare_focus_4} }} {{focus5=@{warfare_focus_5} }} {{focus6=@{warfare_focus_6} }}" title="%{Character_Name|warfare}" data-i18n="warfare*" >Warfare*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_warfare" value="&{template:zweihander} {{name=^{warfare*} }} {{skill=^{warfare*} }} {{attrib=^{intelligence} }} {{attrib_rank=[[ @{intelligence} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{warfare} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{intelligence} + [[@{warfare}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{warfare_focus_1} }} {{focus2=@{warfare_focus_2} }} {{focus3=@{warfare_focus_3} }} {{focus4=@{warfare_focus_4} }} {{focus5=@{warfare_focus_5} }} {{focus6=@{warfare_focus_6} }}" title="%{Character_Name|warfare}" data-i18n="warfare*" >Warfare*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_warfare_1" value="10" title="@{warfare_1}" /><span></span>
@@ -1070,7 +1070,7 @@
             <input type="text" class="sheet-text1" name="attr_trait_18" title="@{trait_18}" spellcheck="false" />
         </div> <!-- END OF ROW THIRTY-ONE -->
         <div class="grid-item span-one-two">
-            <button type="roll" class="sheet-attrib_btn" name="roll_willpower" value="&{template:zweihander} {{name=^{willpower} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|willpower}" data-i18n="willpower" >Willpower</button>
+            <button type="roll" class="sheet-attrib_btn" name="roll_willpower" value="&{template:zweihander} {{name=^{willpower} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|willpower}" data-i18n="willpower" >Willpower</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -1091,7 +1091,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_incantation" value="&{template:zweihander} {{name=^{incantation*} }} {{skill=^{incantation*} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{incantation} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{incantation}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{incantation_focus_1} }} {{focus2=@{incantation_focus_2} }} {{focus3=@{incantation_focus_3} }} {{focus4=@{incantation_focus_4} }} {{focus5=@{incantation_focus_5} }} {{focus6=@{incantation_focus_6} }}" title="%{Character_Name|incantation}" data-i18n="incantation*" >Incantation*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_incantation" value="&{template:zweihander} {{name=^{incantation*} }} {{skill=^{incantation*} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{incantation} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{incantation}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{incantation_focus_1} }} {{focus2=@{incantation_focus_2} }} {{focus3=@{incantation_focus_3} }} {{focus4=@{incantation_focus_4} }} {{focus5=@{incantation_focus_5} }} {{focus6=@{incantation_focus_6} }}" title="%{Character_Name|incantation}" data-i18n="incantation*" >Incantation*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_incantation_1" value="10" title="@{incantation_1}" /><span></span>
@@ -1122,7 +1122,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_willpower_advance_2" value="1" title="@{willpower_advance_2}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_interrogation" value="&{template:zweihander} {{name=^{interrogation*} }} {{skill=^{interrogation*} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{interrogation} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{interrogation}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{interrogation_focus_1} }} {{focus2=@{interrogation_focus_2} }} {{focus3=@{interrogation_focus_3} }} {{focus4=@{interrogation_focus_4} }} {{focus5=@{interrogation_focus_5} }} {{focus6=@{interrogation_focus_6} }}" title="%{Character_Name|interrogation}" data-i18n="interrogation*" >Interrogation*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_interrogation" value="&{template:zweihander} {{name=^{interrogation*} }} {{skill=^{interrogation*} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{interrogation} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{interrogation}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{interrogation_focus_1} }} {{focus2=@{interrogation_focus_2} }} {{focus3=@{interrogation_focus_3} }} {{focus4=@{interrogation_focus_4} }} {{focus5=@{interrogation_focus_5} }} {{focus6=@{interrogation_focus_6} }}" title="%{Character_Name|interrogation}" data-i18n="interrogation*" >Interrogation*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_interrogation_1" value="10" title="@{interrogation_1}" /><span></span>
@@ -1153,7 +1153,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_willpower_advance_4" value="1"/ title="@{willpower_advance_4}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-        <button type="roll" class="sheet-skill_btn" name="roll_resolve" value="&{template:zweihander} {{name=^{resolve} }} {{skill=^{resolve} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{resolve} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{resolve}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{resolve_focus_1} }} {{focus2=@{resolve_focus_2} }} {{focus3=@{resolve_focus_3} }} {{focus4=@{resolve_focus_4} }} {{focus5=@{resolve_focus_5} }} {{focus6=@{resolve_focus_6} }}" title="%{Character_Name|resolve}" data-i18n="resolve" >Resolve</button>
+        <button type="roll" class="sheet-skill_btn" name="roll_resolve" value="&{template:zweihander} {{name=^{resolve} }} {{skill=^{resolve} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{resolve} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{resolve}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{resolve_focus_1} }} {{focus2=@{resolve_focus_2} }} {{focus3=@{resolve_focus_3} }} {{focus4=@{resolve_focus_4} }} {{focus5=@{resolve_focus_5} }} {{focus6=@{resolve_focus_6} }}" title="%{Character_Name|resolve}" data-i18n="resolve" >Resolve</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_resolve_1" value="10" title="@{resolve_1}" /><span></span>
@@ -1187,7 +1187,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_willpower_advance_6" value="1"/ title="@{willpower_advance_6}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_tradecraft" value="&{template:zweihander} {{name=^{tradecraft*} }} {{skill=^{tradecraft*} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{tradecraft} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{tradecraft}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{tradecraft_focus_1} }} {{focus2=@{tradecraft_focus_2} }} {{focus3=@{tradecraft_focus_3} }} {{focus4=@{tradecraft_focus_4} }} {{focus5=@{tradecraft_focus_5} }} {{focus6=@{tradecraft_focus_6} }}" title="%{Character_Name|tradecraft}" data-i18n="tradecraft*" >Tradecraft*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_tradecraft" value="&{template:zweihander} {{name=^{tradecraft*} }} {{skill=^{tradecraft*} }} {{attrib=^{willpower} }} {{attrib_rank=[[ @{willpower} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{tradecraft} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{willpower} + [[@{tradecraft}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{tradecraft_focus_1} }} {{focus2=@{tradecraft_focus_2} }} {{focus3=@{tradecraft_focus_3} }} {{focus4=@{tradecraft_focus_4} }} {{focus5=@{tradecraft_focus_5} }} {{focus6=@{tradecraft_focus_6} }}" title="%{Character_Name|tradecraft}" data-i18n="tradecraft*" >Tradecraft*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_tradecraft_1" value="10" title="@{tradecraft_1}" /><span></span>
@@ -1211,7 +1211,7 @@
             <input type="text" class="sheet-text1" name="attr_trait_23" title="@{trait_23}" spellcheck="false" />
         </div> <!-- END OF ROW THIRTY-SIX -->
         <div class="grid-item span-one-two">
-            <button type="roll" class="sheet-attrib_btn" name="roll_fellowship" value="&{template:zweihander} {{name=^{fellowship} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|fellowship}" data-i18n="fellowship" >Fellowship</button>
+            <button type="roll" class="sheet-attrib_btn" name="roll_fellowship" value="&{template:zweihander} {{name=^{fellowship} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + @{difficulty} + ?{@{bonusmacro}|0} ]] }} " title="%{Character_Name|fellowship}" data-i18n="fellowship" >Fellowship</button>
         </div>
         <div class="grid-item">
             &nbsp;
@@ -1232,7 +1232,7 @@
             <span class="input-label" data-i18n="advance" >Advance</span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_bargain" value="&{template:zweihander} {{name=^{bargain} }} {{skill=^{bargain} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{bargain} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{bargain}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{bargain_focus_1} }} {{focus2=@{bargain_focus_2} }} {{focus3=@{bargain_focus_3} }} {{focus4=@{bargain_focus_4} }} {{focus5=@{bargain_focus_5} }} {{focus6=@{bargain_focus_6} }}" title="%{Character_Name|bargain}" data-i18n="bargain" >Bargain</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_bargain" value="&{template:zweihander} {{name=^{bargain} }} {{skill=^{bargain} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{bargain} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{bargain}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{bargain_focus_1} }} {{focus2=@{bargain_focus_2} }} {{focus3=@{bargain_focus_3} }} {{focus4=@{bargain_focus_4} }} {{focus5=@{bargain_focus_5} }} {{focus6=@{bargain_focus_6} }}" title="%{Character_Name|bargain}" data-i18n="bargain" >Bargain</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_bargain_1" value="10" title="@{bargain_1}" /><span></span>
@@ -1263,7 +1263,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_fellowship_advance_2" value="1" title="@{fellowship_advance_2}" /><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_charm" value="&{template:zweihander} {{name=^{charm} }} {{skill=^{charm} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{charm} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{charm}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{charm_focus_1} }} {{focus2=@{charm_focus_2} }} {{focus3=@{charm_focus_3} }} {{focus4=@{charm_focus_4} }} {{focus5=@{charm_focus_5} }} {{focus6=@{charm_focus_6} }}" title="%{Character_Name|charm}" data-i18n="charm" >Charm</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_charm" value="&{template:zweihander} {{name=^{charm} }} {{skill=^{charm} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{charm} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{charm}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{charm_focus_1} }} {{focus2=@{charm_focus_2} }} {{focus3=@{charm_focus_3} }} {{focus4=@{charm_focus_4} }} {{focus5=@{charm_focus_5} }} {{focus6=@{charm_focus_6} }}" title="%{Character_Name|charm}" data-i18n="charm" >Charm</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_charm_1" value="10" title="@{charm_1}" /><span></span>
@@ -1294,7 +1294,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_fellowship_advance_4" value="1"/ title="@{fellowship_advance_4}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_disguise" value="&{template:zweihander} {{name=^{disguise*} }} {{skill=^{disguise*} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{disguise} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{disguise}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{disguise_focus_1} }} {{focus2=@{disguise_focus_2} }} {{focus3=@{disguise_focus_3} }} {{focus4=@{disguise_focus_4} }} {{focus5=@{disguise_focus_5} }} {{focus6=@{disguise_focus_6} }}" title="%{Character_Name|disguise}" data-i18n="disguise*" >Disguise*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_disguise" value="&{template:zweihander} {{name=^{disguise*} }} {{skill=^{disguise*} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{disguise} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{disguise}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{disguise_focus_1} }} {{focus2=@{disguise_focus_2} }} {{focus3=@{disguise_focus_3} }} {{focus4=@{disguise_focus_4} }} {{focus5=@{disguise_focus_5} }} {{focus6=@{disguise_focus_6} }}" title="%{Character_Name|disguise}" data-i18n="disguise*" >Disguise*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_disguise_1" value="10" title="@{disguise_1}" /><span></span>
@@ -1325,7 +1325,7 @@
             <input type="checkbox" class="sheet-circle" name="attr_fellowship_advance_6" value="1"/ title="@{fellowship_advance_6}" ><span></span>
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_guile" value="&{template:zweihander} {{name=^{guile} }} {{skill=^{guile} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{guile} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{guile}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{guile_focus_1} }} {{focus2=@{guile_focus_2} }} {{focus3=@{guile_focus_3} }} {{focus4=@{guile_focus_4} }} {{focus5=@{guile_focus_5} }} {{focus6=@{guile_focus_6} }}" title="%{Character_Name|guile}" data-i18n="guile" >Guile</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_guile" value="&{template:zweihander} {{name=^{guile} }} {{skill=^{guile} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{guile} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{guile}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{guile_focus_1} }} {{focus2=@{guile_focus_2} }} {{focus3=@{guile_focus_3} }} {{focus4=@{guile_focus_4} }} {{focus5=@{guile_focus_5} }} {{focus6=@{guile_focus_6} }}" title="%{Character_Name|guile}" data-i18n="guile" >Guile</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_guile_1" value="10" title="@{guile_1}" /><span></span>
@@ -1352,7 +1352,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_handle_animal" value="&{template:zweihander} {{name=^{handle-animal*} }} {{skill=^{handle-animal*} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{handle_animal} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{handle_animal}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{handle_animal_focus_1} }} {{focus2=@{handle_animal_focus_2} }} {{focus3=@{handle_animal_focus_3} }} {{focus4=@{handle_animal_focus_4} }} {{focus5=@{handle_animal_focus_5} }} {{focus6=@{handle_animal_focus_6} }}" title="%{Character_Name|handle_animal}" data-i18n="handle-animal*" >Handle Animal*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_handle_animal" value="&{template:zweihander} {{name=^{handle-animal*} }} {{skill=^{handle-animal*} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{handle_animal} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{handle_animal}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{handle_animal_focus_1} }} {{focus2=@{handle_animal_focus_2} }} {{focus3=@{handle_animal_focus_3} }} {{focus4=@{handle_animal_focus_4} }} {{focus5=@{handle_animal_focus_5} }} {{focus6=@{handle_animal_focus_6} }}" title="%{Character_Name|handle_animal}" data-i18n="handle-animal*" >Handle Animal*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_handle_animal_1" value="10" title="@{handle_animal_1}" /><span></span>
@@ -1379,7 +1379,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_leadership" value="&{template:zweihander} {{name=^{leadership*} }} {{skill=^{leadership*} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{leadership} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{leadership}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{leadership_focus_1} }} {{focus2=@{leadership_focus_2} }} {{focus3=@{leadership_focus_3} }} {{focus4=@{leadership_focus_4} }} {{focus5=@{leadership_focus_5} }} {{focus6=@{leadership_focus_6} }}" title="%{Character_Name|leadership}" data-i18n="leadership*" >Leadership*</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_leadership" value="&{template:zweihander} {{name=^{leadership*} }} {{skill=^{leadership*} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{leadership} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{leadership}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{leadership_focus_1} }} {{focus2=@{leadership_focus_2} }} {{focus3=@{leadership_focus_3} }} {{focus4=@{leadership_focus_4} }} {{focus5=@{leadership_focus_5} }} {{focus6=@{leadership_focus_6} }}" title="%{Character_Name|leadership}" data-i18n="leadership*" >Leadership*</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_leadership_1" value="10" title="@{leadership_1}" /><span></span>
@@ -1412,7 +1412,7 @@
             &nbsp;
         </div>
         <div class="grid-item contents-centered">
-            <button type="roll" class="sheet-skill_btn" name="roll_rumor" value="&{template:zweihander} {{name=^{rumor} }} {{skill=^{rumor} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{rumor} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{rumor}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{rumor_focus_1} }} {{focus2=@{rumor_focus_2} }} {{focus3=@{rumor_focus_3} }} {{focus4=@{rumor_focus_4} }} {{focus5=@{rumor_focus_5} }} {{focus6=@{rumor_focus_6} }}" title="%{Character_Name|rumor}" data-i18n="rumor" >Rumor</button>
+            <button type="roll" class="sheet-skill_btn" name="roll_rumor" value="&{template:zweihander} {{name=^{rumor} }} {{skill=^{rumor} }} {{attrib=^{fellowship} }} {{attrib_rank=[[ @{fellowship} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill_rank=[[@{rumor} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{fellowship} + [[@{rumor}]] + @{difficulty} + ?{@{bonusmacro}|0} ]] }} {{focus1=@{rumor_focus_1} }} {{focus2=@{rumor_focus_2} }} {{focus3=@{rumor_focus_3} }} {{focus4=@{rumor_focus_4} }} {{focus5=@{rumor_focus_5} }} {{focus6=@{rumor_focus_6} }}" title="%{Character_Name|rumor}" data-i18n="rumor" >Rumor</button>
         </div>
         <div class="grid-item contents-centered">
             <input type="checkbox" class="sheet-circle" name="attr_rumor_1" value="10" title="@{rumor_1}" /><span></span>
@@ -1713,10 +1713,10 @@
         <div class="grid-item">
             <div class="grid-container contains-four-columns"> <!-- TABLES CONVERTED TO GRID-CONTAINER CONTAINS-FOUR-COLUMNS -->
                 <div class="grid-item span-one-two contents-centered">
-                    <button type="roll" class="sheet-skill_btn" name="roll_dodge" value="&{template:zweihander} {{name=^{dodge} }} {{character=@{character_name} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill=^{coordination} }} {{skill_rank=[[ @{coordination} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{dodge} + @{difficulty} + ?{@{bonusmacro}|0} ]] }}" title="%{Character_Name|dodge}" data-i18n="dodge" >Dodge</button>
+                    <button type="roll" class="sheet-skill_btn" name="roll_dodge" value="&{template:zweihander} {{name=^{dodge} }} {{character=@{character_name} }} {{attrib=^{agility} }} {{attrib_rank=[[ @{agility} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill=^{coordination} }} {{skill_rank=[[ @{coordination} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{dodge} + @{difficulty} + ?{@{bonusmacro}|0} ]] }}" title="%{Character_Name|dodge}" data-i18n="dodge" >Dodge</button>
                 </div>
                 <div class="grid-item span-three-four contents-centered">
-                    <button type="roll" class="sheet-skill_btn" name="roll_parry" value="&{template:zweihander} {{name=^{parry} }} {{character=@{character_name} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{diff=[[ @{difficulty} ]] }} {{skill=^{@{parry_type}} }}{{skill_rank=[[ @{parry_rating} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{combat} + @{parry_rating} + @{difficulty} + ?{@{bonusmacro}|0} ]] }}" title="%{Character_Name|parry}" data-i18n="parry" >Parry</button>
+                    <button type="roll" class="sheet-skill_btn" name="roll_parry" value="&{template:zweihander} {{name=^{parry} }} {{character=@{character_name} }} {{attrib=^{combat} }} {{attrib_rank=[[ @{combat} ]] }} {{difficulty=^{difficulty:} }} {{diff=[[ @{difficulty} ]] }} {{skill=^{@{parry_type}} }}{{skill_rank=[[ @{parry_rating} ]] }} {{mod=[[ ?{@{bonusmacro}|0} ]] }} {{roll=[[1d100]] }} {{rating=[[ @{combat} [Combat] + @{parry_rating} [Parry Rating] + @{shield_parry_modifier} [Shield Parry Modifier] + @{difficulty} [Difficulty] + ?{@{bonusmacro}|0} [Situational Modifiers] ]] }}" title="%{Character_Name|parry}" data-i18n="parry" >Parry</button>
                 </div>
                 <div class="grid-item span-one-two contents-centered">
                     <input type="number" class="sheet-medium_box" name="attr_dodge" value="0" title="@{dodge}"><br>
@@ -1728,7 +1728,7 @@
                         <option value="1" selected="selected">Martial Melee</option>
                         <option value="2">Simple Melee</option>
                     </select>
-                    <input type="hidden" class="sheet-text2" name="attr_parry_rating" />
+                    <input type="hidden" class="sheet-text2" name="attr_parry_rating"  value="0" />
                     <input type="hidden" class="sheet-text2" name="attr_parry_type"/>
                 </div>
                 <div class="grid-item span-all-four contents-centered">
@@ -2553,7 +2553,7 @@
                 {{/attrib}}
                 {{#skill}}
                     <div class="template-grid-item template-span-three-four">
-                        <span class="">{{skill}}:</span>{{skill_rank}}
+                        <span>{{skill}}:</span>{{skill_rank}}
                     </div>
                 {{/skill}}
                 {{#difficulty}}
@@ -2563,7 +2563,7 @@
                 {{/difficulty}}
                 {{#mod}}
                     <div class="template-grid-item template-span-three-four">
-                        <span data-i18n="modifier:">Modifier:</span>
+                        <span data-i18n="modifier:">Modifier:</span>{{mod}}
                     </div>
                 {{/mod}}
                 {{#chaos}}
@@ -2643,7 +2643,7 @@
                 {{/roll}}
                 {{#rating}}
                     <div class="template-grid-item template-span-three-four template-center-contents">
-                        <span class="">{{rating}}</span><br>
+                        <span>{{rating}}</span><br>
                         <span class="template-smaller" data-i18n="rating">Rating</span>
                     </div>
                 {{/rating}}
@@ -2654,7 +2654,7 @@
                 {{/focus1}}
                 {{#range}}
                     <div class="template-grid-item template-span-one-two">
-                        <span data-i18n="range:">Range: </span>
+                        <span data-i18n="range:">Range: </span>{{range}}
                     </div>
                 {{/range}}
                 {{#damage}}
@@ -3049,18 +3049,18 @@
     });
     
     //Parry_skill 
-    on("change:parry_skill change:martial_melee change:simple_melee change:combat", function() {
-        getAttrs(["parry_skill", "martial_melee", "simple_melee", "combat", ], function(values) {
+    on("change:parry_skill change:martial_melee change:simple_melee change:combat change:shield_parry_modifier", function() {
+        getAttrs(["parry_skill", "martial_melee", "simple_melee", "combat", "shield_parry_modifier"], function(values) {
             var setParry = 0;
             var setParryRating = 0;
             var setParryType = 0;
             if (values.parry_skill == 1) {
-                setParry = parseInt(values.martial_melee,10) + parseInt(values.combat,10);
+                setParry = parseInt(values.martial_melee,10) + parseInt(values.combat,10) + parseInt(values.shield_parry_modifier,10);
                 setParryRating = parseInt(values.martial_melee,10);
                 setParryType = "Martial Melee";
             }
             else if (values.parry_skill == 2) {
-                setParry = parseInt(values.simple_melee,10) + parseInt(values.combat,10);
+                setParry = parseInt(values.simple_melee,10) + parseInt(values.combat,10) + parseInt(values.shield_parry_modifier,10);
                 setParryRating = parseInt(values.simple_melee,10);
                 setParryType = "Simple Melee";
             }
diff --git a/Zweihänder Grim & Perilous/translation.json b/Zweihänder Grim & Perilous/translation.json
index 8f9399752a..de8407a3ee 100644
--- a/Zweihänder Grim & Perilous/translation.json	
+++ b/Zweihänder Grim & Perilous/translation.json	
@@ -169,9 +169,9 @@
 	"roll20-wiki-link": "Roll20 Wiki Link",
 	"situational-modifier": "Situational Modifier",
 	"difficulty:": "Difficulty:",
-	"modifier:": "Modifier:$[[3]] ",
+	"modifier:": "Modifier:",
 	"rating": "Rating",
-	"range:": "Range: 0 / 0 / 0 ",
+	"range:": "Range: ",
 	"damage:": "Damage:$[[6]] ",
 	"CRITICAL-SUCCESS-u": "CRITICAL SUCCESS",
 	"chaos:": "Chaos:$[[4]] ",