diff --git a/DnD_5e/DnD_5e.html b/DnD_5e/DnD_5e.html
index 53129043fe..6c5d8a6220 100644
--- a/DnD_5e/DnD_5e.html
+++ b/DnD_5e/DnD_5e.html
@@ -24,11 +24,11 @@
 					<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
 					<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
 						<select name="attr_ro_default_rolltype">
-							<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling}">Roll 2d20</option>
+							<option value="{{showadvroll=1}} {{roll2=[[ 1d20">Roll 2d20</option>
 							<option value="{{noadvroll=1}}">Roll 1d20</option>
-							<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125|Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}|Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-							<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling}">ALWAYS Advantage</option>
-							<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling}">ALWAYS Disadvantage</option>
+							<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125|Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20|Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+							<option value="{{rollhasadv=1}} {{roll2=[[ 1d20">ALWAYS Advantage</option>
+							<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20">ALWAYS Disadvantage</option>
 						</select>
 					</div>
 				</div>
@@ -37,8 +37,25 @@
 		</div>
 		<!-- close outer modal div -->
 	</div>
-<div class="sheet-player">
-	  <input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Core Stats" checked="checked" />
+	<div class="sheet-core-header sheet-padb">
+		<div class="sheet-row">
+			<div class="sheet-col-1-3 sheet-margin-top"><img src="http://i.imgur.com/Y8KHPKm.png" alt="Dungeons and Dragons (5th edition)"></div>
+			<div class="sheet-col-1-8 sheet-small-label sheet-center">
+				<input class="sheet-underlined sheet-center" type="text" name="attr_sheet_version" value="1.1.4" disabled="disabled" />
+				<br/>Sheet Version</div>
+			<div class="sheet-col-1-4 sheet-small-label sheet-center">
+				<input class="sheet-underlined sheet-center" type="text" name="attr_character_name">
+				<br/>Character Name</div>
+			<div class="sheet-col-1-8 sheet-small-label sheet-center">
+				<input class="sheet-underlined sheet-center" type="text" name="attr_race">
+				<br/>Race</div>
+			<div class="sheet-col-1-6 sheet-small-label sheet-center">
+				<input class="sheet-underlined sheet-center" type="text" name="attr_class">
+				<br/>Class</div>
+		</div>
+	</div>
+	<div class="sheet-player">
+		<input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Core Stats" checked="checked" />
 		<span class="sheet-tab sheet-tab1">Core Stats</span>
 		<input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" />
 		<span class="sheet-tab sheet-tab2">Skills</span>
@@ -56,28 +73,6 @@
 		<span class="sheet-tab sheet-tab7">Inventory</span>
 		<input type="radio" name="attr_tab" class="sheet-tab sheet-tab99" value="99" />
 		<span class="sheet-tab sheet-tab99">Show All</span>
-		<div class="sheet-core-header sheet-padb">
-		  <div class="sheet-row">
-		    <div class="sheet-col-1-3 sheet-margin-top"><img src="http://i.imgur.com/Y8KHPKm.png" alt="Dungeons and Dragons (5th edition)"></div>
-		    <div class="sheet-col-1-8 sheet-small-label sheet-center">
-		      <input class="sheet-underlined sheet-center" type="text" name="attr_sheet_version" value="1.2.0" disabled="disabled" />
-		      <br/>
-		      Sheet Version</div>
-		    <div class="sheet-col-1-4 sheet-small-label sheet-center">
-		      <input class="sheet-underlined sheet-center" type="text" name="attr_character_name">
-		      <br/>
-		      Character Name</div>
-		    <div class="sheet-col-1-8 sheet-small-label sheet-center">
-		      <input class="sheet-underlined sheet-center" type="text" name="attr_race">
-		      <br/>
-		      Race</div>
-		    <div class="sheet-col-1-6 sheet-small-label sheet-center">
-		      <input class="sheet-underlined sheet-center" type="text" name="attr_class">
-		      <br/>
-		      Class</div>
-	      </div>
-	  </div>
-	 
 		<span class="sheet-spacer"></span>
 		<div class="sheet-section-core">
 			<div class="sheet-row">
@@ -107,7 +102,7 @@
 							<input type="number" name="attr_strength_save_mod" value="@{strength_mod} + @{strength_save_prof}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
-							<button type="roll" class="sheet-core-save" name="roll_Strength_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=STR save}} {{roll1=[[ 1d2@{global_halfling} + [[@{strength_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_strsave} @{classactionstrengthsave}">Save</button>
+							<button type="roll" class="sheet-core-save" name="roll_Strength_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=STR save}} {{roll1=[[ 1d20 + [[@{strength_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_strsave} @{classactionstrengthsave}">Save</button>
 						</div>
 						<div class="sheet-col-1-7 sheet-align-center">
 							<input type="checkbox" name="attr_str_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -128,7 +123,7 @@
 									<div class="sheet-row sheet-padb">
 										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 										<div class="sheet-col-1-3 sheet-padl">
-											<button type="roll" class="sheet-roll" name="roll_Strength_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=STR save}} {{roll1=[[ 1d2@{global_halfling} + [[@{strength_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_strsave} @{classactionstrengthsave}">Roll</button>
+											<button type="roll" class="sheet-roll" name="roll_Strength_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=STR save}} {{roll1=[[ 1d20 + [[@{strength_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_strsave} @{classactionstrengthsave}">Roll</button>
 										</div>
 									</div>
 									<hr/>
@@ -139,11 +134,11 @@
 											<input type="hidden" name="attr_ro_strsave_roll2_closing" value="+ [[@{strength_save_mod}]] + [[@{global_saving_bonus}]] ]] }}" />
 											<select name="attr_ro_strsave_rolltype">
 												<option value="@{ro_default_rolltype}">Use Default</option>
-												<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 												<option value="{{noadvroll=1}}">Roll 1d20</option>
-												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-												<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 											</select>
 										</div>
 									</div>
@@ -184,7 +179,7 @@
 							<input type="number" name="attr_dexterity_save_mod" value="@{dexterity_mod} + @{dexterity_save_prof}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
-							<button type="roll" class="sheet-core-save" name="roll_Dexterity_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=DEX save}} {{roll1=[[ 1d2@{global_halfling} + [[@{dexterity_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_dexsave} @{classactiondexteritysave}">Save</button>
+							<button type="roll" class="sheet-core-save" name="roll_Dexterity_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=DEX save}} {{roll1=[[ 1d20 + [[@{dexterity_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_dexsave} @{classactiondexteritysave}">Save</button>
 						</div>
 						<div class="sheet-col-1-7 sheet-align-center">
 							<input type="checkbox" name="attr_dex_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -205,7 +200,7 @@
 									<div class="sheet-row sheet-padb">
 										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 										<div class="sheet-col-1-3 sheet-padl">
-											<button type="roll" class="sheet-roll" name="roll_Dexterity_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=DEX save}} {{roll1=[[ 1d2@{global_halfling} + [[@{dexterity_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_dexsave} @{classactiondexteritysave}">Roll</button>
+											<button type="roll" class="sheet-roll" name="roll_Dexterity_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=DEX save}} {{roll1=[[ 1d20 + [[@{dexterity_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_dexsave} @{classactiondexteritysave}">Roll</button>
 										</div>
 									</div>
 									<hr/>
@@ -216,11 +211,11 @@
 											<input type="hidden" name="attr_ro_dexsave_roll2_closing" value="+ [[@{dexterity_save_mod}]] + [[@{global_saving_bonus}]] ]] }}" />
 											<select name="attr_ro_dexsave_rolltype">
 												<option value="@{ro_default_rolltype}">Use Default</option>
-												<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 												<option value="{{noadvroll=1}}">Roll 1d20</option>
-												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-												<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 											</select>
 										</div>
 									</div>
@@ -261,7 +256,7 @@
 							<input type="number" name="attr_constitution_save_mod" value="@{constitution_mod} + @{constitution_save_prof}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
-							<button type="roll" class="sheet-core-save" name="roll_Constitution_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CON save}} {{roll1=[[ 1d2@{global_halfling} + [[@{constitution_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_consave} @{classactionconstitutionsave}">Save</button>
+							<button type="roll" class="sheet-core-save" name="roll_Constitution_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CON save}} {{roll1=[[ 1d20 + [[@{constitution_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_consave} @{classactionconstitutionsave}">Save</button>
 						</div>
 						<div class="sheet-col-1-7 sheet-align-center">
 							<input type="checkbox" name="attr_con_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -282,7 +277,7 @@
 									<div class="sheet-row sheet-padb">
 										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 										<div class="sheet-col-1-3 sheet-padl">
-											<button type="roll" class="sheet-roll" name="roll_Constitution_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CON save}} {{roll1=[[ 1d2@{global_halfling} + [[@{constitution_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_consave} @{classactionconstitutionsave}">Roll</button>
+											<button type="roll" class="sheet-roll" name="roll_Constitution_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CON save}} {{roll1=[[ 1d20 + [[@{constitution_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_consave} @{classactionconstitutionsave}">Roll</button>
 										</div>
 									</div>
 									<hr/>
@@ -293,11 +288,11 @@
 											<input type="hidden" name="attr_ro_consave_roll2_closing" value="+ [[@{constitution_save_mod}]] + [[@{global_saving_bonus}]] ]] }}" />
 											<select name="attr_ro_consave_rolltype">
 												<option value="@{ro_default_rolltype}">Use Default</option>
-												<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 												<option value="{{noadvroll=1}}">Roll 1d20</option>
-												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-												<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 											</select>
 										</div>
 									</div>
@@ -338,7 +333,7 @@
 							<input type="number" name="attr_intelligence_save_mod" value="@{intelligence_mod} + @{intelligence_save_prof}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
-							<button type="roll" class="sheet-core-save" name="roll_Intelligence_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=INT save}} {{roll1=[[ 1d2@{global_halfling} + [[@{intelligence_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_intsave} @{classactionintelligencesave}">Save</button>
+							<button type="roll" class="sheet-core-save" name="roll_Intelligence_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=INT save}} {{roll1=[[ 1d20 + [[@{intelligence_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_intsave} @{classactionintelligencesave}">Save</button>
 						</div>
 						<div class="sheet-col-1-7 sheet-align-center">
 							<input type="checkbox" name="attr_int_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -359,7 +354,7 @@
 									<div class="sheet-row sheet-padb">
 										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 										<div class="sheet-col-1-3 sheet-padl">
-											<button type="roll" class="sheet-roll" name="roll_Intelligence_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=INT save}} {{roll1=[[ 1d2@{global_halfling} + [[@{intelligence_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_intsave} @{classactionintelligencesave}">Roll</button>
+											<button type="roll" class="sheet-roll" name="roll_Intelligence_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=INT save}} {{roll1=[[ 1d20 + [[@{intelligence_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_intsave} @{classactionintelligencesave}">Roll</button>
 										</div>
 									</div>
 									<hr/>
@@ -370,11 +365,11 @@
 											<input type="hidden" name="attr_ro_intsave_roll2_closing" value="+ [[@{intelligence_save_mod}]] + [[@{global_saving_bonus}]] ]] }}" />
 											<select name="attr_ro_intsave_rolltype">
 												<option value="@{ro_default_rolltype}">Use Default</option>
-												<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 												<option value="{{noadvroll=1}}">Roll 1d20</option>
-												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-												<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 											</select>
 										</div>
 									</div>
@@ -415,7 +410,7 @@
 							<input type="number" name="attr_wisdom_save_mod" value="@{wisdom_mod} + @{wisdom_save_prof}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
-							<button type="roll" class="sheet-core-save" name="roll_Wisdom_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=WIS save}} {{roll1=[[ 1d2@{global_halfling} + [[@{wisdom_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_wissave} @{classactionwisdomsave}">Save</button>
+							<button type="roll" class="sheet-core-save" name="roll_Wisdom_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=WIS save}} {{roll1=[[ 1d20 + [[@{wisdom_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_wissave} @{classactionwisdomsave}">Save</button>
 						</div>
 						<div class="sheet-col-1-7 sheet-align-center">
 							<input type="checkbox" name="attr_wis_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -436,7 +431,7 @@
 									<div class="sheet-row sheet-padb">
 										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 										<div class="sheet-col-1-3 sheet-padl">
-											<button type="roll" class="sheet-roll" name="roll_Wisdom_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=WIS save}} {{roll1=[[ 1d2@{global_halfling} + [[@{wisdom_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_wissave} @{classactionwisdomsave}">Roll</button>
+											<button type="roll" class="sheet-roll" name="roll_Wisdom_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=WIS save}} {{roll1=[[ 1d20 + [[@{wisdom_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_wissave} @{classactionwisdomsave}">Roll</button>
 										</div>
 									</div>
 									<hr/>
@@ -447,11 +442,11 @@
 											<input type="hidden" name="attr_ro_wissave_roll2_closing" value="+ [[@{wisdom_save_mod}]] + [[@{global_saving_bonus}]] ]] }}" />
 											<select name="attr_ro_wissave_rolltype">
 												<option value="@{ro_default_rolltype}">Use Default</option>
-												<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 												<option value="{{noadvroll=1}}">Roll 1d20</option>
-												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-												<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 											</select>
 										</div>
 									</div>
@@ -492,7 +487,7 @@
 							<input type="number" name="attr_charisma_save_mod" value="@{charisma_mod} + @{charisma_save_prof}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
-							<button type="roll" class="sheet-core-save" name="roll_Charisma_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CHA save}} {{roll1=[[ 1d2@{global_halfling} + [[@{charisma_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_chasave} @{classactioncharismasave}">Save</button>
+							<button type="roll" class="sheet-core-save" name="roll_Charisma_Save" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CHA save}} {{roll1=[[ 1d20 + [[@{charisma_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_chasave} @{classactioncharismasave}">Save</button>
 						</div>
 						<div class="sheet-col-1-7 sheet-align-center">
 							<input type="checkbox" name="attr_cha_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -513,7 +508,7 @@
 									<div class="sheet-row sheet-padb">
 										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 										<div class="sheet-col-1-3 sheet-padl">
-											<button type="roll" class="sheet-roll" name="roll_Charisma_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CHA save}} {{roll1=[[ 1d2@{global_halfling} + [[@{charisma_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_chasave} @{classactioncharismasave}">Roll</button>
+											<button type="roll" class="sheet-roll" name="roll_Charisma_Save_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{save=1}} {{simple=1}} {{rollname=CHA save}} {{roll1=[[ 1d20 + [[@{charisma_save_mod}]] + [[@{global_saving_bonus}]] ]]}} @{ro_chasave} @{classactioncharismasave}">Roll</button>
 										</div>
 									</div>
 									<hr/>
@@ -524,11 +519,11 @@
 											<input type="hidden" name="attr_ro_chasave_roll2_closing" value="+ [[@{charisma_save_mod}]] + [[@{global_saving_bonus}]] ]] }}" />
 											<select name="attr_ro_chasave_rolltype">
 												<option value="@{ro_default_rolltype}">Use Default</option>
-												<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 												<option value="{{noadvroll=1}}">Roll 1d20</option>
-												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-												<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 											</select>
 										</div>
 									</div>
@@ -586,7 +581,7 @@
 									<input class="sheet-underlined" type="number" name="attr_initiative_overall" value="@{dexterity_mod} + @{initiative}" disabled="disabled">
 									<br/>Total</div>
 								<div class="sheet-col-1-3 sheet-center">
-									<button type="roll" class="sheet-initiative sheet-large-button" name="roll_Initiative" value="&{template:5eDefault} {{title=Initiative}} {{subheader=@{character_name}}} {{rollname=Initiative}} {{roll=[[ 1d2@{global_halfling} + @{selected|initiative_overall} [Initiative Mod] &{tracker} ]]}} @{classactioninitiative}">Initiative</button>
+									<button type="roll" class="sheet-initiative sheet-large-button" name="roll_Initiative" value="&{template:5eDefault} {{title=Initiative}} {{subheader=@{character_name}}} {{rollname=Initiative}} {{roll=[[ 1d20 + @{selected|initiative_overall} [Initiative Mod] &{tracker} ]]}} @{classactioninitiative}">Initiative</button>
 								</div>
 							</div>
 						</div>
@@ -605,7 +600,7 @@
 					<h4 class="sheet-center">Level and Experience<span class="sheet-pictos-three">d</span></h4>
 					<div class="sheet-row">
 						<div class="sheet-col-1-4 sheet-small-label sheet-center" title="This is automatically calculated from your individual class levels listed in the class section">
-							<input class="sheet-underlined" type="number" name="attr_level" value="@{artificer_level} + @{barbarian_level} + @{bard_level} + @{cleric_level} + @{druid_level} + @{fighter_level} + @{monk_level} + @{paladin_level} + @{ranger_level} + @{rogue_level} + @{sorcerer_level} + @{warlock_level} + @{wizard_level}" disabled="disabled">
+							<input class="sheet-underlined" type="number" name="attr_level" value="@{barbarian_level} + @{bard_level} + @{cleric_level} + @{druid_level} + @{fighter_level} + @{monk_level} + @{paladin_level} + @{ranger_level} + @{rogue_level} + @{sorcerer_level} + @{warlock_level} + @{wizard_level}" disabled="disabled">
 							<br/>Overall Level</div>
 						<div class="sheet-col-1-4 sheet-small-label sheet-center" title="This is a bonus for you being proficient in a given task.  This bonus automatically increases as you level up and is used automatically in various rolls">
 							<input class="sheet-underlined" type="number" name="attr_PB" value="(ceil((@{level})/1e10) + ceil((@{level})/4))" disabled="disabled">
@@ -659,21 +654,15 @@
 							<br/>Save DC</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-8-13 sheet-center sheet-small-label sheet-sub-header">Saves and skill checks</div>
-						<div class="sheet-col-1-21">&nbsp;</div>
-						<div class="sheet-col-1-3 sheet-center sheet-small-label sheet-sub-header">Halfling Lucky</div>
+						<div class="sheet-col-1 sheet-center sheet-small-label sheet-sub-header">Saves and skill checks</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-4-13 sheet-small-label sheet-center">
+						<div class="sheet-col-1-2 sheet-small-label sheet-center">
 							<input class="sheet-underlined sheet-center" type="text" name="attr_global_saving_bonus" value="0">
 							<br/>Saving throws</div>
-						<div class="sheet-col-4-13 sheet-small-label sheet-center">
+						<div class="sheet-col-1-2 sheet-small-label sheet-center">
 							<input class="sheet-underlined sheet-center" type="text" name="attr_global_check_bonus" value="0">
 							<br/>Ability/Skill Checks</div>
-						<div class="sheet-col-1-21">&nbsp;</div>
-						<div class="sheet-col-1-3 sheet-small-label sheet-center">
-							<input type="checkbox" name="attr_global_halfling" value="0ro">
-							</div>
 					</div>
 				</div>
 				<div class="sheet-col-7-12">
@@ -699,13 +688,13 @@
 						</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-3-7 sheet-hd-row">Artificer, Bard, Cleric, Druid, Rogue, Monk, Warlock</div>
+						<div class="sheet-col-3-7 sheet-hd-row">Bard, Cleric, Druid, Rogue, Monk, Warlock</div>
 						<div class="sheet-col-1-7 sheet-center sheet-hd-row">d8</div>
 						<div class="sheet-col-1-7">
 							<input type="number" name="attr_hd_d8" value="0" min="0" step="1">
 						</div>
 						<div class="sheet-col-1-7">
-							<input type="number" name="attr_hd_d8_max" value="@{artificer_level} + @{bard_level} + @{cleric_level} + @{druid_level} + @{rogue_level} + @{monk_level} + @{warlock_level}" disabled="disabled">
+							<input type="number" name="attr_hd_d8_max" value="@{bard_level} + @{cleric_level} + @{druid_level} + @{rogue_level} + @{monk_level} + @{warlock_level}" disabled="disabled">
 						</div>
 						<div class="sheet-col-1-7 sheet-center">
 							<button type="roll" class="sheet-roll" name="roll_Use_HD_d8" value="&{template:5eDefault} {{title=Spending Hit Dice - 1d8}} {{subheader=@{character_name}}} {{rollname=HP regained}} {{roll=[[ 1d8 + @{constitution_mod} ]]}} ]]}} @{classactionhitdice}">Use</button>
@@ -767,7 +756,7 @@
 						<div class="sheet-col-1-5 sheet-margin-top">
 							<div class="sheet-row">
 								<div class="sheet-col-1-2 sheet-center">
-									<button type="roll" class="sheet-roll" name="roll_Death_Saving_Throw" value="@{ro_deathsave_whisper} &{template:5eDefault} {{character_name=@{character_name}}} {{title=Death Save}} {{subheader=@{character_name}}} {{deathsave=1}} {{simple=1}} {{rollname=Death save}} {{roll1=[[ 1d2@{global_halfling} + [[@{global_saving_bonus}]] ]]}} @{ro_deathsave} @{classactiondeathsave}">Death Saving Throw</button>
+									<button type="roll" class="sheet-roll" name="roll_Death_Saving_Throw" value="@{ro_deathsave_whisper} &{template:5eDefault} {{character_name=@{character_name}}} {{title=Death Save}} {{subheader=@{character_name}}} {{deathsave=1}} {{simple=1}} {{rollname=Death save}} {{roll1=[[ 1d20 + [[@{global_saving_bonus}]] ]]}} @{ro_deathsave} @{classactiondeathsave}">Death Saving Throw</button>
 								</div>
 								<div class="sheet-col-1-2 sheet-align-center">
 									<input type="checkbox" name="attr_death_save_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -788,7 +777,7 @@
 											<div class="sheet-row sheet-padb">
 												<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 												<div class="sheet-col-1-3 sheet-padl">
-													<button type="roll" class="sheet-roll" name="roll_Death_Saving_Throw_ro" value="@{ro_deathsave_whisper} &{template:5eDefault} {{character_name=@{character_name}}} {{title=Death Save}} {{subheader=@{character_name}}} {{deathsave=1}} {{simple=1}} {{rollname=Death save}} {{roll1=[[ 1d2@{global_halfling} + [[@{global_saving_bonus}]] ]]}} @{ro_deathsave} @{classactiondeathsave}">Roll</button>
+													<button type="roll" class="sheet-roll" name="roll_Death_Saving_Throw_ro" value="@{ro_deathsave_whisper} &{template:5eDefault} {{character_name=@{character_name}}} {{title=Death Save}} {{subheader=@{character_name}}} {{deathsave=1}} {{simple=1}} {{rollname=Death save}} {{roll1=[[ 1d20 + [[@{global_saving_bonus}]] ]]}} @{ro_deathsave} @{classactiondeathsave}">Roll</button>
 												</div>
 											</div>
 											<hr/>
@@ -799,11 +788,11 @@
 													<input type="hidden" name="attr_ro_deathsave_roll2_closing" value="+ [[@{global_saving_bonus}]] ]] }}" />
 													<select name="attr_ro_deathsave_rolltype">
 														<option value="@{ro_default_rolltype}">Use Default</option>
-														<option value="{{showadvroll=1}} {{roll2=[[ 1d2@{global_halfling} ">Roll 2d20</option>
+														<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
 														<option value="{{noadvroll=1}}" selected="selected">Roll 1d20</option>
-														<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d2@{global_halfling}}">Prompt for adv/disadv</option>
-														<option value="{{rollhasadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Advantage</option>
-														<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d2@{global_halfling} ">ALWAYS Disadvantage</option>
+														<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+														<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+														<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
 													</select>
 												</div>
 											</div>
@@ -841,2384 +830,2384 @@
 			</div>
 			<hr/>
 		</div>
-<div class="sheet-section-skills">
-	  <h4 class="sheet-center">Skills <span class="sheet-pictos">x</span></h4>
-		  <div class="sheet-row">
-		    <div class="sheet-col-1-2 sheet-padr">
-		      <div class="sheet-row sheet-sub-header">
-		        <div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
-		        <div class="sheet-col-7-24 sheet-small-label">Skill</div>
-		        <div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
-		        <div class="sheet-col-1-12 sheet-center sheet-small-label">Total</div>
-		        <div class="sheet-col-1-12  sheet-center sheet-small-label">Pass</div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_acrobatics_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Acrobatics roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_acrobatics_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_acrobatics2" value="@{ro_acrobatics_rolltype}@{ro_acrobatics_roll2_closing} @{ro_acrobatics_emoteprompt} @{ro_acrobatics_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Acrobatics_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Acrobatics (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{acrobatics}]] + [[@{global_check_bonus}]] ]]}} @{ro_acrobatics} @{classactionacrobatics}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_acrobatics_roll2_closing2" value="+ [[@{acrobatics}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_acrobatics_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_acrobatics_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_acrobatics_showmath2" value="{{math=1d20
+		<div class="sheet-section-skills">
+			<h4 class="sheet-center">Skills <span class="sheet-pictos">x</span></h4>
+			<div class="sheet-row">
+				<div class="sheet-col-1-2 sheet-padr">
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-7-24 sheet-small-label">Skill</div>
+						<div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
+						<div class="sheet-col-1-12 sheet-center sheet-small-label">Total</div>
+						<div class="sheet-col-1-12  sheet-center sheet-small-label">Pass</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_acrobatics_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Acrobatics roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_acrobatics_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_acrobatics" value="@{ro_acrobatics_rolltype}@{ro_acrobatics_roll2_closing} @{ro_acrobatics_emoteprompt} @{ro_acrobatics_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Acrobatics_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Acrobatics (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{acrobatics}]] + [[@{global_check_bonus}]] ]]}} @{ro_acrobatics} @{classactionacrobatics}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_acrobatics_roll2_closing" value="+ [[@{acrobatics}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_acrobatics_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_acrobatics_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_acrobatics_showmath" value="{{math=1d20
 										+ [[@{acrobatics}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Acrobatics_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Acrobatics (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{acrobatics}]] + [[@{global_check_bonus}]] ]]}} @{ro_acrobatics} @{classactionacrobatics}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Acrobatics (Dex)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_acrobatics_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_acrobatics_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_acrobatics2" value="@{acrobatics_prof_exp}+@{dexterity_mod}+@{acrobatics_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_acrobatics2" value="10 + @{acrobatics}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_animalhandling_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Animal Handling roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_animalhandling_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_animalhandling2" value="@{ro_animalhandling_rolltype}@{ro_animalhandling_roll2_closing} @{ro_animalhandling_emoteprompt} @{ro_animalhandling_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_AnimalHandling_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Animal Handling (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{animalhandling}]] + [[@{global_check_bonus}]] ]]}} @{ro_animalhandling} @{classactionanimalhandling}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_animalhandling_roll2_closing2" value="+ [[@{animalhandling}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_animalhandling_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_animalhandling_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_animalhandling_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Acrobatics_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Acrobatics (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{acrobatics}]] + [[@{global_check_bonus}]] ]]}} @{ro_acrobatics} @{classactionacrobatics}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Acrobatics (Dex)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_acrobatics_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_acrobatics_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_acrobatics" value="@{acrobatics_prof_exp}+@{dexterity_mod}+@{acrobatics_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_acrobatics" value="10 + @{acrobatics}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_animalhandling_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Animal Handling roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_animalhandling_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_animalhandling" value="@{ro_animalhandling_rolltype}@{ro_animalhandling_roll2_closing} @{ro_animalhandling_emoteprompt} @{ro_animalhandling_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_AnimalHandling_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Animal Handling (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{animalhandling}]] + [[@{global_check_bonus}]] ]]}} @{ro_animalhandling} @{classactionanimalhandling}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_animalhandling_roll2_closing" value="+ [[@{animalhandling}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_animalhandling_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_animalhandling_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_animalhandling_showmath" value="{{math=1d20
 										+ [[@{animalhandling}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_AnimalHandling_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Animal Handling (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{animalhandling}]] + [[@{global_check_bonus}]] ]]}} @{ro_animalhandling} @{classactionanimalhandling}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Animal Handling (Wis)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_animalhandling_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_animalhandling_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_animalhandling2" value="@{animalhandling_prof_exp}+@{wisdom_mod}+@{animalhandling_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_animalhandling2" value="10 + @{animalhandling}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_arcana_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Arcana roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_arcana_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_arcana2" value="@{ro_arcana_rolltype}@{ro_arcana_roll2_closing} @{ro_arcana_emoteprompt} @{ro_arcana_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Arcana_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Arcana (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{arcana}]] + [[@{global_check_bonus}]] ]]}} @{ro_arcana} @{classactionarcana}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_arcana_roll2_closing2" value="+ [[@{arcana}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_arcana_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_arcana_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_arcana_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_AnimalHandling_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Animal Handling (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{animalhandling}]] + [[@{global_check_bonus}]] ]]}} @{ro_animalhandling} @{classactionanimalhandling}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Animal Handling (Wis)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_animalhandling_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_animalhandling_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_animalhandling" value="@{animalhandling_prof_exp}+@{wisdom_mod}+@{animalhandling_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_animalhandling" value="10 + @{animalhandling}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_arcana_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Arcana roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_arcana_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_arcana" value="@{ro_arcana_rolltype}@{ro_arcana_roll2_closing} @{ro_arcana_emoteprompt} @{ro_arcana_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Arcana_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Arcana (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{arcana}]] + [[@{global_check_bonus}]] ]]}} @{ro_arcana} @{classactionarcana}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_arcana_roll2_closing" value="+ [[@{arcana}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_arcana_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_arcana_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_arcana_showmath" value="{{math=1d20
 										+ [[@{arcana}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Arcana_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Arcana (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{arcana}]] + [[@{global_check_bonus}]] ]]}} @{ro_arcana} @{classactionarcana}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Arcana (Int)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_arcana_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_arcana_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_arcana2" value="@{arcana_prof_exp}+@{intelligence_mod}+@{arcana_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_arcana2" value="10 + @{arcana}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_athletics_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Athletics roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_athletics_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_athletics2" value="@{ro_athletics_rolltype}@{ro_athletics_roll2_closing} @{ro_athletics_emoteprompt} @{ro_athletics_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_athletics_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Athletics (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{athletics}]] + [[@{global_check_bonus}]] ]]}} @{ro_athletics} @{classactionathletics}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_athletics_roll2_closing2" value="+ [[@{athletics}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_athletics_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_athletics_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_athletics_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Arcana_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Arcana (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{arcana}]] + [[@{global_check_bonus}]] ]]}} @{ro_arcana} @{classactionarcana}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Arcana (Int)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_arcana_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_arcana_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_arcana" value="@{arcana_prof_exp}+@{intelligence_mod}+@{arcana_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_arcana" value="10 + @{arcana}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_athletics_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Athletics roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_athletics_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_athletics" value="@{ro_athletics_rolltype}@{ro_athletics_roll2_closing} @{ro_athletics_emoteprompt} @{ro_athletics_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_athletics_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Athletics (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{athletics}]] + [[@{global_check_bonus}]] ]]}} @{ro_athletics} @{classactionathletics}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_athletics_roll2_closing" value="+ [[@{athletics}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_athletics_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_athletics_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_athletics_showmath" value="{{math=1d20
 										+ [[@{athletics}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Athletics_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Athletics (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{athletics}]] + [[@{global_check_bonus}]] ]]}} @{ro_athletics} @{classactionathletics}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Athletics (Str)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_athletics_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_athletics_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_athletics2" value="@{athletics_prof_exp}+@{strength_mod}+@{athletics_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_athletics2" value="10 + @{athletics}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_deception_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Deception roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_deception_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_deception2" value="@{ro_deception_rolltype}@{ro_deception_roll2_closing} @{ro_deception_emoteprompt} @{ro_deception_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Deception_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Deception (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{deception}]] + [[@{global_check_bonus}]] ]]}} @{ro_deception} @{classactiondeception}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_deception_roll2_closing2" value="+ [[@{deception}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_deception_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_deception_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_deception_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Athletics_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Athletics (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{athletics}]] + [[@{global_check_bonus}]] ]]}} @{ro_athletics} @{classactionathletics}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Athletics (Str)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_athletics_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_athletics_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_athletics" value="@{athletics_prof_exp}+@{strength_mod}+@{athletics_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_athletics" value="10 + @{athletics}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_deception_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Deception roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_deception_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_deception" value="@{ro_deception_rolltype}@{ro_deception_roll2_closing} @{ro_deception_emoteprompt} @{ro_deception_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Deception_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Deception (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{deception}]] + [[@{global_check_bonus}]] ]]}} @{ro_deception} @{classactiondeception}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_deception_roll2_closing" value="+ [[@{deception}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_deception_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_deception_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_deception_showmath" value="{{math=1d20
 										+ [[@{deception}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Deception_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Deception (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{deception}]] + [[@{global_check_bonus}]] ]]}} @{ro_deception} @{classactiondeception}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Deception (Cha)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_deception_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_deception_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_deception2" value="@{deception_prof_exp}+@{charisma_mod}+@{deception_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_deception2" value="10 + @{deception}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_history_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">History roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_history_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_history2" value="@{ro_history_rolltype}@{ro_history_roll2_closing} @{ro_history_emoteprompt} @{ro_history_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_History_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=History (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{history}]] + [[@{global_check_bonus}]] ]]}} @{ro_history} @{classactionhistory}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_history_roll2_closing2" value="+ [[@{history}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_history_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_history_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_history_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Deception_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Deception (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{deception}]] + [[@{global_check_bonus}]] ]]}} @{ro_deception} @{classactiondeception}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Deception (Cha)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_deception_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_deception_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_deception" value="@{deception_prof_exp}+@{charisma_mod}+@{deception_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_deception" value="10 + @{deception}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_history_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">History roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_history_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_history" value="@{ro_history_rolltype}@{ro_history_roll2_closing} @{ro_history_emoteprompt} @{ro_history_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_History_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=History (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{history}]] + [[@{global_check_bonus}]] ]]}} @{ro_history} @{classactionhistory}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_history_roll2_closing" value="+ [[@{history}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_history_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_history_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_history_showmath" value="{{math=1d20
 										+ [[@{history}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_History_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=History (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{history}]] + [[@{global_check_bonus}]] ]]}} @{ro_history} @{classactionhistory}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">History (Int)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_history_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_history_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_history2" value="@{history_prof_exp}+@{intelligence_mod}+@{history_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_history2" value="10 + @{history}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_insight_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Insight roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_insight_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_insight2" value="@{ro_insight_rolltype}@{ro_insight_roll2_closing} @{ro_insight_emoteprompt} @{ro_insight_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Insight_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Insight (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{insight}]] + [[@{global_check_bonus}]] ]]}} @{ro_insight} @{classactioninsight}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_insight_roll2_closing2" value="+ [[@{insight}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_insight_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_insight_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_insight_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_History_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=History (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{history}]] + [[@{global_check_bonus}]] ]]}} @{ro_history} @{classactionhistory}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">History (Int)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_history_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_history_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_history" value="@{history_prof_exp}+@{intelligence_mod}+@{history_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_history" value="10 + @{history}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_insight_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Insight roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_insight_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_insight" value="@{ro_insight_rolltype}@{ro_insight_roll2_closing} @{ro_insight_emoteprompt} @{ro_insight_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Insight_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Insight (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{insight}]] + [[@{global_check_bonus}]] ]]}} @{ro_insight} @{classactioninsight}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_insight_roll2_closing" value="+ [[@{insight}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_insight_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_insight_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_insight_showmath" value="{{math=1d20
 										+ [[@{insight}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Insight_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Insight (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{insight}]] + [[@{global_check_bonus}]] ]]}} @{ro_insight} @{classactioninsight}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Insight (Wis)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_insight_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_insight_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_insight2" value="@{insight_prof_exp}+@{wisdom_mod}+@{insight_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_insight2" value="10 + @{insight}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_intimidation_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Intimidation roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_intimidation_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_intimidation2" value="@{ro_intimidation_rolltype}@{ro_intimidation_roll2_closing} @{ro_intimidation_emoteprompt} @{ro_intimidation_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Intimidation_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Intimidation (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{intimidation}]] + [[@{global_check_bonus}]] ]]}} @{ro_intimidation} @{classactionintimidation}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_intimidation_roll2_closing2" value="+ [[@{intimidation}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_intimidation_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_intimidation_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_intimidation_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Insight_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Insight (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{insight}]] + [[@{global_check_bonus}]] ]]}} @{ro_insight} @{classactioninsight}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Insight (Wis)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_insight_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_insight_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_insight" value="@{insight_prof_exp}+@{wisdom_mod}+@{insight_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_insight" value="10 + @{insight}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_intimidation_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Intimidation roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_intimidation_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_intimidation" value="@{ro_intimidation_rolltype}@{ro_intimidation_roll2_closing} @{ro_intimidation_emoteprompt} @{ro_intimidation_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Intimidation_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Intimidation (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{intimidation}]] + [[@{global_check_bonus}]] ]]}} @{ro_intimidation} @{classactionintimidation}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_intimidation_roll2_closing" value="+ [[@{intimidation}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_intimidation_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_intimidation_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_intimidation_showmath" value="{{math=1d20
 										+ [[@{intimidation}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Intimidation_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Intimidation (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{intimidation}]] + [[@{global_check_bonus}]] ]]}} @{ro_intimidation} @{classactionintimidation}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Intimidation (Cha)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_intimidation_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_intimidation_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_intimidation2" value="@{intimidation_prof_exp}+@{charisma_mod}+@{intimidation_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_intimidation2" value="10 + @{intimidation}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_investigation_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Investigation roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_investigation_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_investigation2" value="@{ro_investigation_rolltype}@{ro_investigation_roll2_closing} @{ro_investigation_emoteprompt} @{ro_investigation_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Investigation_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Investigation (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{investigation}]] + [[@{global_check_bonus}]] ]]}} @{ro_investigation} @{classactioninvestigation}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_investigation_roll2_closing2" value="+ [[@{investigation}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_investigation_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_investigation_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_investigation_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Intimidation_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Intimidation (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{intimidation}]] + [[@{global_check_bonus}]] ]]}} @{ro_intimidation} @{classactionintimidation}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Intimidation (Cha)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_intimidation_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_intimidation_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_intimidation" value="@{intimidation_prof_exp}+@{charisma_mod}+@{intimidation_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_intimidation" value="10 + @{intimidation}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_investigation_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Investigation roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_investigation_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_investigation" value="@{ro_investigation_rolltype}@{ro_investigation_roll2_closing} @{ro_investigation_emoteprompt} @{ro_investigation_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Investigation_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Investigation (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{investigation}]] + [[@{global_check_bonus}]] ]]}} @{ro_investigation} @{classactioninvestigation}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_investigation_roll2_closing" value="+ [[@{investigation}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_investigation_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_investigation_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_investigation_showmath" value="{{math=1d20
 										+ [[@{investigation}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Investigation_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Investigation (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{investigation}]] + [[@{global_check_bonus}]] ]]}} @{ro_investigation} @{classactioninvestigation}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Investigation (Int)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_investigation_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_investigation_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_investigation2" value="@{investigation_prof_exp}+@{intelligence_mod}+@{investigation_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_investigation2" value="10 + @{investigation}" disabled="disabled">
-	            </div>
-	          </div>
-	        </div>
-		    <div class="sheet-col-1-2">
-		      <div class="sheet-row sheet-sub-header">
-		        <div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
-		        <div class="sheet-col-7-24 sheet-small-label">Skill</div>
-		        <div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
-		        <div class="sheet-col-1-12 sheet-center sheet-small-label">Total</div>
-		        <div class="sheet-col-1-12 sheet-center sheet-small-label">Pass</div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_medicine_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Medicine roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_medicine_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_medicine2" value="@{ro_medicine_rolltype}@{ro_medicine_roll2_closing} @{ro_medicine_emoteprompt} @{ro_medicine_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Medicine_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Medicine (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{medicine}]] + [[@{global_check_bonus}]] ]]}} @{ro_medicine} @{classactionmedicine}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_medicine_roll2_closing2" value="+ [[@{medicine}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_medicine_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_medicine_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_medicine_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Investigation_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Investigation (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{investigation}]] + [[@{global_check_bonus}]] ]]}} @{ro_investigation} @{classactioninvestigation}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Investigation (Int)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_investigation_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_investigation_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_investigation" value="@{investigation_prof_exp}+@{intelligence_mod}+@{investigation_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_investigation" value="10 + @{investigation}" disabled="disabled">
+						</div>
+					</div>
+				</div>
+				<div class="sheet-col-1-2">
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-7-24 sheet-small-label">Skill</div>
+						<div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
+						<div class="sheet-col-1-12 sheet-center sheet-small-label">Total</div>
+						<div class="sheet-col-1-12 sheet-center sheet-small-label">Pass</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_medicine_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Medicine roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_medicine_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_medicine" value="@{ro_medicine_rolltype}@{ro_medicine_roll2_closing} @{ro_medicine_emoteprompt} @{ro_medicine_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Medicine_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Medicine (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{medicine}]] + [[@{global_check_bonus}]] ]]}} @{ro_medicine} @{classactionmedicine}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_medicine_roll2_closing" value="+ [[@{medicine}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_medicine_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_medicine_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_medicine_showmath" value="{{math=1d20
 										+ [[@{medicine}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Medicine_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Medicine (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{medicine}]] + [[@{global_check_bonus}]] ]]}} @{ro_medicine} @{classactionmedicine}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Medicine (Wis)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_medicine_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_medicine_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_medicine2" value="@{medicine_prof_exp}+@{wisdom_mod}+@{medicine_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_medicine2" value="10 + @{medicine}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_nature_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Nature roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_nature_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_nature2" value="@{ro_nature_rolltype}@{ro_nature_roll2_closing} @{ro_nature_emoteprompt} @{ro_nature_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Nature_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Nature (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{nature}]] + [[@{global_check_bonus}]] ]]}} @{ro_nature} @{classactionnature}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_nature_roll2_closing2" value="+ [[@{nature}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_nature_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_nature_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_nature_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Medicine_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Medicine (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{medicine}]] + [[@{global_check_bonus}]] ]]}} @{ro_medicine} @{classactionmedicine}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Medicine (Wis)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_medicine_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_medicine_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_medicine" value="@{medicine_prof_exp}+@{wisdom_mod}+@{medicine_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_medicine" value="10 + @{medicine}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_nature_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Nature roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_nature_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_nature" value="@{ro_nature_rolltype}@{ro_nature_roll2_closing} @{ro_nature_emoteprompt} @{ro_nature_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Nature_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Nature (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{nature}]] + [[@{global_check_bonus}]] ]]}} @{ro_nature} @{classactionnature}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_nature_roll2_closing" value="+ [[@{nature}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_nature_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_nature_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_nature_showmath" value="{{math=1d20
 										+ [[@{nature}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Nature_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Nature (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{nature}]] + [[@{global_check_bonus}]] ]]}} @{ro_nature} @{classactionnature}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Nature (Int)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_nature_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_nature_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_nature2" value="@{nature_prof_exp}+@{intelligence_mod}+@{nature_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_nature2" value="10 + @{nature}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_perception_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Perception roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_perception_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_perception2" value="@{ro_perception_rolltype}@{ro_perception_roll2_closing} @{ro_perception_emoteprompt} @{ro_perception_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Perception_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Perception (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{perception}]] + [[@{global_check_bonus}]] ]]}} @{ro_perception} @{classactionperception}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_perception_roll2_closing2" value="+ [[@{perception}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_perception_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_perception_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_perception_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Nature_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Nature (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{nature}]] + [[@{global_check_bonus}]] ]]}} @{ro_nature} @{classactionnature}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Nature (Int)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_nature_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_nature_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_nature" value="@{nature_prof_exp}+@{intelligence_mod}+@{nature_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_nature" value="10 + @{nature}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_perception_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Perception roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_perception_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_perception" value="@{ro_perception_rolltype}@{ro_perception_roll2_closing} @{ro_perception_emoteprompt} @{ro_perception_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Perception_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Perception (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{perception}]] + [[@{global_check_bonus}]] ]]}} @{ro_perception} @{classactionperception}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_perception_roll2_closing" value="+ [[@{perception}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_perception_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_perception_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_perception_showmath" value="{{math=1d20
 										+ [[@{perception}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Perception_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Perception (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{perception}]] + [[@{global_check_bonus}]] ]]}} @{ro_perception} @{classactionperception}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Perception (Wis)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_perception_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_perception_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_perception2" value="@{perception_prof_exp}+@{wisdom_mod}+@{perception_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_perception2" value="10 + @{perception}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_performance_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Performance roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_performance_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_performance2" value="@{ro_performance_rolltype}@{ro_performance_roll2_closing} @{ro_performance_emoteprompt} @{ro_performance_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Performance_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Performance (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{performance}]] + [[@{global_check_bonus}]] ]]}} @{ro_performance} @{classactionperformance}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_performance_roll2_closing2" value="+ [[@{performance}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_performance_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_performance_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_performance_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Perception_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Perception (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{perception}]] + [[@{global_check_bonus}]] ]]}} @{ro_perception} @{classactionperception}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Perception (Wis)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_perception_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_perception_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_perception" value="@{perception_prof_exp}+@{wisdom_mod}+@{perception_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_perception" value="10 + @{perception}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_performance_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Performance roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_performance_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_performance" value="@{ro_performance_rolltype}@{ro_performance_roll2_closing} @{ro_performance_emoteprompt} @{ro_performance_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Performance_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Performance (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{performance}]] + [[@{global_check_bonus}]] ]]}} @{ro_performance} @{classactionperformance}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_performance_roll2_closing" value="+ [[@{performance}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_performance_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_performance_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_performance_showmath" value="{{math=1d20
 										+ [[@{performance}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Performance_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Performance (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{performance}]] + [[@{global_check_bonus}]] ]]}} @{ro_performance} @{classactionperformance}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Performance (Cha)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_performance_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_performance_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_performance2" value="@{performance_prof_exp}+@{charisma_mod}+@{performance_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_performance2" value="10 + @{performance}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_persuasion_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Persuasion roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_persuasion_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_persuasion2" value="@{ro_persuasion_rolltype}@{ro_persuasion_roll2_closing} @{ro_persuasion_emoteprompt} @{ro_persuasion_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Persuasion_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Persuasion (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{persuasion}]] + [[@{global_check_bonus}]] ]]}} @{ro_persuasion} @{classactionpersuasion}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_persuasion_roll2_closing2" value="+ [[@{persuasion}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_persuasion_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_persuasion_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_persuasion_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Performance_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Performance (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{performance}]] + [[@{global_check_bonus}]] ]]}} @{ro_performance} @{classactionperformance}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Performance (Cha)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_performance_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_performance_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_performance" value="@{performance_prof_exp}+@{charisma_mod}+@{performance_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_performance" value="10 + @{performance}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_persuasion_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Persuasion roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_persuasion_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_persuasion" value="@{ro_persuasion_rolltype}@{ro_persuasion_roll2_closing} @{ro_persuasion_emoteprompt} @{ro_persuasion_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Persuasion_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Persuasion (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{persuasion}]] + [[@{global_check_bonus}]] ]]}} @{ro_persuasion} @{classactionpersuasion}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_persuasion_roll2_closing" value="+ [[@{persuasion}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_persuasion_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_persuasion_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_persuasion_showmath" value="{{math=1d20
 										+ [[@{persuasion}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Persuasion_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Persuasion (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{persuasion}]] + [[@{global_check_bonus}]] ]]}} @{ro_persuasion} @{classactionpersuasion}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Persuasion (Cha)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_persuasion_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_persuasion_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_persuasion2" value="@{persuasion_prof_exp}+@{charisma_mod}+@{persuasion_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_persuasion2" value="10 + @{persuasion}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_religion_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Religion roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_religion_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_religion2" value="@{ro_religion_rolltype}@{ro_religion_roll2_closing} @{ro_religion_emoteprompt} @{ro_religion_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Religion_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Religion (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{religion}]] + [[@{global_check_bonus}]] ]]}} @{ro_religion} @{classactionreligion}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_religion_roll2_closing2" value="+ [[@{religion}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_religion_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_religion_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_religion_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Persuasion_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Persuasion (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{persuasion}]] + [[@{global_check_bonus}]] ]]}} @{ro_persuasion} @{classactionpersuasion}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Persuasion (Cha)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_persuasion_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_persuasion_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_persuasion" value="@{persuasion_prof_exp}+@{charisma_mod}+@{persuasion_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_persuasion" value="10 + @{persuasion}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_religion_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Religion roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_religion_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_religion" value="@{ro_religion_rolltype}@{ro_religion_roll2_closing} @{ro_religion_emoteprompt} @{ro_religion_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Religion_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Religion (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{religion}]] + [[@{global_check_bonus}]] ]]}} @{ro_religion} @{classactionreligion}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_religion_roll2_closing" value="+ [[@{religion}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_religion_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_religion_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_religion_showmath" value="{{math=1d20
 										+ [[@{religion}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Religion_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Religion (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{religion}]] + [[@{global_check_bonus}]] ]]}} @{ro_religion} @{classactionreligion}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Religion (Int)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_religion_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_religion_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_religion2" value="@{religion_prof_exp}+@{intelligence_mod}+@{religion_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_religion2" value="10 + @{religion}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_sleightofhand_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Sleight of hand roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_sleightofhand_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_sleightofhand2" value="@{ro_sleightofhand_rolltype}@{ro_sleightofhand_roll2_closing} @{ro_sleightofhand_emoteprompt} @{ro_sleightofhand_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_SleightOfHand_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Sleight of hand (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{sleightofhand}]] + [[@{global_check_bonus}]] ]]}} @{ro_sleightofhand} @{classactionsleightofhand}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_sleightofhand_roll2_closing2" value="+ [[@{sleightofhand}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_sleightofhand_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_sleightofhand_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_sleightofhand_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Religion_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Religion (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{religion}]] + [[@{global_check_bonus}]] ]]}} @{ro_religion} @{classactionreligion}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Religion (Int)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_religion_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_religion_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_religion" value="@{religion_prof_exp}+@{intelligence_mod}+@{religion_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_religion" value="10 + @{religion}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_sleightofhand_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Sleight of hand roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_sleightofhand_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_sleightofhand" value="@{ro_sleightofhand_rolltype}@{ro_sleightofhand_roll2_closing} @{ro_sleightofhand_emoteprompt} @{ro_sleightofhand_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_SleightOfHand_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Sleight of hand (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{sleightofhand}]] + [[@{global_check_bonus}]] ]]}} @{ro_sleightofhand} @{classactionsleightofhand}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_sleightofhand_roll2_closing" value="+ [[@{sleightofhand}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_sleightofhand_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_sleightofhand_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_sleightofhand_showmath" value="{{math=1d20
 										+ [[@{sleightofhand}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_SleightOfHand_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Sleight of hand (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{sleightofhand}]] + [[@{global_check_bonus}]] ]]}} @{ro_sleightofhand} @{classactionsleightofhand}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Sleight of Hand (Dex)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_sleightofhand_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_sleightofhand_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_sleightofhand2" value="@{sleightofhand_prof_exp}+@{dexterity_mod}+@{sleightofhand_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_sleightofhand2" value="10 + @{sleightofhand}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_stealth_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Stealth roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_stealth_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_stealth2" value="@{ro_stealth_rolltype}@{ro_stealth_roll2_closing} @{ro_stealth_emoteprompt} @{ro_stealth_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Stealth_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Stealth (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{stealth}]] + [[@{global_check_bonus}]] ]]}} @{ro_stealth} @{classactionstealth}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_stealth_roll2_closing2" value="+ [[@{stealth}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_stealth_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_stealth_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_stealth_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_SleightOfHand_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Sleight of hand (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{sleightofhand}]] + [[@{global_check_bonus}]] ]]}} @{ro_sleightofhand} @{classactionsleightofhand}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Sleight of Hand (Dex)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_sleightofhand_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_sleightofhand_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_sleightofhand" value="@{sleightofhand_prof_exp}+@{dexterity_mod}+@{sleightofhand_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_sleightofhand" value="10 + @{sleightofhand}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_stealth_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Stealth roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_stealth_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_stealth" value="@{ro_stealth_rolltype}@{ro_stealth_roll2_closing} @{ro_stealth_emoteprompt} @{ro_stealth_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Stealth_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Stealth (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{stealth}]] + [[@{global_check_bonus}]] ]]}} @{ro_stealth} @{classactionstealth}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_stealth_roll2_closing" value="+ [[@{stealth}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_stealth_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_stealth_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_stealth_showmath" value="{{math=1d20
 										+ [[@{stealth}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Stealth_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Stealth (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{stealth}]] + [[@{global_check_bonus}]] ]]}} @{ro_stealth} @{classactionstealth}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Stealth (Dex)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_stealth_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_stealth_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_stealth2" value="@{stealth_prof_exp}+@{dexterity_mod}+@{stealth_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_stealth2" value="10 + @{stealth}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_survival_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Survival roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_survival_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_survival2" value="@{ro_survival_rolltype}@{ro_survival_roll2_closing} @{ro_survival_emoteprompt} @{ro_survival_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Survival_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Survival (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{survival}]] + [[@{global_check_bonus}]] ]]}} @{ro_survival} @{classactionsurvival}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_survival_roll2_closing2" value="+ [[@{survival}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_survival_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_survival_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_survival_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Stealth_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Stealth (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{stealth}]] + [[@{global_check_bonus}]] ]]}} @{ro_stealth} @{classactionstealth}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Stealth (Dex)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_stealth_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_stealth_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_stealth" value="@{stealth_prof_exp}+@{dexterity_mod}+@{stealth_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_stealth" value="10 + @{stealth}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_survival_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Survival roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_survival_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_survival" value="@{ro_survival_rolltype}@{ro_survival_roll2_closing} @{ro_survival_emoteprompt} @{ro_survival_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Survival_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Survival (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{survival}]] + [[@{global_check_bonus}]] ]]}} @{ro_survival} @{classactionsurvival}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_survival_roll2_closing" value="+ [[@{survival}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_survival_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_survival_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_survival_showmath" value="{{math=1d20
 										+ [[@{survival}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Survival_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Survival (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{survival}]] + [[@{global_check_bonus}]] ]]}} @{ro_survival} @{classactionsurvival}"></button>
-	            </div>
-		        <div class="sheet-col-7-24 sheet-skill-name">Survival (Wis)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_survival_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_survival_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" name="attr_survival2" value="@{survival_prof_exp}+@{wisdom_mod}+@{survival_bonus}" disabled="disabled">
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <input type="number" class="sheet-passive-skill-score" name="attr_passive_survival2" value="10 + @{survival}" disabled="disabled">
-	            </div>
-	          </div>
-	        </div>
-	      </div>
-		  <hr />
-		  <div class="sheet-row">
-		    <div class="sheet-col-1-2 sheet-padr">
-		      <div class="sheet-row sheet-sub-header">
-		        <div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
-		        <div class="sheet-col-7-24 sheet-small-label sheet-center">Skill</div>
-		        <div class="sheet-col-1-6 sheet-small-label sheet-center">Stat</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Proficient</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_customskill1_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Custom Skill 1 roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_customskill1_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_customskill5" value="@{ro_customskill1_rolltype}@{ro_customskill1_roll2_closing} @{ro_customskill1_emoteprompt} @{ro_customskill1_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_customskill1_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_1_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_1}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill1} @{classactioncustom1skill}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_customskill1_roll2_closing2" value="+ [[@{custom_skill_1}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_customskill1_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill1_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill1_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Survival_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Survival (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{survival}]] + [[@{global_check_bonus}]] ]]}} @{ro_survival} @{classactionsurvival}"></button>
+						</div>
+						<div class="sheet-col-7-24 sheet-skill-name">Survival (Wis)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_survival_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_survival_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_survival" value="@{survival_prof_exp}+@{wisdom_mod}+@{survival_bonus}" disabled="disabled">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" class="sheet-passive-skill-score" name="attr_passive_survival" value="10 + @{survival}" disabled="disabled">
+						</div>
+					</div>
+				</div>
+			</div>
+			<hr />
+			<div class="sheet-row">
+				<div class="sheet-col-1-2 sheet-padr">
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-7-24 sheet-small-label sheet-center">Skill</div>
+						<div class="sheet-col-1-6 sheet-small-label sheet-center">Stat</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Proficient</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_customskill1_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Custom Skill 1 roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_customskill1_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_customskill1" value="@{ro_customskill1_rolltype}@{ro_customskill1_roll2_closing} @{ro_customskill1_emoteprompt} @{ro_customskill1_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_customskill1_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_1_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_1}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill1} @{classactioncustom1skill}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_customskill1_roll2_closing" value="+ [[@{custom_skill_1}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_customskill1_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill1_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill1_showmath" value="{{math=1d20
 										+ [[@{custom_skill_1}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_1" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_1_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_1}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill1} @{classactioncustom1skill}"></button>
-	            </div>
-		        <div class="sheet-col-7-24">
-		          <input type="text" class="sheet-center" name="attr_custom_skill_1_name2" value="Custom 1">
-	            </div>
-		        <div class="sheet-col-1-6 sheet-small-label sheet-center">
-		          <select name="attr_custom_skill_1_mod2">
-		            <option value="0">None</option>
-		            <option value="@{strength_mod}">STR</option>
-		            <option value="@{dexterity_mod}">DEX</option>
-		            <option value="@{constitution_mod}">CON</option>
-		            <option value="@{intelligence_mod}">INT</option>
-		            <option value="@{wisdom_mod}">WIS</option>
-		            <option value="@{charisma_mod}">CHA</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8 sheet-small-label">
-		          <select name="attr_custom_skill_1_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_1_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_5" value="@{custom_skill_1_prof_exp}+@{custom_skill_1_mod}+@{custom_skill_1_bonus}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_customskill2_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Custom Skill 2 roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_customskill2_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_customskill5" value="@{ro_customskill2_rolltype}@{ro_customskill2_roll2_closing} @{ro_customskill2_emoteprompt} @{ro_customskill2_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_customskill2_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_2_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_2}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill2} @{classactioncustom2skill}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_customskill2_roll2_closing2" value="+ [[@{custom_skill_2}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_customskill2_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill2_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill2_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_1" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_1_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_1}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill1} @{classactioncustom1skill}"></button>
+						</div>
+						<div class="sheet-col-7-24">
+							<input type="text" class="sheet-center" name="attr_custom_skill_1_name" value="Custom 1">
+						</div>
+						<div class="sheet-col-1-6 sheet-small-label sheet-center">
+							<select name="attr_custom_skill_1_mod">
+								<option value="0">None</option>
+								<option value="@{strength_mod}">STR</option>
+								<option value="@{dexterity_mod}">DEX</option>
+								<option value="@{constitution_mod}">CON</option>
+								<option value="@{intelligence_mod}">INT</option>
+								<option value="@{wisdom_mod}">WIS</option>
+								<option value="@{charisma_mod}">CHA</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8 sheet-small-label">
+							<select name="attr_custom_skill_1_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_1_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_1" value="@{custom_skill_1_prof_exp}+@{custom_skill_1_mod}+@{custom_skill_1_bonus}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_customskill2_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Custom Skill 2 roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_customskill2_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_customskill2" value="@{ro_customskill2_rolltype}@{ro_customskill2_roll2_closing} @{ro_customskill2_emoteprompt} @{ro_customskill2_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_customskill2_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_2_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_2}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill2} @{classactioncustom2skill}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_customskill2_roll2_closing" value="+ [[@{custom_skill_2}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_customskill2_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill2_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill2_showmath" value="{{math=1d20
 										+ [[@{custom_skill_2}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_2" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_2_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_2}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill2} @{classactioncustom2skill}"></button>
-	            </div>
-		        <div class="sheet-col-7-24">
-		          <input type="text" class="sheet-center" name="attr_custom_skill_2_name2" value="Custom 2">
-	            </div>
-		        <div class="sheet-col-1-6 sheet-small-label sheet-center">
-		          <select name="attr_custom_skill_2_mod2">
-		            <option value="0">None</option>
-		            <option value="@{strength_mod}">STR</option>
-		            <option value="@{dexterity_mod}">DEX</option>
-		            <option value="@{constitution_mod}">CON</option>
-		            <option value="@{intelligence_mod}">INT</option>
-		            <option value="@{wisdom_mod}">WIS</option>
-		            <option value="@{charisma_mod}">CHA</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8 sheet-small-label">
-		          <select name="attr_custom_skill_2_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_2_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_5" value="@{custom_skill_2_prof_exp}+@{custom_skill_2_mod}+@{custom_skill_2_bonus}" disabled="disabled">
-	            </div>
-	          </div>
-	        </div>
-		    <div class="sheet-col-1-2">
-		      <div class="sheet-row sheet-sub-header">
-		        <div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
-		        <div class="sheet-col-7-24 sheet-small-label sheet-center">Skill</div>
-		        <div class="sheet-col-1-6 sheet-small-label sheet-center">Stat</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Proficient</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_customskill3_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Custom Skill 3 roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_customskill3_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_customskill5" value="@{ro_customskill3_rolltype}@{ro_customskill3_roll2_closing} @{ro_customskill3_emoteprompt} @{ro_customskill3_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_customskill3_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_3_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_3}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill3} @{classactioncustom3skill}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_customskill3_roll2_closing2" value="+ [[@{custom_skill_3}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_customskill3_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill3_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill3_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_2" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_2_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_2}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill2} @{classactioncustom2skill}"></button>
+						</div>
+						<div class="sheet-col-7-24">
+							<input type="text" class="sheet-center" name="attr_custom_skill_2_name" value="Custom 2">
+						</div>
+						<div class="sheet-col-1-6 sheet-small-label sheet-center">
+							<select name="attr_custom_skill_2_mod">
+								<option value="0">None</option>
+								<option value="@{strength_mod}">STR</option>
+								<option value="@{dexterity_mod}">DEX</option>
+								<option value="@{constitution_mod}">CON</option>
+								<option value="@{intelligence_mod}">INT</option>
+								<option value="@{wisdom_mod}">WIS</option>
+								<option value="@{charisma_mod}">CHA</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8 sheet-small-label">
+							<select name="attr_custom_skill_2_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_2_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_2" value="@{custom_skill_2_prof_exp}+@{custom_skill_2_mod}+@{custom_skill_2_bonus}" disabled="disabled">
+						</div>
+					</div>
+				</div>
+				<div class="sheet-col-1-2">
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-7-24 sheet-small-label sheet-center">Skill</div>
+						<div class="sheet-col-1-6 sheet-small-label sheet-center">Stat</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Proficient</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Bonus</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_customskill3_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Custom Skill 3 roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_customskill3_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_customskill3" value="@{ro_customskill3_rolltype}@{ro_customskill3_roll2_closing} @{ro_customskill3_emoteprompt} @{ro_customskill3_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_customskill3_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_3_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_3}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill3} @{classactioncustom3skill}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_customskill3_roll2_closing" value="+ [[@{custom_skill_3}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_customskill3_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill3_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill3_showmath" value="{{math=1d20
 										+ [[@{custom_skill_3}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_3" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_3_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_3}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill3} @{classactioncustom3skill}"></button>
-	            </div>
-		        <div class="sheet-col-7-24">
-		          <input type="text" class="sheet-center" name="attr_custom_skill_3_name2" value="Custom 3">
-	            </div>
-		        <div class="sheet-col-1-6 sheet-small-label sheet-center">
-		          <select name="attr_custom_skill_3_mod2">
-		            <option value="0">None</option>
-		            <option value="@{strength_mod}">STR</option>
-		            <option value="@{dexterity_mod}">DEX</option>
-		            <option value="@{constitution_mod}">CON</option>
-		            <option value="@{intelligence_mod}">INT</option>
-		            <option value="@{wisdom_mod}">WIS</option>
-		            <option value="@{charisma_mod}">CHA</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8 sheet-small-label">
-		          <select name="attr_custom_skill_3_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_3_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_5" value="@{custom_skill_3_prof_exp}+@{custom_skill_3_mod}+@{custom_skill_3_bonus}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_customskill4_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Custom Skill 4 roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_customskill4_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_customskill5" value="@{ro_customskill4_rolltype}@{ro_customskill4_roll2_closing} @{ro_customskill4_emoteprompt} @{ro_customskill4_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_customskill4_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_4_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_4}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill4} @{classactioncustom4skill}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_customskill4_roll2_closing2" value="+ [[@{custom_skill_4}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_customskill4_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill4_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_customskill4_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_3" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_3_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_3}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill3} @{classactioncustom3skill}"></button>
+						</div>
+						<div class="sheet-col-7-24">
+							<input type="text" class="sheet-center" name="attr_custom_skill_3_name" value="Custom 3">
+						</div>
+						<div class="sheet-col-1-6 sheet-small-label sheet-center">
+							<select name="attr_custom_skill_3_mod">
+								<option value="0">None</option>
+								<option value="@{strength_mod}">STR</option>
+								<option value="@{dexterity_mod}">DEX</option>
+								<option value="@{constitution_mod}">CON</option>
+								<option value="@{intelligence_mod}">INT</option>
+								<option value="@{wisdom_mod}">WIS</option>
+								<option value="@{charisma_mod}">CHA</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8 sheet-small-label">
+							<select name="attr_custom_skill_3_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_3_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_3" value="@{custom_skill_3_prof_exp}+@{custom_skill_3_mod}+@{custom_skill_3_bonus}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_customskill4_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Custom Skill 4 roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_customskill4_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_customskill4" value="@{ro_customskill4_rolltype}@{ro_customskill4_roll2_closing} @{ro_customskill4_emoteprompt} @{ro_customskill4_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_customskill4_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_4_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_4}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill4} @{classactioncustom4skill}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_customskill4_roll2_closing" value="+ [[@{custom_skill_4}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_customskill4_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill4_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_customskill4_showmath" value="{{math=1d20
 										+ [[@{custom_skill_4}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_4" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_4_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{custom_skill_4}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill4} @{classactioncustom4skill}"></button>
-	            </div>
-		        <div class="sheet-col-7-24">
-		          <input type="text" class="sheet-center" name="attr_custom_skill_4_name2" value="Custom 4">
-	            </div>
-		        <div class="sheet-col-1-6 sheet-small-label sheet-center">
-		          <select name="attr_custom_skill_4_mod2">
-		            <option value="0">None</option>
-		            <option value="@{strength_mod}">STR</option>
-		            <option value="@{dexterity_mod}">DEX</option>
-		            <option value="@{constitution_mod}">CON</option>
-		            <option value="@{intelligence_mod}">INT</option>
-		            <option value="@{wisdom_mod}">WIS</option>
-		            <option value="@{charisma_mod}">CHA</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8 sheet-small-label">
-		          <select name="attr_custom_skill_4_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-		            <option value="@{PB}">Yes</option>
-		            <option value="(2*@{PB})">Expertise</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_4_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_custom_skill_5" value="@{custom_skill_4_prof_exp}+@{custom_skill_4_mod}+@{custom_skill_4_bonus}" disabled="disabled">
-	            </div>
-	          </div>
-	        </div>
-	      </div>
-		  <hr/>
-		  <div class="sheet-row">
-		    <div class="sheet-col-1-2 sheet-padr">
-		      <div class="sheet-row sheet-sub-header">
-		        <div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
-		        <div class="sheet-col-1-3 sheet-small-label">Other</div>
-		        <div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Misc</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_basic_strength_check_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Unskilled (STR) roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_basic_strength_check_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_basic_strength_check2" value="@{ro_basic_strength_check_rolltype}@{ro_basic_strength_check_roll2_closing} @{ro_basic_strength_check_emoteprompt} @{ro_basic_strength_check_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Basic_Strength_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_strength_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_strength_check} @{classactionunskilledstr}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_basic_strength_check_roll2_closing2" value="+ [[@{basic_strength_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_basic_strength_check_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_strength_check_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_strength_check_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Custom_Skill_4" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{custom_skill_4_name}}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{custom_skill_4}]] + [[@{global_check_bonus}]] ]]}} @{ro_customskill4} @{classactioncustom4skill}"></button>
+						</div>
+						<div class="sheet-col-7-24">
+							<input type="text" class="sheet-center" name="attr_custom_skill_4_name" value="Custom 4">
+						</div>
+						<div class="sheet-col-1-6 sheet-small-label sheet-center">
+							<select name="attr_custom_skill_4_mod">
+								<option value="0">None</option>
+								<option value="@{strength_mod}">STR</option>
+								<option value="@{dexterity_mod}">DEX</option>
+								<option value="@{constitution_mod}">CON</option>
+								<option value="@{intelligence_mod}">INT</option>
+								<option value="@{wisdom_mod}">WIS</option>
+								<option value="@{charisma_mod}">CHA</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8 sheet-small-label">
+							<select name="attr_custom_skill_4_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+								<option value="@{PB}">Yes</option>
+								<option value="(2*@{PB})">Expertise</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_4_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_custom_skill_4" value="@{custom_skill_4_prof_exp}+@{custom_skill_4_mod}+@{custom_skill_4_bonus}" disabled="disabled">
+						</div>
+					</div>
+				</div>
+			</div>
+			<hr/>
+			<div class="sheet-row">
+				<div class="sheet-col-1-2 sheet-padr">
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-1-3 sheet-small-label">Other</div>
+						<div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Misc</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_basic_strength_check_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Unskilled (STR) roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_basic_strength_check_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_basic_strength_check" value="@{ro_basic_strength_check_rolltype}@{ro_basic_strength_check_roll2_closing} @{ro_basic_strength_check_emoteprompt} @{ro_basic_strength_check_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Basic_Strength_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_strength_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_strength_check} @{classactionunskilledstr}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_basic_strength_check_roll2_closing" value="+ [[@{basic_strength_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_basic_strength_check_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_strength_check_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_strength_check_showmath" value="{{math=1d20
 										+ [[@{basic_strength_check_mod}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Basic_Strength_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_strength_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_strength_check} @{classactionunskilledstr}"></button>
-	            </div>
-		        <div class="sheet-col-1-3 sheet-skill-name">(Unskilled STR check)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_basic_strength_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_strength_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_strength_check_mod2" value="@{strength_mod} + @{basic_strength_bonus} + @{basic_strength_prof_exp}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_basic_dexterity_check_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Unskilled (DEX) roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_basic_dexterity_check_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_basic_dexterity_check2" value="@{ro_basic_dexterity_check_rolltype}@{ro_basic_dexterity_check_roll2_closing} @{ro_basic_dexterity_check_emoteprompt} @{ro_basic_dexterity_check_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Basic_Dexterity_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_dexterity_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_dexterity_check} @{classactionunskilleddex}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_basic_dexterity_check_roll2_closing2" value="+ [[@{basic_dexterity_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_basic_dexterity_check_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_dexterity_check_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_dexterity_check_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Basic_Strength_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_strength_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_strength_check} @{classactionunskilledstr}"></button>
+						</div>
+						<div class="sheet-col-1-3 sheet-skill-name">(Unskilled STR check)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_basic_strength_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_strength_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_strength_check_mod" value="@{strength_mod} + @{basic_strength_bonus} + @{basic_strength_prof_exp}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_basic_dexterity_check_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Unskilled (DEX) roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_basic_dexterity_check_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_basic_dexterity_check" value="@{ro_basic_dexterity_check_rolltype}@{ro_basic_dexterity_check_roll2_closing} @{ro_basic_dexterity_check_emoteprompt} @{ro_basic_dexterity_check_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Basic_Dexterity_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_dexterity_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_dexterity_check} @{classactionunskilleddex}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_basic_dexterity_check_roll2_closing" value="+ [[@{basic_dexterity_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_basic_dexterity_check_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_dexterity_check_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_dexterity_check_showmath" value="{{math=1d20
 										+ [[@{basic_dexterity_check_mod}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Basic_Dexterity_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_dexterity_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_dexterity_check} @{classactionunskilleddex}"></button>
-	            </div>
-		        <div class="sheet-col-1-3 sheet-skill-name">(Unskilled DEX check)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_basic_dexterity_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_dexterity_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_dexterity_check_mod2" value="@{dexterity_mod} + @{basic_dexterity_bonus} + @{basic_dexterity_prof_exp}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_basic_constitution_check_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Unskilled (CON) roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_basic_constitution_check_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_basic_constitution_check2" value="@{ro_basic_constitution_check_rolltype}@{ro_basic_constitution_check_roll2_closing} @{ro_basic_constitution_check_emoteprompt} @{ro_basic_constitution_check_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Basic_Constitution_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CON)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_constitution_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_constitution_check} @{classactionunskilledcon}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_basic_constitution_check_roll2_closing2" value="+ [[@{basic_constitution_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_basic_constitution_check_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_constitution_check_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_constitution_check_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Basic_Dexterity_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_dexterity_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_dexterity_check} @{classactionunskilleddex}"></button>
+						</div>
+						<div class="sheet-col-1-3 sheet-skill-name">(Unskilled DEX check)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_basic_dexterity_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_dexterity_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_dexterity_check_mod" value="@{dexterity_mod} + @{basic_dexterity_bonus} + @{basic_dexterity_prof_exp}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_basic_constitution_check_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Unskilled (CON) roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_basic_constitution_check_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_basic_constitution_check" value="@{ro_basic_constitution_check_rolltype}@{ro_basic_constitution_check_roll2_closing} @{ro_basic_constitution_check_emoteprompt} @{ro_basic_constitution_check_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Basic_Constitution_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CON)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_constitution_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_constitution_check} @{classactionunskilledcon}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_basic_constitution_check_roll2_closing" value="+ [[@{basic_constitution_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_basic_constitution_check_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_constitution_check_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_constitution_check_showmath" value="{{math=1d20
 										+ [[@{basic_constitution_check_mod}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Basic_Constitution_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CON)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_constitution_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_constitution_check} @{classactionunskilledcon}"></button>
-	            </div>
-		        <div class="sheet-col-1-3 sheet-skill-name">(Unskilled CON check)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_basic_constitution_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_constitution_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_constitution_check_mod2" value="@{constitution_mod} + @{basic_constitution_bonus} + @{basic_constitution_prof_exp}" disabled="disabled">
-	            </div>
-	          </div>
-	        </div>
-		    <div class="sheet-col-1-2">
-		      <div class="sheet-row sheet-sub-header">
-		        <div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
-		        <div class="sheet-col-1-3 sheet-small-label">Other</div>
-		        <div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Misc</div>
-		        <div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_basic_intelligence_check_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Unskilled (INT) roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_basic_intelligence_check_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_basic_intelligence_check2" value="@{ro_basic_intelligence_check_rolltype}@{ro_basic_intelligence_check_roll2_closing} @{ro_basic_intelligence_check_emoteprompt} @{ro_basic_intelligence_check_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Basic_Intelligence_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_intelligence_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_intelligence_check} @{classactionunskilledint}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_basic_intelligence_check_roll2_closing2" value="+ [[@{basic_intelligence_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_basic_intelligence_check_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_intelligence_check_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_intelligence_check_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Basic_Constitution_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CON)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_constitution_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_constitution_check} @{classactionunskilledcon}"></button>
+						</div>
+						<div class="sheet-col-1-3 sheet-skill-name">(Unskilled CON check)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_basic_constitution_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_constitution_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_constitution_check_mod" value="@{constitution_mod} + @{basic_constitution_bonus} + @{basic_constitution_prof_exp}" disabled="disabled">
+						</div>
+					</div>
+				</div>
+				<div class="sheet-col-1-2">
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-1-3 sheet-small-label">Other</div>
+						<div class="sheet-col-1-4 sheet-center sheet-small-label">Proficient</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Misc</div>
+						<div class="sheet-col-1-8 sheet-center sheet-small-label">Total</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_basic_intelligence_check_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Unskilled (INT) roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_basic_intelligence_check_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_basic_intelligence_check" value="@{ro_basic_intelligence_check_rolltype}@{ro_basic_intelligence_check_roll2_closing} @{ro_basic_intelligence_check_emoteprompt} @{ro_basic_intelligence_check_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Basic_Intelligence_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_intelligence_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_intelligence_check} @{classactionunskilledint}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_basic_intelligence_check_roll2_closing" value="+ [[@{basic_intelligence_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_basic_intelligence_check_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_intelligence_check_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_intelligence_check_showmath" value="{{math=1d20
 										+ [[@{basic_intelligence_check_mod}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Basic_Intelligence_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_intelligence_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_intelligence_check} @{classactionunskilledint}"></button>
-	            </div>
-		        <div class="sheet-col-1-3 sheet-skill-name">(Unskilled INT check)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_basic_intelligence_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_intelligence_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_intelligence_check_mod2" value="@{intelligence_mod} + @{basic_intelligence_bonus} + @{basic_intelligence_prof_exp}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_basic_wisdom_check_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Unskilled (WIS) roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_basic_wisdom_check_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_basic_wisdom_check2" value="@{ro_basic_wisdom_check_rolltype}@{ro_basic_wisdom_check_roll2_closing} @{ro_basic_wisdom_check_emoteprompt} @{ro_basic_wisdom_check_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Basic_Wisdom_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_wisdom_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_wisdom_check} @{classactionunskilledwis}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_basic_wisdom_check_roll2_closing2" value="+ [[@{basic_wisdom_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_basic_wisdom_check_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_wisdom_check_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_wisdom_check_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Basic_Intelligence_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_intelligence_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_intelligence_check} @{classactionunskilledint}"></button>
+						</div>
+						<div class="sheet-col-1-3 sheet-skill-name">(Unskilled INT check)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_basic_intelligence_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_intelligence_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_intelligence_check_mod" value="@{intelligence_mod} + @{basic_intelligence_bonus} + @{basic_intelligence_prof_exp}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_basic_wisdom_check_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Unskilled (WIS) roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_basic_wisdom_check_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_basic_wisdom_check" value="@{ro_basic_wisdom_check_rolltype}@{ro_basic_wisdom_check_roll2_closing} @{ro_basic_wisdom_check_emoteprompt} @{ro_basic_wisdom_check_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Basic_Wisdom_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_wisdom_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_wisdom_check} @{classactionunskilledwis}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_basic_wisdom_check_roll2_closing" value="+ [[@{basic_wisdom_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_basic_wisdom_check_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_wisdom_check_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_wisdom_check_showmath" value="{{math=1d20
 										+ [[@{basic_wisdom_check_mod}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Basic_Wisdom_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_wisdom_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_wisdom_check} @{classactionunskilledwis}"></button>
-	            </div>
-		        <div class="sheet-col-1-3 sheet-skill-name">(Unskilled WIS check)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_basic_wisdom_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_wisdom_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_wisdom_check_mod2" value="@{wisdom_mod} + @{basic_wisdom_bonus} + @{basic_wisdom_prof_exp}" disabled="disabled">
-	            </div>
-	          </div>
-		      <div class="sheet-row sheet-skill-row">
-		        <div class="sheet-col-1-12 sheet-align-center">
-		          <input type="checkbox" name="attr_basic_charisma_check_ro2" class="sheet-ro-checkbox" value="1" />
-		          <span class="sheet-ro-label">y</span>
-		          <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-		          <div class="sheet-ro-modal sheet-skill-modal">
-		            <div>
-		              <!-- Modal Title and close button row -->
-		              <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-		                <div class="sheet-col-3-4 sheet-ro-title">Unskilled (CHA) roll options</div>
-		                <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-		                  <input type="checkbox" name="attr_basic_charisma_check_ro2" class="sheet-ro-close-checkbox" value="1" />
-		                  <span class="sheet-ro-close-label"></span> </div>
-	                  </div>
-		              <!-- define hidden attribute to store summary of all options selected -->
-		              <input type="hidden" name="attr_ro_basic_charisma_check2" value="@{ro_basic_charisma_check_rolltype}@{ro_basic_charisma_check_roll2_closing} @{ro_basic_charisma_check_emoteprompt} @{ro_basic_charisma_check_showmath}" />
-		              <!--Help text and copy of roll button-->
-		              <div class="sheet-row sheet-padb">
-		                <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-		                <div class="sheet-col-1-3 sheet-padl">
-		                  <button type="roll" class="sheet-roll" name="roll_Basic_Charisma_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_charisma_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_charisma_check} @{classactionunskilledcha}">Roll</button>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <!-- Define options here -->
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="hidden" name="attr_ro_basic_charisma_check_roll2_closing2" value="+ [[@{basic_charisma_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
-		                  <select name="attr_ro_basic_charisma_check_rolltype2">
-		                    <option value="@{ro_default_rolltype}">Use Default</option>
-		                    <option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
-		                    <option value="{{noadvroll=1}}">Roll 1d20</option>
-		                    <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-		                    <option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
-		                    <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
-	                      </select>
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_charisma_check_emoteprompt2" value="{{emote=?{Emote text} }}">
-	                    </div>
-	                  </div>
-		              <hr/>
-		              <div class="sheet-row sheet-checkbox-row">
-		                <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-		                <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-		                  <input type="checkbox" name="attr_ro_basic_charisma_check_showmath2" value="{{math=1d20
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Basic_Wisdom_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_wisdom_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_wisdom_check} @{classactionunskilledwis}"></button>
+						</div>
+						<div class="sheet-col-1-3 sheet-skill-name">(Unskilled WIS check)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_basic_wisdom_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_wisdom_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_wisdom_check_mod" value="@{wisdom_mod} + @{basic_wisdom_bonus} + @{basic_wisdom_prof_exp}" disabled="disabled">
+						</div>
+					</div>
+					<div class="sheet-row sheet-skill-row">
+						<div class="sheet-col-1-12 sheet-align-center">
+							<input type="checkbox" name="attr_basic_charisma_check_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
+							<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
+							<div class="sheet-ro-modal sheet-skill-modal">
+								<div>
+									<!-- Modal Title and close button row -->
+									<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
+										<div class="sheet-col-3-4 sheet-ro-title">Unskilled (CHA) roll options</div>
+										<div class="sheet-col-1-4 sheet-ro-close-wrapper">
+											<input type="checkbox" name="attr_basic_charisma_check_ro" class="sheet-ro-close-checkbox" value="1" />
+											<span class="sheet-ro-close-label"></span>
+										</div>
+									</div>
+									<!-- define hidden attribute to store summary of all options selected -->
+									<input type="hidden" name="attr_ro_basic_charisma_check" value="@{ro_basic_charisma_check_rolltype}@{ro_basic_charisma_check_roll2_closing} @{ro_basic_charisma_check_emoteprompt} @{ro_basic_charisma_check_showmath}" />
+									<!--Help text and copy of roll button-->
+									<div class="sheet-row sheet-padb">
+										<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
+										<div class="sheet-col-1-3 sheet-padl">
+											<button type="roll" class="sheet-roll" name="roll_Basic_Charisma_Check_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_charisma_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_charisma_check} @{classactionunskilledcha}">Roll</button>
+										</div>
+									</div>
+									<hr/>
+									<!-- Define options here -->
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="hidden" name="attr_ro_basic_charisma_check_roll2_closing" value="+ [[@{basic_charisma_check_mod}]] + [[@{global_check_bonus}]] ]] }}" />
+											<select name="attr_ro_basic_charisma_check_rolltype">
+												<option value="@{ro_default_rolltype}">Use Default</option>
+												<option value="{{showadvroll=1}} {{roll2=[[ 1d20 ">Roll 2d20</option>
+												<option value="{{noadvroll=1}}">Roll 1d20</option>
+												<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20  |Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
+												<option value="{{rollhasadv=1}} {{roll2=[[ 1d20 ">ALWAYS Advantage</option>
+												<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20 ">ALWAYS Disadvantage</option>
+											</select>
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_charisma_check_emoteprompt" value="{{emote=?{Emote text} }}">
+										</div>
+									</div>
+									<hr/>
+									<div class="sheet-row sheet-checkbox-row">
+										<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
+										<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
+											<input type="checkbox" name="attr_ro_basic_charisma_check_showmath" value="{{math=1d20
 										+ [[@{basic_charisma_check_mod}]] [Skill mod]
 										+ (@{global_check_bonus}) [Global skill bonus]}}">
-	                    </div>
-	                  </div>
-	                </div>
-		            <!-- close inner modal div -->
-	              </div>
-		          <!-- close outer modal div -->
-	            </div>
-		        <div class="sheet-col-1-12">
-		          <button class="sheet-skill-roll" type="roll" name="roll_Basic_Charisma_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d2@{global_halfling} + [[@{basic_charisma_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_charisma_check} @{classactionunskilledcha}"></button>
-	            </div>
-		        <div class="sheet-col-1-3 sheet-skill-name">(Unskilled CHA check)</div>
-		        <div class="sheet-col-1-4">
-		          <select name="attr_basic_charisma_prof_exp2">
-		            <option value="0">No</option>
-		            <option value="floor(@{PB} / 2)">Jack of all trades</option>
-	              </select>
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_charisma_bonus2" value="0" step="1" />
-	            </div>
-		        <div class="sheet-col-1-8">
-		          <input type="number" name="attr_basic_charisma_check_mod2" value="@{charisma_mod} + @{basic_charisma_bonus} + @{basic_charisma_prof_exp}" disabled="disabled">
-	            </div>
-	          </div>
-	        </div>
-	      </div>
-		  <hr />
-    </div>
+										</div>
+									</div>
+								</div>
+								<!-- close inner modal div -->
+							</div>
+							<!-- close outer modal div -->
+						</div>
+						<div class="sheet-col-1-12">
+							<button class="sheet-skill-roll" type="roll" name="roll_Basic_Charisma_Check" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=Unskilled (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}}  {{ability=1}} {{simple=1}} {{rollname=Result}} {{roll1=[[ 1d20 + [[@{basic_charisma_check_mod}]] + [[@{global_check_bonus}]] ]]}} @{ro_basic_charisma_check} @{classactionunskilledcha}"></button>
+						</div>
+						<div class="sheet-col-1-3 sheet-skill-name">(Unskilled CHA check)</div>
+						<div class="sheet-col-1-4">
+							<select name="attr_basic_charisma_prof_exp">
+								<option value="0">No</option>
+								<option value="floor(@{PB} / 2)">Jack of all trades</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_charisma_bonus" value="0" step="1" />
+						</div>
+						<div class="sheet-col-1-8">
+							<input type="number" name="attr_basic_charisma_check_mod" value="@{charisma_mod} + @{basic_charisma_bonus} + @{basic_charisma_prof_exp}" disabled="disabled">
+						</div>
+					</div>
+				</div>
+			</div>
+			<hr />
+		</div>
 		<div class="sheet-section-background">
-		  <h4 class="sheet-center">Appearance, Vision, Languages and Alignment <span class="sheet-pictos">U</span></h4>
+			<h4 class="sheet-center">Appearance, Vision, Languages and Alignment <span class="sheet-pictos">U</span></h4>
 			<div class="sheet-row">
 				<div class="sheet-col-1-7 sheet-small-label sheet-center">
 					<input class="sheet-underlined sheet-center" type="text" name="attr_gender">
@@ -3319,10 +3308,6 @@
 						<div class="sheet-col-1 sheet-center sheet-small-label">Class Levels</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Artificer</div>
-						<div class="sheet-col-1-8 sheet-center sheet-padr">
-							<input type="number" name="attr_artificer_level" value="0" min="0" step="1">
-						</div>
 						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Barbarian</div>
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_barbarian_level" value="0" min="0" step="1">
@@ -3335,12 +3320,12 @@
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_cleric_level" value="0" min="0" step="1">
 						</div>
-					</div>
-					<div class="sheet-row">
 						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Druid</div>
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_druid_level" value="0" min="0" step="1">
 						</div>
+					</div>
+					<div class="sheet-row">
 						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Fighter</div>
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_fighter_level" value="0" min="0" step="1">
@@ -3353,12 +3338,12 @@
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_paladin_level" value="0" min="0" step="1">
 						</div>
-					</div>
-					<div class="sheet-row">
 						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Ranger</div>
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_ranger_level" value="0" min="0" step="1">
 						</div>
+					</div>
+					<div class="sheet-row">
 						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Rogue</div>
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_rogue_level" value="0" min="0" step="1">
@@ -3371,9 +3356,6 @@
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_warlock_level" value="0" min="0" step="1">
 						</div>
-						
-					</div>
-					<div class="sheet-row">
 						<div class="sheet-col-1-8 sheet-center sheet-margin-top">Wizard</div>
 						<div class="sheet-col-1-8 sheet-center sheet-padr">
 							<input type="number" name="attr_wizard_level" value="0" min="0" step="1">
@@ -3443,8 +3425,8 @@
 			<input type="radio" name="attr_classactiontab" class="sheet-classactiontab sheet-classactiontab4" value="4" title="Page 4" />
 			<span class="sheet-classactiontab sheet-classactiontab4">Page 4</span>
 			<input type="radio" name="attr_classactiontab" class="sheet-classactiontab sheet-classactiontab99" value="99" title="Show All" />
-		  <span class="sheet-classactiontab sheet-classactiontab99">Show All</span>
-		  <span class="sheet-spacer"></span>
+			<span class="sheet-classactiontab sheet-classactiontab99">Show All</span>
+			<span class="sheet-spacer"></span>
 			<!-- BEGIN auto generated classactions section -->
 			<!-- BEGIN new classaction page -->
 			<div class="sheet-classaction-page1">
@@ -3481,7 +3463,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource1">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -3822,7 +3803,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource2">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -4163,7 +4143,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource3">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -4472,7 +4451,7 @@
 				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-			  <div class="sheet-classaction-row4 sheet-margin-bottom sheet-padr sheet-padl">
+				<div class="sheet-classaction-row4 sheet-margin-bottom sheet-padr sheet-padl">
 					<div class="sheet-row">
 						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
 						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
@@ -4504,7 +4483,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource4">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -4810,10 +4788,10 @@
 							</div>
 						</div>
 					</div>
-			  </div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-			  <div class="sheet-classaction-row5 sheet-margin-bottom sheet-padr sheet-padl">
+				<div class="sheet-classaction-row5 sheet-margin-bottom sheet-padr sheet-padl">
 					<div class="sheet-row">
 						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
 						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
@@ -4845,7 +4823,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource5">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -5151,694 +5128,691 @@
 							</div>
 						</div>
 					</div>
-			  </div>
-			  
-			  <div class="sheet-classaction-row6 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">6</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname6">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource6" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource6_max" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge6">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource6">
-			          <option value="Not set" selected="selected">---</option>
-					  <option value="Artficer">Artificer</option>
-			          <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction6" value="&{template:5eDefault} {{title=@{classactionname6}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname6}}} {{freetext=@{classactionoutput6}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput6"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions6" class="sheet-classactionshowoptions6" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		      </div>
-			  <div class="sheet-classaction-row7 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">7</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname7">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource7" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource7_max" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge7">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource7">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-					  <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction7" value="&{template:5eDefault} {{title=@{classactionname7}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname7}}} {{freetext=@{classactionoutput7}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput7"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions7" class="sheet-classactionshowoptions7" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		      </div>
-			  
+				</div>
 				<!-- END classaction row -->
 			</div>
 			<!-- END classaction page -->
 			<!-- BEGIN new classaction page -->
 			<div class="sheet-classaction-page2">
 				<!-- BEGIN classaction row -->
+				<div class="sheet-classaction-row6 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">6</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname6">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource6" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource6_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge6">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource6">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction6" value="&{template:5eDefault} {{title=@{classactionname6}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname6}}} {{freetext=@{classactionoutput6}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput6"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions6" class="sheet-classactionshowoptions6" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha6" value="{{@{classactionname6}=@{classactionoutput6}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row7 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">7</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname7">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource7" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource7_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge7">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource7">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction7" value="&{template:5eDefault} {{title=@{classactionname7}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname7}}} {{freetext=@{classactionoutput7}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput7"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions7" class="sheet-classactionshowoptions7" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha7" value="{{@{classactionname7}=@{classactionoutput7}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
 				<div class="sheet-classaction-row8 sheet-margin-bottom sheet-padr sheet-padl">
@@ -5873,7 +5847,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource8">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -5901,7 +5874,7 @@
 						</div>
 					</div>
 					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions8" class="sheet-classactionshowoptions8" value="1" />
+					<input type="checkbox" name="attr_classactionshowoptions8" class="sheet-classactionshowoptions8" value="1" />
 					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
 						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
 						<div class="sheet-row sheet-small-label sheet-center">
@@ -6179,10 +6152,10 @@
 							</div>
 						</div>
 					</div>
-			  </div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-			  <div class="sheet-classaction-row9 sheet-margin-bottom sheet-padr sheet-padl">
+				<div class="sheet-classaction-row9 sheet-margin-bottom sheet-padr sheet-padl">
 					<div class="sheet-row">
 						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
 						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
@@ -6214,7 +6187,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource9">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -6523,7 +6495,7 @@
 				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-			  <div class="sheet-classaction-row10 sheet-margin-bottom sheet-padr sheet-padl">
+				<div class="sheet-classaction-row10 sheet-margin-bottom sheet-padr sheet-padl">
 					<div class="sheet-row">
 						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
 						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
@@ -6555,7 +6527,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource10">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -6862,1377 +6833,1370 @@
 						</div>
 					</div>
 				</div>
-				
-				<div class="sheet-classaction-row11 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">11</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname11">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource11" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource11_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge11">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource11">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction11" value="&{template:5eDefault} {{title=@{classactionname11}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname11}}} {{freetext=@{classactionoutput11}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput11"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions11" class="sheet-classactionshowoptions11" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-				<div class="sheet-classaction-row12 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">12</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname12">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource12" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource12_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge12">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource12">
-				        <option value="Not set" selected="selected">---</option>
-				     	<option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction12" value="&{template:5eDefault} {{title=@{classactionname12}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname12}}} {{freetext=@{classactionoutput12}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput12"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions12" class="sheet-classactionshowoptions12" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-				<div class="sheet-classaction-row13 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">13</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname13">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource13" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource13_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge13">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource13">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction13" value="&{template:5eDefault} {{title=@{classactionname13}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname13}}} {{freetext=@{classactionoutput13}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput13"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions13" class="sheet-classactionshowoptions13" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-				<div class="sheet-classaction-row14 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">14</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname14">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource14" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource14_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge14">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource14">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction14" value="&{template:5eDefault} {{title=@{classactionname14}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname14}}} {{freetext=@{classactionoutput14}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput14"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions14" class="sheet-classactionshowoptions14" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-				
 				<!-- END classaction row -->
-		  </div>
+			</div>
 			<!-- END classaction page -->
 			<!-- BEGIN new classaction page -->
 			<div class="sheet-classaction-page3">
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row11 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">11</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname11">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource11" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource11_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge11">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource11">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction11" value="&{template:5eDefault} {{title=@{classactionname11}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname11}}} {{freetext=@{classactionoutput11}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput11"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions11" class="sheet-classactionshowoptions11" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha11" value="{{@{classactionname11}=@{classactionoutput11}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row12 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">12</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname12">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource12" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource12_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge12">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource12">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction12" value="&{template:5eDefault} {{title=@{classactionname12}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname12}}} {{freetext=@{classactionoutput12}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput12"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions12" class="sheet-classactionshowoptions12" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha12" value="{{@{classactionname12}=@{classactionoutput12}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row13 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">13</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname13">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource13" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource13_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge13">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource13">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction13" value="&{template:5eDefault} {{title=@{classactionname13}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname13}}} {{freetext=@{classactionoutput13}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput13"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions13" class="sheet-classactionshowoptions13" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha13" value="{{@{classactionname13}=@{classactionoutput13}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row14 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">14</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname14">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource14" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource14_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge14">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource14">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction14" value="&{template:5eDefault} {{title=@{classactionname14}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname14}}} {{freetext=@{classactionoutput14}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput14"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions14" class="sheet-classactionshowoptions14" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha14" value="{{@{classactionname14}=@{classactionoutput14}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
 				<div class="sheet-classaction-row15 sheet-margin-bottom sheet-padr sheet-padl">
@@ -8267,7 +8231,6 @@
 						<div class="sheet-col-1-6">
 							<select name="attr_classactionsource15">
 								<option value="Not set" selected="selected">---</option>
-								<option value="Artficer">Artificer</option>
 								<option value="Barbarian">Barbarian</option>
 								<option value="Bard">Bard</option>
 								<option value="Cleric">Cleric</option>
@@ -8573,4478 +8536,1795 @@
 							</div>
 						</div>
 					</div>
-			  </div>
-			  
-				<div class="sheet-classaction-row16 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">16</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname16">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource16" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource16_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge16">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource16">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction16" value="&{template:5eDefault} {{title=@{classactionname16}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname16}}} {{freetext=@{classactionoutput16}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput16"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions16" class="sheet-classactionshowoptions16" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-				<div class="sheet-classaction-row17 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">17</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname17">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource17" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource17_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge17">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource17">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction17" value="&{template:5eDefault} {{title=@{classactionname17}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname17}}} {{freetext=@{classactionoutput17}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput17"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions17" class="sheet-classactionshowoptions17" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-				<div class="sheet-classaction-row18 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">18</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname18">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource18" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource18_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge18">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource18">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction18" value="&{template:5eDefault} {{title=@{classactionname18}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname18}}} {{freetext=@{classactionoutput18}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput18"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions18" class="sheet-classactionshowoptions18" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    </div>
-			  <div class="sheet-classaction-row19 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">19</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname19">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource19" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource19_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge19">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource19">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction19" value="&{template:5eDefault} {{title=@{classactionname19}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname19}}} {{freetext=@{classactionoutput19}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput19"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions19" class="sheet-classactionshowoptions19" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-		      </div>
-			  <div class="sheet-classaction-row20 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">20</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname20">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource20" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource20_max" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge20">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource20">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction20" value="&{template:5eDefault} {{title=@{classactionname20}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname20}}} {{freetext=@{classactionoutput20}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput20"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions20" class="sheet-classactionshowoptions20" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-		      </div>
-			  <div class="sheet-classaction-row21 sheet-margin-bottom sheet-padr sheet-padl">
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-				    <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-				    <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-				    <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">21</div>
-				    <div class="sheet-col-1-4">
-				      <input type="text" name="attr_classactionname21">
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource21" value="1" />
-			        </div>
-				    <div class="sheet-col-1-12">
-				      <input type="number" name="attr_classactionresource21_max2" value="1" />
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionrecharge21">
-				        <option value="None">None</option>
-				        <option value="Short Rest">Short Rest</option>
-				        <option value="Long rest">Long Rest</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6">
-				      <select name="attr_classactionsource21">
-				        <option value="Not set" selected="selected">---</option>
-				        <option value="Artficer">Artificer</option>
-						<option value="Barbarian">Barbarian</option>
-				        <option value="Bard">Bard</option>
-				        <option value="Cleric">Cleric</option>
-				        <option value="Druid">Druid</option>
-				        <option value="Fighter">Fighter</option>
-				        <option value="Monk">Monk</option>
-				        <option value="Paladin">Paladin</option>
-				        <option value="Ranger">Ranger</option>
-				        <option value="Rogue">Rogue</option>
-				        <option value="Sorcerer">Sorcerer</option>
-				        <option value="Warlock">Warlock</option>
-				        <option value="Wizard">Wizard</option>
-				        <option value="Feat">Feat</option>
-				        <option value="Other">Other</option>
-			          </select>
-			        </div>
-				    <div class="sheet-col-1-6 sheet-center">
-				      <button type='roll' class="sheet-roll" name="roll_classaction21" value="&{template:5eDefault} {{title=@{classactionname21}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname21}}} {{freetext=@{classactionoutput21}}}">Use</button>
-			        </div>
-			      </div>
-				  <div class="sheet-row">
-				    <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-				    <div class="sheet-col-11-12 sheet-margin-top">
-				      <textarea class="sheet-small-textarea" name="attr_classactionoutput21"></textarea>
-			        </div>
-			      </div>
-				  <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-				  <input type="checkbox" name="attr_classactionshowoptions21" class="sheet-classactionshowoptions21" value="1" />
-				  <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-				    <div class="sheet-row sheet-small-label sheet-center">
-				      <div class="sheet-col-1-5">Saving Throws</div>
-				      <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-				      <div class="sheet-col-2-5">Core Skills</div>
-				      <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-			        </div>
-				    <div class="sheet-row">
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Strength</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstrengthsave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Dexterity</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondexteritysave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Constitution</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionconstitutionsave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intelligence</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintelligencesave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Wisdom</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionwisdomsave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Charisma</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncharismasave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Death</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeathsave21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Initiative</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninitiative21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Hit Dice</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhitdice21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Melee Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmeleeweapon21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Ranged Weapons</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionrangedweapon21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Info</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellinfo21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Spell Cast</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionspellcast21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Acrobatics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionacrobatics21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Animal Handling</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionanimalhandling21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Arcana</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionarcana21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Athletics</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionathletics21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Deception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactiondeception21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">History</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionhistory21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Insight</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninsight21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Intimidation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionintimidation21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Investigation</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioninvestigation21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Medicine</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionmedicine21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Nature</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionnature21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Perception</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperception21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Performance</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionperformance21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Persuasion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionpersuasion21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Religion</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionreligion21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Sleight of Hand</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsleightofhand21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Stealth</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionstealth21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Survival</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionsurvival21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-				      <div class="sheet-col-1-5 sheet-padl">
-				        <div class="sheet-class-action-zebra">
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 1</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom1skill21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 2</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom2skill21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 3</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom3skill21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Custom 4</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactioncustom4skill21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled STR</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledstr21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled DEX</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilleddex21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CON</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcon21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled INT</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledint21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled WIS</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledwis21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-				          <div class="sheet-row sheet-margin-right">
-				            <div class="sheet-col-5-6">Unskilled CHA</div>
-				            <div class="sheet-col-1-12">
-				              <input type="checkbox" name="attr_classactionunskilledcha21" value="{{@{classactionname21}=@{classactionoutput21}}}" />
-			                </div>
-			              </div>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			  </div>
-			  
+				</div>
 				<!-- END classaction row -->
-		  </div>
+			</div>
 			<!-- END classaction page -->
 			<!-- BEGIN new classaction page -->
 			<div class="sheet-classaction-page4">
-			  <div class="sheet-classaction-row22 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">22</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname22">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource22" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource22_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge22">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource22">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-					  <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction22" value="&{template:5eDefault} {{title=@{classactionname22}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname22}}} {{freetext=@{classactionoutput22}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput22"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions22" class="sheet-classactionshowoptions22" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha22" value="{{@{classactionname22}=@{classactionoutput22}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		    </div>
-			  <div class="sheet-classaction-row23 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">23</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname23">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource23" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource23_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge23">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource23">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-				      <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction23" value="&{template:5eDefault} {{title=@{classactionname23}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname23}}} {{freetext=@{classactionoutput23}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput23"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions23" class="sheet-classactionshowoptions23" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha23" value="{{@{classactionname23}=@{classactionoutput23}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		    </div>
-<div class="sheet-classaction-row24 sheet-margin-bottom sheet-padr sheet-padl">
-	      <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">24</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname24">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource24" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource24_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge24">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource24">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-					  <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction24" value="&{template:5eDefault} {{title=@{classactionname24}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname24}}} {{freetext=@{classactionoutput24}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput24"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions24" class="sheet-classactionshowoptions24" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha24" value="{{@{classactionname24}=@{classactionoutput24}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		    </div>
-			  <div class="sheet-classaction-row25 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">25</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname25">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource25" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource25_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge25">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource25">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-				      <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction25" value="&{template:5eDefault} {{title=@{classactionname25}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname25}}} {{freetext=@{classactionoutput25}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput25"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions25" class="sheet-classactionshowoptions25" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha25" value="{{@{classactionname25}=@{classactionoutput25}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		    </div>
-			  <div class="sheet-classaction-row26 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">26</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname26">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource26" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource26_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge26">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource26">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-					  <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction26" value="&{template:5eDefault} {{title=@{classactionname26}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname26}}} {{freetext=@{classactionoutput26}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput26"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions26" class="sheet-classactionshowoptions26" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha26" value="{{@{classactionname26}=@{classactionoutput26}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		    </div>
-			  <div class="sheet-classaction-row27 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">27</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname27">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource27" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource27_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge27">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource27">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-					  <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction27" value="&{template:5eDefault} {{title=@{classactionname27}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname27}}} {{freetext=@{classactionoutput27}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput27"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions27" class="sheet-classactionshowoptions27" value="0" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha27" value="{{@{classactionname27}=@{classactionoutput27}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		    </div>
-			  <div class="sheet-classaction-row28 sheet-margin-bottom sheet-padr sheet-padl">
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
-			      <div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
-			      <div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
-			      <div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">28</div>
-			      <div class="sheet-col-1-4">
-			        <input type="text" name="attr_classactionname28">
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource28" value="1" />
-		          </div>
-			      <div class="sheet-col-1-12">
-			        <input type="number" name="attr_classactionresource28_max2" value="1" />
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionrecharge28">
-			          <option value="None">None</option>
-			          <option value="Short Rest">Short Rest</option>
-			          <option value="Long rest">Long Rest</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6">
-			        <select name="attr_classactionsource28">
-			          <option value="Not set" selected="selected">---</option>
-			          <option value="Artficer">Artificer</option>
-					  <option value="Barbarian">Barbarian</option>
-			          <option value="Bard">Bard</option>
-			          <option value="Cleric">Cleric</option>
-			          <option value="Druid">Druid</option>
-			          <option value="Fighter">Fighter</option>
-			          <option value="Monk">Monk</option>
-			          <option value="Paladin">Paladin</option>
-			          <option value="Ranger">Ranger</option>
-			          <option value="Rogue">Rogue</option>
-			          <option value="Sorcerer">Sorcerer</option>
-			          <option value="Warlock">Warlock</option>
-			          <option value="Wizard">Wizard</option>
-			          <option value="Feat">Feat</option>
-			          <option value="Other">Other</option>
-		            </select>
-		          </div>
-			      <div class="sheet-col-1-6 sheet-center">
-			        <button type='roll' class="sheet-roll" name="roll_classaction28" value="&{template:5eDefault} {{title=@{classactionname28}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname28}}} {{freetext=@{classactionoutput28}}}">Use</button>
-		          </div>
-		        </div>
-			    <div class="sheet-row">
-			      <div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
-			      <div class="sheet-col-11-12 sheet-margin-top">
-			        <textarea class="sheet-small-textarea" name="attr_classactionoutput28"></textarea>
-		          </div>
-		        </div>
-			    <span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
-			    <input type="checkbox" name="attr_classactionshowoptions28" class="sheet-classactionshowoptions28" value="1" />
-			    <div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom"> <span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
-			      <div class="sheet-row sheet-small-label sheet-center">
-			        <div class="sheet-col-1-5">Saving Throws</div>
-			        <div class="sheet-col-1-5">Weapons/Spell/Misc</div>
-			        <div class="sheet-col-2-5">Core Skills</div>
-			        <div class="sheet-col-1-5">Custom/Unskilled checks</div>
-		          </div>
-			      <div class="sheet-row">
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Strength</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstrengthsave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Dexterity</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondexteritysave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Constitution</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionconstitutionsave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intelligence</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintelligencesave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Wisdom</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionwisdomsave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Charisma</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncharismasave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Death</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeathsave28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Initiative</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninitiative28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Hit Dice</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhitdice28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Melee Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmeleeweapon28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Ranged Weapons</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionrangedweapon28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Info</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellinfo28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Spell Cast</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionspellcast28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Acrobatics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionacrobatics28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Animal Handling</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionanimalhandling28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Arcana</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionarcana28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Athletics</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionathletics28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Deception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactiondeception28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">History</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionhistory28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Insight</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninsight28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Intimidation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionintimidation28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Investigation</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioninvestigation28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Medicine</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionmedicine28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Nature</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionnature28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Perception</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperception28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Performance</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionperformance28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Persuasion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionpersuasion28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Religion</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionreligion28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Sleight of Hand</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsleightofhand28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Stealth</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionstealth28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Survival</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionsurvival28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-			        <div class="sheet-col-1-5 sheet-padl">
-			          <div class="sheet-class-action-zebra">
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 1</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom1skill28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 2</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom2skill28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 3</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom3skill28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Custom 4</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactioncustom4skill28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled STR</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledstr28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled DEX</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilleddex28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CON</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcon28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled INT</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledint28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled WIS</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledwis28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-			            <div class="sheet-row sheet-margin-right">
-			              <div class="sheet-col-5-6">Unskilled CHA</div>
-			              <div class="sheet-col-1-12">
-			                <input type="checkbox" name="attr_classactionunskilledcha28" value="{{@{classactionname28}=@{classactionoutput28}}}" />
-		                  </div>
-		                </div>
-		              </div>
-		            </div>
-		          </div>
-		        </div>
-		      </div>
-			
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row16 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">16</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname16">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource16" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource16_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge16">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource16">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction16" value="&{template:5eDefault} {{title=@{classactionname16}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname16}}} {{freetext=@{classactionoutput16}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput16"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions16" class="sheet-classactionshowoptions16" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha16" value="{{@{classactionname16}=@{classactionoutput16}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row17 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">17</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname17">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource17" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource17_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge17">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource17">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction17" value="&{template:5eDefault} {{title=@{classactionname17}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname17}}} {{freetext=@{classactionoutput17}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput17"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions17" class="sheet-classactionshowoptions17" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha17" value="{{@{classactionname17}=@{classactionoutput17}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row18 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">18</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname18">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource18" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource18_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge18">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource18">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction18" value="&{template:5eDefault} {{title=@{classactionname18}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname18}}} {{freetext=@{classactionoutput18}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput18"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions18" class="sheet-classactionshowoptions18" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha18" value="{{@{classactionname18}=@{classactionoutput18}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row19 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">19</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname19">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource19" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource19_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge19">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource19">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction19" value="&{template:5eDefault} {{title=@{classactionname19}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname19}}} {{freetext=@{classactionoutput19}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput19"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions19" class="sheet-classactionshowoptions19" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha19" value="{{@{classactionname19}=@{classactionoutput19}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
 				<!-- BEGIN classaction row -->
-				
+				<div class="sheet-classaction-row20 sheet-margin-bottom sheet-padr sheet-padl">
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Row</div>
+						<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">Name</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Used</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Max</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Recharge</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Gained from?</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Use</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-classaction-row-number sheet-margin-top">20</div>
+						<div class="sheet-col-1-4">
+							<input type="text" name="attr_classactionname20">
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource20" value="1" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_classactionresource20_max" value="1" />
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionrecharge20">
+								<option value="None">None</option>
+								<option value="Short Rest">Short Rest</option>
+								<option value="Long rest">Long Rest</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6">
+							<select name="attr_classactionsource20">
+								<option value="Not set" selected="selected">---</option>
+								<option value="Barbarian">Barbarian</option>
+								<option value="Bard">Bard</option>
+								<option value="Cleric">Cleric</option>
+								<option value="Druid">Druid</option>
+								<option value="Fighter">Fighter</option>
+								<option value="Monk">Monk</option>
+								<option value="Paladin">Paladin</option>
+								<option value="Ranger">Ranger</option>
+								<option value="Rogue">Rogue</option>
+								<option value="Sorcerer">Sorcerer</option>
+								<option value="Warlock">Warlock</option>
+								<option value="Wizard">Wizard</option>
+								<option value="Feat">Feat</option>
+								<option value="Other">Other</option>
+							</select>
+						</div>
+						<div class="sheet-col-1-6 sheet-center">
+							<button type='roll' class="sheet-roll" name="roll_classaction20" value="&{template:5eDefault} {{title=@{classactionname20}}} {{subheader=@{character_name}}} {{subheaderright=Class/Racial/Other ability}} {{freetextname=@{classactionname20}}} {{freetext=@{classactionoutput20}}}">Use</button>
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-12 sheet-center sheet-small-label sheet-padt">Output</div>
+						<div class="sheet-col-11-12 sheet-margin-top">
+							<textarea class="sheet-small-textarea" name="attr_classactionoutput20"></textarea>
+						</div>
+					</div>
+					<span class="sheet-small-note sheet-padr sheet-offset-1-12">Show output options?</span>
+					<input type="checkbox" name="attr_classactionshowoptions20" class="sheet-classactionshowoptions20" value="1" />
+					<div class="sheet-classaction-output-options sheet-padb sheet-margin-bottom">
+						<span class="sheet-col-1  sheet-padl sheet-padr sheet-small-note">Check the appropriate option(s) below to have the output automatically be included in the roll type specified</span>
+						<div class="sheet-row sheet-small-label sheet-center">
+							<div class="sheet-col-1-5">Saving Throws</div>
+							<div class="sheet-col-1-5">Weapons/Spell/Misc</div>
+							<div class="sheet-col-2-5">Core Skills</div>
+							<div class="sheet-col-1-5">Custom/Unskilled checks</div>
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Strength</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstrengthsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Dexterity</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondexteritysave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Constitution</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionconstitutionsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intelligence</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintelligencesave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Wisdom</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionwisdomsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Charisma</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncharismasave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Death</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeathsave20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Initiative</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninitiative20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Hit Dice</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhitdice20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Melee Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmeleeweapon20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Ranged Weapons</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionrangedweapon20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Info</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellinfo20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Spell Cast</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionspellcast20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Acrobatics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionacrobatics20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Animal Handling</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionanimalhandling20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Arcana</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionarcana20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Athletics</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionathletics20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Deception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactiondeception20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">History</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionhistory20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Insight</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninsight20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Intimidation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionintimidation20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Investigation</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioninvestigation20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Medicine</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionmedicine20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Nature</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionnature20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Perception</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperception20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Performance</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionperformance20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Persuasion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionpersuasion20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Religion</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionreligion20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Sleight of Hand</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsleightofhand20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Stealth</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionstealth20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Survival</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionsurvival20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="sheet-col-1-5 sheet-padl">
+								<div class="sheet-class-action-zebra">
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 1</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom1skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 2</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom2skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 3</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom3skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Custom 4</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactioncustom4skill20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled STR</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledstr20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled DEX</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilleddex20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CON</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcon20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled INT</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledint20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled WIS</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledwis20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+									<div class="sheet-row sheet-margin-right">
+										<div class="sheet-col-5-6">Unskilled CHA</div>
+										<div class="sheet-col-1-12">
+											<input type="checkbox" name="attr_classactionunskilledcha20" value="{{@{classactionname20}=@{classactionoutput20}}}" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<!-- END classaction row -->
-		  </div>
-					  			<!-- END classaction page -->
+			</div>
+			<!-- END classaction page -->
 			<!-- Hidden attributes to power output to other rolls -->
-			<input type="hidden" name="attr_classactionstrengthsave" value="@{classactionstrengthsave1} @{classactionstrengthsave2} @{classactionstrengthsave3} @{classactionstrengthsave4} @{classactionstrengthsave5} @{classactionstrengthsave6} @{classactionstrengthsave7} @{classactionstrengthsave8} @{classactionstrengthsave9} @{classactionstrengthsave10} @{classactionstrengthsave11} @{classactionstrengthsave12} @{classactionstrengthsave13} @{classactionstrengthsave14} @{classactionstrengthsave15} @{classactionstrengthsave16} @{classactionstrengthsave17} @{classactionstrengthsave18} @{classactionstrengthsave19} @{classactionstrengthsave20} @{classactionstrengthsave21} @{classactionstrengthsave22} @{classactionstrengthsave23} @{classactionstrengthsave24} @{classactionstrengthsave25} @{classactionstrengthsave26} @{classactionstrengthsave27} @{classactionstrengthsave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactiondexteritysave" value="@{classactiondexteritysave1} @{classactiondexteritysave2} @{classactiondexteritysave3} @{classactiondexteritysave4} @{classactiondexteritysave5} @{classactiondexteritysave6} @{classactiondexteritysave7} @{classactiondexteritysave8} @{classactiondexteritysave9} @{classactiondexteritysave10} @{classactiondexteritysave11} @{classactiondexteritysave12} @{classactiondexteritysave13} @{classactiondexteritysave14} @{classactiondexteritysave15} @{classactiondexteritysave16} @{classactiondexteritysave17} @{classactiondexteritysave18} @{classactiondexteritysave19} @{classactiondexteritysave20} @{classactiondexteritysave21} @{classactiondexteritysave22} @{classactiondexteritysave23} @{classactiondexteritysave24} @{classactiondexteritysave25} @{classactiondexteritysave26} @{classactiondexteritysave27} @{classactiondexteritysave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionconstitutionsave" value="@{classactionconstitutionsave1} @{classactionconstitutionsave2} @{classactionconstitutionsave3} @{classactionconstitutionsave4} @{classactionconstitutionsave5} @{classactionconstitutionsave6} @{classactionconstitutionsave7} @{classactionconstitutionsave8} @{classactionconstitutionsave9} @{classactionconstitutionsave10} @{classactionconstitutionsave11} @{classactionconstitutionsave12} @{classactionconstitutionsave13} @{classactionconstitutionsave14} @{classactionconstitutionsave15} @{classactionconstitutionsave16} @{classactionconstitutionsave17} @{classactionconstitutionsave18} @{classactionconstitutionsave19} @{classactionconstitutionsave20} @{classactionconstitutionsave21} @{classactionconstitutionsave22} @{classactionconstitutionsave23} @{classactionconstitutionsave24} @{classactionconstitutionsave25} @{classactionconstitutionsave26} @{classactionconstitutionsave27} @{classactionconstitutionsave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionintelligencesave" value="@{classactionintelligencesave1} @{classactionintelligencesave2} @{classactionintelligencesave3} @{classactionintelligencesave4} @{classactionintelligencesave5} @{classactionintelligencesave6} @{classactionintelligencesave7} @{classactionintelligencesave8} @{classactionintelligencesave9} @{classactionintelligencesave10} @{classactionintelligencesave11} @{classactionintelligencesave12} @{classactionintelligencesave13} @{classactionintelligencesave14} @{classactionintelligencesave15} @{classactionintelligencesave16} @{classactionintelligencesave17} @{classactionintelligencesave18} @{classactionintelligencesave19} @{classactionintelligencesave20} @{classactionintelligencesave21} @{classactionintelligencesave22} @{classactionintelligencesave23} @{classactionintelligencesave24} @{classactionintelligencesave25} @{classactionintelligencesave26} @{classactionintelligencesave27} @{classactionintelligencesave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionwisdomsave" value="@{classactionwisdomsave1} @{classactionwisdomsave2} @{classactionwisdomsave3} @{classactionwisdomsave4} @{classactionwisdomsave5} @{classactionwisdomsave6} @{classactionwisdomsave7} @{classactionwisdomsave8} @{classactionwisdomsave9} @{classactionwisdomsave10} @{classactionwisdomsave11} @{classactionwisdomsave12} @{classactionwisdomsave13} @{classactionwisdomsave14} @{classactionwisdomsave15} @{classactionwisdomsave16} @{classactionwisdomsave17} @{classactionwisdomsave18} @{classactionwisdomsave19} @{classactionwisdomsave20} @{classactionwisdomsave21} @{classactionwisdomsave22} @{classactionwisdomsave23} @{classactionwisdomsave24} @{classactionwisdomsave25} @{classactionwisdomsave26} @{classactionwisdomsave27} @{classactionwisdomsave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactioncharismasave" value="@{classactioncharismasave1} @{classactioncharismasave2} @{classactioncharismasave3} @{classactioncharismasave4} @{classactioncharismasave5} @{classactioncharismasave6} @{classactioncharismasave7} @{classactioncharismasave8} @{classactioncharismasave9} @{classactioncharismasave10} @{classactioncharismasave11} @{classactioncharismasave12} @{classactioncharismasave13} @{classactioncharismasave14} @{classactioncharismasave15} @{classactioncharismasave16} @{classactioncharismasave17} @{classactioncharismasave18} @{classactioncharismasave19} @{classactioncharismasave20} @{classactioncharismasave21} @{classactioncharismasave22} @{classactioncharismasave23} @{classactioncharismasave24} @{classactioncharismasave25} @{classactioncharismasave26} @{classactioncharismasave27} @{classactioncharismasave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactiondeathsave" value="@{classactiondeathsave1} @{classactiondeathsave2} @{classactiondeathsave3} @{classactiondeathsave4} @{classactiondeathsave5} @{classactiondeathsave6} @{classactiondeathsave7} @{classactiondeathsave8} @{classactiondeathsave9} @{classactiondeathsave10} @{classactiondeathsave11} @{classactiondeathsave12} @{classactiondeathsave13} @{classactiondeathsave14} @{classactiondeathsave15} @{classactiondeathsave16} @{classactiondeathsave17} @{classactiondeathsave18} @{classactiondeathsave19} @{classactiondeathsave20} @{classactiondeathsave21} @{classactiondeathsave22} @{classactiondeathsave23} @{classactiondeathsave24} @{classactiondeathsave25} @{classactiondeathsave26} @{classactiondeathsave27} @{classactiondeathsave28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactioninitiative" value="@{classactioninitiative1} @{classactioninitiative2} @{classactioninitiative3} @{classactioninitiative4} @{classactioninitiative5} @{classactioninitiative6} @{classactioninitiative7} @{classactioninitiative8} @{classactioninitiative9} @{classactioninitiative10} @{classactioninitiative11} @{classactioninitiative12} @{classactioninitiative13} @{classactioninitiative14} @{classactioninitiative15} @{classactioninitiative16} @{classactioninitiative17} @{classactioninitiative18} @{classactioninitiative19} @{classactioninitiative20} @{classactioninitiative21} @{classactioninitiative22} @{classactioninitiative23} @{classactioninitiative24} @{classactioninitiative25} @{classactioninitiative26} @{classactioninitiative27} @{classactioninitiative28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionhitdice" value="@{classactionhitdice1} @{classactionhitdice2} @{classactionhitdice3} @{classactionhitdice4} @{classactionhitdice5} @{classactionhitdice6} @{classactionhitdice7} @{classactionhitdice8} @{classactionhitdice9} @{classactionhitdice10} @{classactionhitdice11} @{classactionhitdice12} @{classactionhitdice13} @{classactionhitdice14} @{classactionhitdice15} @{classactionhitdice16} @{classactionhitdice17} @{classactionhitdice18} @{classactionhitdice19} @{classactionhitdice20} @{classactionhitdice21} @{classactionhitdice22} @{classactionhitdice23} @{classactionhitdice24} @{classactionhitdice25} @{classactionhitdice26} @{classactionhitdice27} @{classactionhitdice28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionmeleeweapon" value="@{classactionmeleeweapon1} @{classactionmeleeweapon2} @{classactionmeleeweapon3} @{classactionmeleeweapon4} @{classactionmeleeweapon5} @{classactionmeleeweapon6} @{classactionmeleeweapon7} @{classactionmeleeweapon8} @{classactionmeleeweapon9} @{classactionmeleeweapon10} @{classactionmeleeweapon11} @{classactionmeleeweapon12} @{classactionmeleeweapon13} @{classactionmeleeweapon14} @{classactionmeleeweapon15} @{classactionmeleeweapon16} @{classactionmeleeweapon17} @{classactionmeleeweapon18} @{classactionmeleeweapon19} @{classactionmeleeweapon20} @{classactionmeleeweapon21} @{classactionmeleeweapon22} @{classactionmeleeweapon23} @{classactionmeleeweapon24} @{classactionmeleeweapon25} @{classactionmeleeweapon26} @{classactionmeleeweapon27} @{classactionmeleeweapon28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionrangedweapon" value="@{classactionrangedweapon1} @{classactionrangedweapon2} @{classactionrangedweapon3} @{classactionrangedweapon4} @{classactionrangedweapon5} @{classactionrangedweapon6} @{classactionrangedweapon7} @{classactionrangedweapon8} @{classactionrangedweapon9} @{classactionrangedweapon10} @{classactionrangedweapon11} @{classactionrangedweapon12} @{classactionrangedweapon13} @{classactionrangedweapon14} @{classactionrangedweapon15} @{classactionrangedweapon16} @{classactionrangedweapon17} @{classactionrangedweapon18} @{classactionrangedweapon19} @{classactionrangedweapon20} @{classactionrangedweapon21} @{classactionrangedweapon22} @{classactionrangedweapon23} @{classactionrangedweapon24} @{classactionrangedweapon25} @{classactionrangedweapon26} @{classactionrangedweapon27} @{classactionrangedweapon28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionspellinfo" value="@{classactionspellinfo1} @{classactionspellinfo2} @{classactionspellinfo3} @{classactionspellinfo4} @{classactionspellinfo5} @{classactionspellinfo6} @{classactionspellinfo7} @{classactionspellinfo8} @{classactionspellinfo9} @{classactionspellinfo10} @{classactionspellinfo11} @{classactionspellinfo12} @{classactionspellinfo13} @{classactionspellinfo14} @{classactionspellinfo15} @{classactionspellinfo16} @{classactionspellinfo17} @{classactionspellinfo18} @{classactionspellinfo19} @{classactionspellinfo20} @{classactionspellinfo21} @{classactionspellinfo22} @{classactionspellinfo23} @{classactionspellinfo24} @{classactionspellinfo25} @{classactionspellinfo26} @{classactionspellinfo27} @{classactionspellinfo28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionspellcast" value="@{classactionspellcast1} @{classactionspellcast2} @{classactionspellcast3} @{classactionspellcast4} @{classactionspellcast5} @{classactionspellcast6} @{classactionspellcast7} @{classactionspellcast8} @{classactionspellcast9} @{classactionspellcast10} @{classactionspellcast11} @{classactionspellcast12} @{classactionspellcast13} @{classactionspellcast14} @{classactionspellcast15} @{classactionspellcast16} @{classactionspellcast17} @{classactionspellcast18} @{classactionspellcast19} @{classactionspellcast20} @{classactionspellcast21} @{classactionspellcast22} @{classactionspellcast23} @{classactionspellcast24} @{classactionspellcast25} @{classactionspellcast26} @{classactionspellcast27} @{classactionspellcast28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionacrobatics" value="@{classactionacrobatics1} @{classactionacrobatics2} @{classactionacrobatics3} @{classactionacrobatics4} @{classactionacrobatics5} @{classactionacrobatics6} @{classactionacrobatics7} @{classactionacrobatics8} @{classactionacrobatics9} @{classactionacrobatics10} @{classactionacrobatics11} @{classactionacrobatics12} @{classactionacrobatics13} @{classactionacrobatics14} @{classactionacrobatics15} @{classactionacrobatics16} @{classactionacrobatics17} @{classactionacrobatics18} @{classactionacrobatics19} @{classactionacrobatics20} @{classactionacrobatics21} @{classactionacrobatics22} @{classactionacrobatics23} @{classactionacrobatics24} @{classactionacrobatics25} @{classactionacrobatics26} @{classactionacrobatics27} @{classactionacrobatics28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionanimalhandling" value="@{classactionanimalhandling1} @{classactionanimalhandling2} @{classactionanimalhandling3} @{classactionanimalhandling4} @{classactionanimalhandling5} @{classactionanimalhandling6} @{classactionanimalhandling7} @{classactionanimalhandling8} @{classactionanimalhandling9} @{classactionanimalhandling10} @{classactionanimalhandling11} @{classactionanimalhandling12} @{classactionanimalhandling13} @{classactionanimalhandling14} @{classactionanimalhandling15} @{classactionanimalhandling16} @{classactionanimalhandling17} @{classactionanimalhandling18} @{classactionanimalhandling19} @{classactionanimalhandling20} @{classactionanimalhandling21} @{classactionanimalhandling22} @{classactionanimalhandling23} @{classactionanimalhandling24} @{classactionanimalhandling25} @{classactionanimalhandling26} @{classactionanimalhandling27} @{classactionanimalhandling28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionarcana" value="@{classactionarcana1} @{classactionarcana2} @{classactionarcana3} @{classactionarcana4} @{classactionarcana5} @{classactionarcana6} @{classactionarcana7} @{classactionarcana8} @{classactionarcana9} @{classactionarcana10} @{classactionarcana11} @{classactionarcana12} @{classactionarcana13} @{classactionarcana14} @{classactionarcana15} @{classactionarcana16} @{classactionarcana17} @{classactionarcana18} @{classactionarcana19} @{classactionarcana20} @{classactionarcana21} @{classactionarcana22} @{classactionarcana23} @{classactionarcana24} @{classactionarcana25} @{classactionarcana26} @{classactionarcana27} @{classactionarcana28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionathletics" value="@{classactionathletics1} @{classactionathletics2} @{classactionathletics3} @{classactionathletics4} @{classactionathletics5} @{classactionathletics6} @{classactionathletics7} @{classactionathletics8} @{classactionathletics9} @{classactionathletics10} @{classactionathletics11} @{classactionathletics12} @{classactionathletics13} @{classactionathletics14} @{classactionathletics15} @{classactionathletics16} @{classactionathletics17} @{classactionathletics18} @{classactionathletics19} @{classactionathletics20} @{classactionathletics21} @{classactionathletics22} @{classactionathletics23} @{classactionathletics24} @{classactionathletics25} @{classactionathletics26} @{classactionathletics27} @{classactionathletics28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactiondeception" value="@{classactiondeception1} @{classactiondeception2} @{classactiondeception3} @{classactiondeception4} @{classactiondeception5} @{classactiondeception6} @{classactiondeception7} @{classactiondeception8} @{classactiondeception9} @{classactiondeception10} @{classactiondeception11} @{classactiondeception12} @{classactiondeception13} @{classactiondeception14} @{classactiondeception15} @{classactiondeception16} @{classactiondeception17} @{classactiondeception18} @{classactiondeception19} @{classactiondeception20} @{classactiondeception21} @{classactiondeception22} @{classactiondeception23} @{classactiondeception24} @{classactiondeception25} @{classactiondeception26} @{classactiondeception27} @{classactiondeception28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionhistory" value="@{classactionhistory1} @{classactionhistory2} @{classactionhistory3} @{classactionhistory4} @{classactionhistory5} @{classactionhistory6} @{classactionhistory7} @{classactionhistory8} @{classactionhistory9} @{classactionhistory10} @{classactionhistory11} @{classactionhistory12} @{classactionhistory13} @{classactionhistory14} @{classactionhistory15} @{classactionhistory16} @{classactionhistory17} @{classactionhistory18} @{classactionhistory19} @{classactionhistory20} @{classactionhistory21} @{classactionhistory22} @{classactionhistory23} @{classactionhistory24} @{classactionhistory25} @{classactionhistory26} @{classactionhistory27} @{classactionhistory28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactioninsight" value="@{classactioninsight1} @{classactioninsight2} @{classactioninsight3} @{classactioninsight4} @{classactioninsight5} @{classactioninsight6} @{classactioninsight7} @{classactioninsight8} @{classactioninsight9} @{classactioninsight10} @{classactioninsight11} @{classactioninsight12} @{classactioninsight13} @{classactioninsight14} @{classactioninsight15} @{classactioninsight16} @{classactioninsight17} @{classactioninsight18} @{classactioninsight19} @{classactioninsight20} @{classactioninsight21} @{classactioninsight22} @{classactioninsight23} @{classactioninsight24} @{classactioninsight25} @{classactioninsight26} @{classactioninsight27} @{classactioninsight28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionintimidation" value="@{classactionintimidation1} @{classactionintimidation2} @{classactionintimidation3} @{classactionintimidation4} @{classactionintimidation5} @{classactionintimidation6} @{classactionintimidation7} @{classactionintimidation8} @{classactionintimidation9} @{classactionintimidation10} @{classactionintimidation11} @{classactionintimidation12} @{classactionintimidation13} @{classactionintimidation14} @{classactionintimidation15} @{classactionintimidation16} @{classactionintimidation17} @{classactionintimidation18} @{classactionintimidation19} @{classactionintimidation20} @{classactionintimidation21} @{classactionintimidation22} @{classactionintimidation23} @{classactionintimidation24} @{classactionintimidation25} @{classactionintimidation26} @{classactionintimidation27} @{classactionintimidation28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactioninvestigation" value="@{classactioninvestigation1} @{classactioninvestigation2} @{classactioninvestigation3} @{classactioninvestigation4} @{classactioninvestigation5} @{classactioninvestigation6} @{classactioninvestigation7} @{classactioninvestigation8} @{classactioninvestigation9} @{classactioninvestigation10} @{classactioninvestigation11} @{classactioninvestigation12} @{classactioninvestigation13} @{classactioninvestigation14} @{classactioninvestigation15} @{classactioninvestigation16} @{classactioninvestigation17} @{classactioninvestigation18} @{classactioninvestigation19} @{classactioninvestigation20} @{classactioninvestigation21} @{classactioninvestigation22} @{classactioninvestigation23} @{classactioninvestigation24} @{classactioninvestigation25} @{classactioninvestigation26} @{classactioninvestigation27} @{classactioninvestigation28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionmedicine" value="@{classactionmedicine1} @{classactionmedicine2} @{classactionmedicine3} @{classactionmedicine4} @{classactionmedicine5} @{classactionmedicine6} @{classactionmedicine7} @{classactionmedicine8} @{classactionmedicine9} @{classactionmedicine10} @{classactionmedicine11} @{classactionmedicine12} @{classactionmedicine13} @{classactionmedicine14} @{classactionmedicine15} @{classactionmedicine16} @{classactionmedicine17} @{classactionmedicine18} @{classactionmedicine19} @{classactionmedicine20} @{classactionmedicine21} @{classactionmedicine22} @{classactionmedicine23} @{classactionmedicine24} @{classactionmedicine25} @{classactionmedicine26} @{classactionmedicine27} @{classactionmedicine28}  {{showclassactions=1}}" disabled="disabled">
-		  	<input type="hidden" name="attr_classactionnature" value="@{classactionnature1} @{classactionnature2} @{classactionnature3} @{classactionnature4} @{classactionnature5} @{classactionnature6} @{classactionnature7} @{classactionnature8} @{classactionnature9} @{classactionnature10} @{classactionnature11} @{classactionnature12} @{classactionnature13} @{classactionnature14} @{classactionnature15} @{classactionnature16} @{classactionnature17} @{classactionnature18} @{classactionnature19} @{classactionnature20} @{classactionnature21} @{classactionnature22} @{classactionnature23} @{classactionnature24} @{classactionnature25} @{classactionnature26} @{classactionnature27} @{classactionnature28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionperception" value="@{classactionperception1} @{classactionperception2} @{classactionperception3} @{classactionperception4} @{classactionperception5} @{classactionperception6} @{classactionperception7} @{classactionperception8} @{classactionperception9} @{classactionperception10} @{classactionperception11} @{classactionperception12} @{classactionperception13} @{classactionperception14} @{classactionperception15} @{classactionperception16} @{classactionperception17} @{classactionperception18} @{classactionperception19} @{classactionperception20} @{classactionperception21} @{classactionperception22} @{classactionperception23} @{classactionperception24} @{classactionperception25} @{classactionperception26} @{classactionperception27} @{classactionperception28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionperception" value="@{classactionperception1} @{classactionperception2} @{classactionperception3} @{classactionperception4} @{classactionperception5} @{classactionperception6} @{classactionperception7} @{classactionperception8} @{classactionperception9} @{classactionperception10} @{classactionperception11} @{classactionperception12} @{classactionperception13} @{classactionperception14} @{classactionperception15} @{classactionperception16} @{classactionperception17} @{classactionperception18} @{classactionperception19} @{classactionperception20} @{classactionperception21} @{classactionperception22} @{classactionperception23} @{classactionperception24} @{classactionperception25} @{classactionperception26} @{classactionperception27} @{classactionperception28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionperformance" value="@{classactionperformance1} @{classactionperformance2} @{classactionperformance3} @{classactionperformance4} @{classactionperformance5} @{classactionperformance6} @{classactionperformance7} @{classactionperformance8} @{classactionperformance9} @{classactionperformance10} @{classactionperformance11} @{classactionperformance12} @{classactionperformance13} @{classactionperformance14} @{classactionperformance15} @{classactionperformance16} @{classactionperformance17} @{classactionperformance18} @{classactionperformance19} @{classactionperformance20} @{classactionperformance21} @{classactionperformance22} @{classactionperformance23} @{classactionperformance24} @{classactionperformance25} @{classactionperformance26} @{classactionperformance27} @{classactionperformance28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionpersuasion" value="@{classactionpersuasion1} @{classactionpersuasion2} @{classactionpersuasion3} @{classactionpersuasion4} @{classactionpersuasion5} @{classactionpersuasion6} @{classactionpersuasion7} @{classactionpersuasion8} @{classactionpersuasion9} @{classactionpersuasion10} @{classactionpersuasion11} @{classactionpersuasion12} @{classactionpersuasion13} @{classactionpersuasion14} @{classactionpersuasion15} @{classactionpersuasion16} @{classactionpersuasion17} @{classactionpersuasion18} @{classactionpersuasion19} @{classactionpersuasion20} @{classactionpersuasion21} @{classactionpersuasion22} @{classactionpersuasion23} @{classactionpersuasion24} @{classactionpersuasion25} @{classactionpersuasion26} @{classactionpersuasion27} @{classactionpersuasion28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionreligion" value="@{classactionreligion1} @{classactionreligion2} @{classactionreligion3} @{classactionreligion4} @{classactionreligion5} @{classactionreligion6} @{classactionreligion7} @{classactionreligion8} @{classactionreligion9} @{classactionreligion10} @{classactionreligion11} @{classactionreligion12} @{classactionreligion13} @{classactionreligion14} @{classactionreligion15} @{classactionreligion16} @{classactionreligion17} @{classactionreligion18} @{classactionreligion19} @{classactionreligion20} @{classactionreligion21} @{classactionreligion22} @{classactionreligion23} @{classactionreligion24} @{classactionreligion25} @{classactionreligion26} @{classactionreligion27} @{classactionreligion28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionsleightofhand" value="@{classactionsleightofhand1} @{classactionsleightofhand2} @{classactionsleightofhand3} @{classactionsleightofhand4} @{classactionsleightofhand5} @{classactionsleightofhand6} @{classactionsleightofhand7} @{classactionsleightofhand8} @{classactionsleightofhand9} @{classactionsleightofhand10} @{classactionsleightofhand11} @{classactionsleightofhand12} @{classactionsleightofhand13} @{classactionsleightofhand14} @{classactionsleightofhand15} @{classactionsleightofhand16} @{classactionsleightofhand17} @{classactionsleightofhand18} @{classactionsleightofhand19} @{classactionsleightofhand20} @{classactionsleightofhand21} @{classactionsleightofhand22} @{classactionsleightofhand23} @{classactionsleightofhand24} @{classactionsleightofhand25} @{classactionsleightofhand26} @{classactionsleightofhand27} @{classactionsleightofhand28}  {{showclassactions=1}}" disabled="disabled">
-			<input type="hidden" name="attr_classactionstealth" value="@{classactionstealth1} @{classactionstealth2} @{classactionstealth3} @{classactionstealth4} @{classactionstealth5} @{classactionstealth6} @{classactionstealth7} @{classactionstealth8} @{classactionstealth9} @{classactionstealth10} @{classactionstealth11} @{classactionstealth12} @{classactionstealth13} @{classactionstealth14} @{classactionstealth15} @{classactionstealth16} @{classactionstealth17} @{classactionstealth18} @{classactionstealth19} @{classactionstealth20} @{classactionstealth21} @{classactionstealth22} @{classactionstealth23} @{classactionstealth24} @{classactionstealth25} @{classactionstealth26} @{classactionstealth27} @{classactionstealth28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactionsurvival" value="@{classactionsurvival1} @{classactionsurvival2} @{classactionsurvival3} @{classactionsurvival4} @{classactionsurvival5} @{classactionsurvival6} @{classactionsurvival7} @{classactionsurvival8} @{classactionsurvival9} @{classactionsurvival10} @{classactionsurvival11} @{classactionsurvival12} @{classactionsurvival13} @{classactionsurvival14} @{classactionsurvival15} @{classactionsurvival16} @{classactionsurvival17} @{classactionsurvival18} @{classactionsurvival19} @{classactionsurvival20} @{classactionsurvival21} @{classactionsurvival22} @{classactionsurvival23} @{classactionsurvival24} @{classactionsurvival25} @{classactionsurvival26} @{classactionsurvival27} @{classactionsurvival28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactioncustom1skill" value="@{classactioncustom1skill1} @{classactioncustom1skill2} @{classactioncustom1skill3} @{classactioncustom1skill4} @{classactioncustom1skill5} @{classactioncustom1skill6} @{classactioncustom1skill7} @{classactioncustom1skill8} @{classactioncustom1skill9} @{classactioncustom1skill10} @{classactioncustom1skill11} @{classactioncustom1skill12} @{classactioncustom1skill13} @{classactioncustom1skill14} @{classactioncustom1skill15} @{classactioncustom1skill16} @{classactioncustom1skill17} @{classactioncustom1skill18} @{classactioncustom1skill19} @{classactioncustom1skill20} @{classactioncustom1skill21} @{classactioncustom1skill22} @{classactioncustom1skill23} @{classactioncustom1skill24} @{classactioncustom1skill25} @{classactioncustom1skill26} @{classactioncustom1skill27} @{classactioncustom1skill28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactioncustom2skill" value="@{classactioncustom2skill1} @{classactioncustom2skill2} @{classactioncustom2skill3} @{classactioncustom2skill4} @{classactioncustom2skill5} @{classactioncustom2skill6} @{classactioncustom2skill7} @{classactioncustom2skill8} @{classactioncustom2skill9} @{classactioncustom2skill10} @{classactioncustom2skill11} @{classactioncustom2skill12} @{classactioncustom2skill13} @{classactioncustom2skill14} @{classactioncustom2skill15} @{classactioncustom2skill16} @{classactioncustom2skill17} @{classactioncustom2skill18} @{classactioncustom2skill19} @{classactioncustom2skill20} @{classactioncustom2skill21} @{classactioncustom2skill22} @{classactioncustom2skill23} @{classactioncustom2skill24} @{classactioncustom2skill25} @{classactioncustom2skill26} @{classactioncustom2skill27} @{classactioncustom2skill28}  {{showclassactions=1}}" disabled="disabled">
-	  	  	<input type="hidden" name="attr_classactioncustom3skill" value="@{classactioncustom3skill1} @{classactioncustom3skill2} @{classactioncustom3skill3} @{classactioncustom3skill4} @{classactioncustom3skill5} @{classactioncustom3skill6} @{classactioncustom3skill7} @{classactioncustom3skill8} @{classactioncustom3skill9} @{classactioncustom3skill10} @{classactioncustom3skill11} @{classactioncustom3skill12} @{classactioncustom3skill13} @{classactioncustom3skill14} @{classactioncustom3skill15} @{classactioncustom3skill16} @{classactioncustom3skill17} @{classactioncustom3skill18} @{classactioncustom3skill19} @{classactioncustom3skill20} @{classactioncustom3skill21} @{classactioncustom3skill22} @{classactioncustom3skill23} @{classactioncustom3skill24} @{classactioncustom3skill25} @{classactioncustom3skill26} @{classactioncustom3skill27} @{classactioncustom3skill28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactioncustom4skill" value="@{classactioncustom4skill1} @{classactioncustom4skill2} @{classactioncustom4skill3} @{classactioncustom4skill4} @{classactioncustom4skill5} @{classactioncustom4skill6} @{classactioncustom4skill7} @{classactioncustom4skill8} @{classactioncustom4skill9} @{classactioncustom4skill10} @{classactioncustom4skill11} @{classactioncustom4skill12} @{classactioncustom4skill13} @{classactioncustom4skill14} @{classactioncustom4skill15} @{classactioncustom4skill16} @{classactioncustom4skill17} @{classactioncustom4skill18} @{classactioncustom4skill19} @{classactioncustom4skill20} @{classactioncustom4skill21} @{classactioncustom4skill22} @{classactioncustom4skill23} @{classactioncustom4skill24} @{classactioncustom4skill25} @{classactioncustom4skill26} @{classactioncustom4skill27} @{classactioncustom4skill28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactionskilledstr" value="@{classactionskilledstr1} @{classactionskilledstr2} @{classactionskilledstr3} @{classactionskilledstr4} @{classactionskilledstr5} @{classactionskilledstr6} @{classactionskilledstr7} @{classactionskilledstr8} @{classactionskilledstr9} @{classactionskilledstr10} @{classactionskilledstr11} @{classactionskilledstr12} @{classactionskilledstr13} @{classactionskilledstr14} @{classactionskilledstr15} @{classactionskilledstr16} @{classactionskilledstr17} @{classactionskilledstr18} @{classactionskilledstr19} @{classactionskilledstr20} @{classactionskilledstr21} @{classactionskilledstr22} @{classactionskilledstr23} @{classactionskilledstr24} @{classactionskilledstr25} @{classactionskilledstr26} @{classactionskilledstr27} @{classactionskilledstr28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactionskilleddex" value="@{classactionskilleddex1} @{classactionskilleddex2} @{classactionskilleddex3} @{classactionskilleddex4} @{classactionskilleddex5} @{classactionskilleddex6} @{classactionskilleddex7} @{classactionskilleddex8} @{classactionskilleddex9} @{classactionskilleddex10} @{classactionskilleddex11} @{classactionskilleddex12} @{classactionskilleddex13} @{classactionskilleddex14} @{classactionskilleddex15} @{classactionskilleddex16} @{classactionskilleddex17} @{classactionskilleddex18} @{classactionskilleddex19} @{classactionskilleddex20} @{classactionskilleddex21} @{classactionskilleddex22} @{classactionskilleddex23} @{classactionskilleddex24} @{classactionskilleddex25} @{classactionskilleddex26} @{classactionskilleddex27} @{classactionskilleddex28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactionskilledcon" value="@{classactionskilledcon1} @{classactionskilledcon2} @{classactionskilledcon3} @{classactionskilledcon4} @{classactionskilledcon5} @{classactionskilledcon6} @{classactionskilledcon7} @{classactionskilledcon8} @{classactionskilledcon9} @{classactionskilledcon10} @{classactionskilledcon11} @{classactionskilledcon12} @{classactionskilledcon13} @{classactionskilledcon14} @{classactionskilledcon15} @{classactionskilledcon16} @{classactionskilledcon17} @{classactionskilledcon18} @{classactionskilledcon19} @{classactionskilledcon20} @{classactionskilledcon21} @{classactionskilledcon22} @{classactionskilledcon23} @{classactionskilledcon24} @{classactionskilledcon25} @{classactionskilledcon26} @{classactionskilledcon27} @{classactionskilledcon28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactionskilledint" value="@{classactionskilledint1} @{classactionskilledint2} @{classactionskilledint3} @{classactionskilledint4} @{classactionskilledint5} @{classactionskilledint6} @{classactionskilledint7} @{classactionskilledint8} @{classactionskilledint9} @{classactionskilledint10} @{classactionskilledint11} @{classactionskilledint12} @{classactionskilledint13} @{classactionskilledint14} @{classactionskilledint15} @{classactionskilledint16} @{classactionskilledint17} @{classactionskilledint18} @{classactionskilledint19} @{classactionskilledint20} @{classactionskilledint21} @{classactionskilledint22} @{classactionskilledint23} @{classactionskilledint24} @{classactionskilledint25} @{classactionskilledint26} @{classactionskilledint27} @{classactionskilledint28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactionskilledwis" value="@{classactionskilledwis1} @{classactionskilledwis2} @{classactionskilledwis3} @{classactionskilledwis4} @{classactionskilledwis5} @{classactionskilledwis6} @{classactionskilledwis7} @{classactionskilledwis8} @{classactionskilledwis9} @{classactionskilledwis10} @{classactionskilledwis11} @{classactionskilledwis12} @{classactionskilledwis13} @{classactionskilledwis14} @{classactionskilledwis15} @{classactionskilledwis16} @{classactionskilledwis17} @{classactionskilledwis18} @{classactionskilledwis19} @{classactionskilledwis20} @{classactionskilledwis21} @{classactionskilledwis22} @{classactionskilledwis23} @{classactionskilledwis24} @{classactionskilledwis25} @{classactionskilledwis26} @{classactionskilledwis27} @{classactionskilledwis28}  {{showclassactions=1}}" disabled="disabled">
-  	  	  <input type="hidden" name="attr_classactionskilledcha" value="@{classactionskilledcha1} @{classactionskilledcha2} @{classactionskilledcha3} @{classactionskilledcha4} @{classactionskilledcha5} @{classactionskilledcha6} @{classactionskilledcha7} @{classactionskilledcha8} @{classactionskilledcha9} @{classactionskilledcha10} @{classactionskilledcha11} @{classactionskilledcha12} @{classactionskilledcha13} @{classactionskilledcha14} @{classactionskilledcha15} @{classactionskilledcha16} @{classactionskilledcha17} @{classactionskilledcha18} @{classactionskilledcha19} @{classactionskilledcha20} @{classactionskilledcha21} @{classactionskilledcha22} @{classactionskilledcha23} @{classactionskilledcha24} @{classactionskilledcha25} @{classactionskilledcha26} @{classactionskilledcha27} @{classactionskilledcha28}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionstrengthsave" value="@{classactionstrengthsave1} @{classactionstrengthsave2} @{classactionstrengthsave3} @{classactionstrengthsave4} @{classactionstrengthsave5} @{classactionstrengthsave6} @{classactionstrengthsave7} @{classactionstrengthsave8} @{classactionstrengthsave9} @{classactionstrengthsave10} @{classactionstrengthsave11} @{classactionstrengthsave12} @{classactionstrengthsave13} @{classactionstrengthsave14} @{classactionstrengthsave15} @{classactionstrengthsave16} @{classactionstrengthsave17} @{classactionstrengthsave18} @{classactionstrengthsave19} @{classactionstrengthsave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactiondexteritysave" value="@{classactiondexteritysave1} @{classactiondexteritysave2} @{classactiondexteritysave3} @{classactiondexteritysave4} @{classactiondexteritysave5} @{classactiondexteritysave6} @{classactiondexteritysave7} @{classactiondexteritysave8} @{classactiondexteritysave9} @{classactiondexteritysave10} @{classactiondexteritysave11} @{classactiondexteritysave12} @{classactiondexteritysave13} @{classactiondexteritysave14} @{classactiondexteritysave15} @{classactiondexteritysave16} @{classactiondexteritysave17} @{classactiondexteritysave18} @{classactiondexteritysave19} @{classactiondexteritysave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionconstitutionsave" value="@{classactionconstitutionsave1} @{classactionconstitutionsave2} @{classactionconstitutionsave3} @{classactionconstitutionsave4} @{classactionconstitutionsave5} @{classactionconstitutionsave6} @{classactionconstitutionsave7} @{classactionconstitutionsave8} @{classactionconstitutionsave9} @{classactionconstitutionsave10} @{classactionconstitutionsave11} @{classactionconstitutionsave12} @{classactionconstitutionsave13} @{classactionconstitutionsave14} @{classactionconstitutionsave15} @{classactionconstitutionsave16} @{classactionconstitutionsave17} @{classactionconstitutionsave18} @{classactionconstitutionsave19} @{classactionconstitutionsave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionintelligencesave" value="@{classactionintelligencesave1} @{classactionintelligencesave2} @{classactionintelligencesave3} @{classactionintelligencesave4} @{classactionintelligencesave5} @{classactionintelligencesave6} @{classactionintelligencesave7} @{classactionintelligencesave8} @{classactionintelligencesave9} @{classactionintelligencesave10} @{classactionintelligencesave11} @{classactionintelligencesave12} @{classactionintelligencesave13} @{classactionintelligencesave14} @{classactionintelligencesave15} @{classactionintelligencesave16} @{classactionintelligencesave17} @{classactionintelligencesave18} @{classactionintelligencesave19} @{classactionintelligencesave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionwisdomsave" value="@{classactionwisdomsave1} @{classactionwisdomsave2} @{classactionwisdomsave3} @{classactionwisdomsave4} @{classactionwisdomsave5} @{classactionwisdomsave6} @{classactionwisdomsave7} @{classactionwisdomsave8} @{classactionwisdomsave9} @{classactionwisdomsave10} @{classactionwisdomsave11} @{classactionwisdomsave12} @{classactionwisdomsave13} @{classactionwisdomsave14} @{classactionwisdomsave15} @{classactionwisdomsave16} @{classactionwisdomsave17} @{classactionwisdomsave18} @{classactionwisdomsave19} @{classactionwisdomsave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioncharismasave" value="@{classactioncharismasave1} @{classactioncharismasave2} @{classactioncharismasave3} @{classactioncharismasave4} @{classactioncharismasave5} @{classactioncharismasave6} @{classactioncharismasave7} @{classactioncharismasave8} @{classactioncharismasave9} @{classactioncharismasave10} @{classactioncharismasave11} @{classactioncharismasave12} @{classactioncharismasave13} @{classactioncharismasave14} @{classactioncharismasave15} @{classactioncharismasave16} @{classactioncharismasave17} @{classactioncharismasave18} @{classactioncharismasave19} @{classactioncharismasave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactiondeathsave" value="@{classactiondeathsave1} @{classactiondeathsave2} @{classactiondeathsave3} @{classactiondeathsave4} @{classactiondeathsave5} @{classactiondeathsave6} @{classactiondeathsave7} @{classactiondeathsave8} @{classactiondeathsave9} @{classactiondeathsave10} @{classactiondeathsave11} @{classactiondeathsave12} @{classactiondeathsave13} @{classactiondeathsave14} @{classactiondeathsave15} @{classactiondeathsave16} @{classactiondeathsave17} @{classactiondeathsave18} @{classactiondeathsave19} @{classactiondeathsave20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioninitiative" value="@{classactioninitiative1} @{classactioninitiative2} @{classactioninitiative3} @{classactioninitiative4} @{classactioninitiative5} @{classactioninitiative6} @{classactioninitiative7} @{classactioninitiative8} @{classactioninitiative9} @{classactioninitiative10} @{classactioninitiative11} @{classactioninitiative12} @{classactioninitiative13} @{classactioninitiative14} @{classactioninitiative15} @{classactioninitiative16} @{classactioninitiative17} @{classactioninitiative18} @{classactioninitiative19} @{classactioninitiative20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionhitdice" value="@{classactionhitdice1} @{classactionhitdice2} @{classactionhitdice3} @{classactionhitdice4} @{classactionhitdice5} @{classactionhitdice6} @{classactionhitdice7} @{classactionhitdice8} @{classactionhitdice9} @{classactionhitdice10} @{classactionhitdice11} @{classactionhitdice12} @{classactionhitdice13} @{classactionhitdice14} @{classactionhitdice15} @{classactionhitdice16} @{classactionhitdice17} @{classactionhitdice18} @{classactionhitdice19} @{classactionhitdice20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionmeleeweapon" value="@{classactionmeleeweapon1} @{classactionmeleeweapon2} @{classactionmeleeweapon3} @{classactionmeleeweapon4} @{classactionmeleeweapon5} @{classactionmeleeweapon6} @{classactionmeleeweapon7} @{classactionmeleeweapon8} @{classactionmeleeweapon9} @{classactionmeleeweapon10} @{classactionmeleeweapon11} @{classactionmeleeweapon12} @{classactionmeleeweapon13} @{classactionmeleeweapon14} @{classactionmeleeweapon15} @{classactionmeleeweapon16} @{classactionmeleeweapon17} @{classactionmeleeweapon18} @{classactionmeleeweapon19} @{classactionmeleeweapon20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionrangedweapon" value="@{classactionrangedweapon1} @{classactionrangedweapon2} @{classactionrangedweapon3} @{classactionrangedweapon4} @{classactionrangedweapon5} @{classactionrangedweapon6} @{classactionrangedweapon7} @{classactionrangedweapon8} @{classactionrangedweapon9} @{classactionrangedweapon10} @{classactionrangedweapon11} @{classactionrangedweapon12} @{classactionrangedweapon13} @{classactionrangedweapon14} @{classactionrangedweapon15} @{classactionrangedweapon16} @{classactionrangedweapon17} @{classactionrangedweapon18} @{classactionrangedweapon19} @{classactionrangedweapon20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionspellinfo" value="@{classactionspellinfo1} @{classactionspellinfo2} @{classactionspellinfo3} @{classactionspellinfo4} @{classactionspellinfo5} @{classactionspellinfo6} @{classactionspellinfo7} @{classactionspellinfo8} @{classactionspellinfo9} @{classactionspellinfo10} @{classactionspellinfo11} @{classactionspellinfo12} @{classactionspellinfo13} @{classactionspellinfo14} @{classactionspellinfo15} @{classactionspellinfo16} @{classactionspellinfo17} @{classactionspellinfo18} @{classactionspellinfo19} @{classactionspellinfo20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionspellcast" value="@{classactionspellcast1} @{classactionspellcast2} @{classactionspellcast3} @{classactionspellcast4} @{classactionspellcast5} @{classactionspellcast6} @{classactionspellcast7} @{classactionspellcast8} @{classactionspellcast9} @{classactionspellcast10} @{classactionspellcast11} @{classactionspellcast12} @{classactionspellcast13} @{classactionspellcast14} @{classactionspellcast15} @{classactionspellcast16} @{classactionspellcast17} @{classactionspellcast18} @{classactionspellcast19} @{classactionspellcast20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionacrobatics" value="@{classactionacrobatics1} @{classactionacrobatics2} @{classactionacrobatics3} @{classactionacrobatics4} @{classactionacrobatics5} @{classactionacrobatics6} @{classactionacrobatics7} @{classactionacrobatics8} @{classactionacrobatics9} @{classactionacrobatics10} @{classactionacrobatics11} @{classactionacrobatics12} @{classactionacrobatics13} @{classactionacrobatics14} @{classactionacrobatics15} @{classactionacrobatics16} @{classactionacrobatics17} @{classactionacrobatics18} @{classactionacrobatics19} @{classactionacrobatics20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionanimalhandling" value="@{classactionanimalhandling1} @{classactionanimalhandling2} @{classactionanimalhandling3} @{classactionanimalhandling4} @{classactionanimalhandling5} @{classactionanimalhandling6} @{classactionanimalhandling7} @{classactionanimalhandling8} @{classactionanimalhandling9} @{classactionanimalhandling10} @{classactionanimalhandling11} @{classactionanimalhandling12} @{classactionanimalhandling13} @{classactionanimalhandling14} @{classactionanimalhandling15} @{classactionanimalhandling16} @{classactionanimalhandling17} @{classactionanimalhandling18} @{classactionanimalhandling19} @{classactionanimalhandling20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionarcana" value="@{classactionarcana1} @{classactionarcana2} @{classactionarcana3} @{classactionarcana4} @{classactionarcana5} @{classactionarcana6} @{classactionarcana7} @{classactionarcana8} @{classactionarcana9} @{classactionarcana10} @{classactionarcana11} @{classactionarcana12} @{classactionarcana13} @{classactionarcana14} @{classactionarcana15} @{classactionarcana16} @{classactionarcana17} @{classactionarcana18} @{classactionarcana19} @{classactionarcana20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionathletics" value="@{classactionathletics1} @{classactionathletics2} @{classactionathletics3} @{classactionathletics4} @{classactionathletics5} @{classactionathletics6} @{classactionathletics7} @{classactionathletics8} @{classactionathletics9} @{classactionathletics10} @{classactionathletics11} @{classactionathletics12} @{classactionathletics13} @{classactionathletics14} @{classactionathletics15} @{classactionathletics16} @{classactionathletics17} @{classactionathletics18} @{classactionathletics19} @{classactionathletics20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactiondeception" value="@{classactiondeception1} @{classactiondeception2} @{classactiondeception3} @{classactiondeception4} @{classactiondeception5} @{classactiondeception6} @{classactiondeception7} @{classactiondeception8} @{classactiondeception9} @{classactiondeception10} @{classactiondeception11} @{classactiondeception12} @{classactiondeception13} @{classactiondeception14} @{classactiondeception15} @{classactiondeception16} @{classactiondeception17} @{classactiondeception18} @{classactiondeception19} @{classactiondeception20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionhistory" value="@{classactionhistory1} @{classactionhistory2} @{classactionhistory3} @{classactionhistory4} @{classactionhistory5} @{classactionhistory6} @{classactionhistory7} @{classactionhistory8} @{classactionhistory9} @{classactionhistory10} @{classactionhistory11} @{classactionhistory12} @{classactionhistory13} @{classactionhistory14} @{classactionhistory15} @{classactionhistory16} @{classactionhistory17} @{classactionhistory18} @{classactionhistory19} @{classactionhistory20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioninsight" value="@{classactioninsight1} @{classactioninsight2} @{classactioninsight3} @{classactioninsight4} @{classactioninsight5} @{classactioninsight6} @{classactioninsight7} @{classactioninsight8} @{classactioninsight9} @{classactioninsight10} @{classactioninsight11} @{classactioninsight12} @{classactioninsight13} @{classactioninsight14} @{classactioninsight15} @{classactioninsight16} @{classactioninsight17} @{classactioninsight18} @{classactioninsight19} @{classactioninsight20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionintimidation" value="@{classactionintimidation1} @{classactionintimidation2} @{classactionintimidation3} @{classactionintimidation4} @{classactionintimidation5} @{classactionintimidation6} @{classactionintimidation7} @{classactionintimidation8} @{classactionintimidation9} @{classactionintimidation10} @{classactionintimidation11} @{classactionintimidation12} @{classactionintimidation13} @{classactionintimidation14} @{classactionintimidation15} @{classactionintimidation16} @{classactionintimidation17} @{classactionintimidation18} @{classactionintimidation19} @{classactionintimidation20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioninvestigation" value="@{classactioninvestigation1} @{classactioninvestigation2} @{classactioninvestigation3} @{classactioninvestigation4} @{classactioninvestigation5} @{classactioninvestigation6} @{classactioninvestigation7} @{classactioninvestigation8} @{classactioninvestigation9} @{classactioninvestigation10} @{classactioninvestigation11} @{classactioninvestigation12} @{classactioninvestigation13} @{classactioninvestigation14} @{classactioninvestigation15} @{classactioninvestigation16} @{classactioninvestigation17} @{classactioninvestigation18} @{classactioninvestigation19} @{classactioninvestigation20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionmedicine" value="@{classactionmedicine1} @{classactionmedicine2} @{classactionmedicine3} @{classactionmedicine4} @{classactionmedicine5} @{classactionmedicine6} @{classactionmedicine7} @{classactionmedicine8} @{classactionmedicine9} @{classactionmedicine10} @{classactionmedicine11} @{classactionmedicine12} @{classactionmedicine13} @{classactionmedicine14} @{classactionmedicine15} @{classactionmedicine16} @{classactionmedicine17} @{classactionmedicine18} @{classactionmedicine19} @{classactionmedicine20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionnature" value="@{classactionnature1} @{classactionnature2} @{classactionnature3} @{classactionnature4} @{classactionnature5} @{classactionnature6} @{classactionnature7} @{classactionnature8} @{classactionnature9} @{classactionnature10} @{classactionnature11} @{classactionnature12} @{classactionnature13} @{classactionnature14} @{classactionnature15} @{classactionnature16} @{classactionnature17} @{classactionnature18} @{classactionnature19} @{classactionnature20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionperception" value="@{classactionperception1} @{classactionperception2} @{classactionperception3} @{classactionperception4} @{classactionperception5} @{classactionperception6} @{classactionperception7} @{classactionperception8} @{classactionperception9} @{classactionperception10} @{classactionperception11} @{classactionperception12} @{classactionperception13} @{classactionperception14} @{classactionperception15} @{classactionperception16} @{classactionperception17} @{classactionperception18} @{classactionperception19} @{classactionperception20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionperformance" value="@{classactionperformance1} @{classactionperformance2} @{classactionperformance3} @{classactionperformance4} @{classactionperformance5} @{classactionperformance6} @{classactionperformance7} @{classactionperformance8} @{classactionperformance9} @{classactionperformance10} @{classactionperformance11} @{classactionperformance12} @{classactionperformance13} @{classactionperformance14} @{classactionperformance15} @{classactionperformance16} @{classactionperformance17} @{classactionperformance18} @{classactionperformance19} @{classactionperformance20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionpersuasion" value="@{classactionpersuasion1} @{classactionpersuasion2} @{classactionpersuasion3} @{classactionpersuasion4} @{classactionpersuasion5} @{classactionpersuasion6} @{classactionpersuasion7} @{classactionpersuasion8} @{classactionpersuasion9} @{classactionpersuasion10} @{classactionpersuasion11} @{classactionpersuasion12} @{classactionpersuasion13} @{classactionpersuasion14} @{classactionpersuasion15} @{classactionpersuasion16} @{classactionpersuasion17} @{classactionpersuasion18} @{classactionpersuasion19} @{classactionpersuasion20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionreligion" value="@{classactionreligion1} @{classactionreligion2} @{classactionreligion3} @{classactionreligion4} @{classactionreligion5} @{classactionreligion6} @{classactionreligion7} @{classactionreligion8} @{classactionreligion9} @{classactionreligion10} @{classactionreligion11} @{classactionreligion12} @{classactionreligion13} @{classactionreligion14} @{classactionreligion15} @{classactionreligion16} @{classactionreligion17} @{classactionreligion18} @{classactionreligion19} @{classactionreligion20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionsleightofhand" value="@{classactionsleightofhand1} @{classactionsleightofhand2} @{classactionsleightofhand3} @{classactionsleightofhand4} @{classactionsleightofhand5} @{classactionsleightofhand6} @{classactionsleightofhand7} @{classactionsleightofhand8} @{classactionsleightofhand9} @{classactionsleightofhand10} @{classactionsleightofhand11} @{classactionsleightofhand12} @{classactionsleightofhand13} @{classactionsleightofhand14} @{classactionsleightofhand15} @{classactionsleightofhand16} @{classactionsleightofhand17} @{classactionsleightofhand18} @{classactionsleightofhand19} @{classactionsleightofhand20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionstealth" value="@{classactionstealth1} @{classactionstealth2} @{classactionstealth3} @{classactionstealth4} @{classactionstealth5} @{classactionstealth6} @{classactionstealth7} @{classactionstealth8} @{classactionstealth9} @{classactionstealth10} @{classactionstealth11} @{classactionstealth12} @{classactionstealth13} @{classactionstealth14} @{classactionstealth15} @{classactionstealth16} @{classactionstealth17} @{classactionstealth18} @{classactionstealth19} @{classactionstealth20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionsurvival" value="@{classactionsurvival1} @{classactionsurvival2} @{classactionsurvival3} @{classactionsurvival4} @{classactionsurvival5} @{classactionsurvival6} @{classactionsurvival7} @{classactionsurvival8} @{classactionsurvival9} @{classactionsurvival10} @{classactionsurvival11} @{classactionsurvival12} @{classactionsurvival13} @{classactionsurvival14} @{classactionsurvival15} @{classactionsurvival16} @{classactionsurvival17} @{classactionsurvival18} @{classactionsurvival19} @{classactionsurvival20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioncustom1skill" value="@{classactioncustom1skill1} @{classactioncustom1skill2} @{classactioncustom1skill3} @{classactioncustom1skill4} @{classactioncustom1skill5} @{classactioncustom1skill6} @{classactioncustom1skill7} @{classactioncustom1skill8} @{classactioncustom1skill9} @{classactioncustom1skill10} @{classactioncustom1skill11} @{classactioncustom1skill12} @{classactioncustom1skill13} @{classactioncustom1skill14} @{classactioncustom1skill15} @{classactioncustom1skill16} @{classactioncustom1skill17} @{classactioncustom1skill18} @{classactioncustom1skill19} @{classactioncustom1skill20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioncustom2skill" value="@{classactioncustom2skill1} @{classactioncustom2skill2} @{classactioncustom2skill3} @{classactioncustom2skill4} @{classactioncustom2skill5} @{classactioncustom2skill6} @{classactioncustom2skill7} @{classactioncustom2skill8} @{classactioncustom2skill9} @{classactioncustom2skill10} @{classactioncustom2skill11} @{classactioncustom2skill12} @{classactioncustom2skill13} @{classactioncustom2skill14} @{classactioncustom2skill15} @{classactioncustom2skill16} @{classactioncustom2skill17} @{classactioncustom2skill18} @{classactioncustom2skill19} @{classactioncustom2skill20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioncustom3skill" value="@{classactioncustom3skill1} @{classactioncustom3skill2} @{classactioncustom3skill3} @{classactioncustom3skill4} @{classactioncustom3skill5} @{classactioncustom3skill6} @{classactioncustom3skill7} @{classactioncustom3skill8} @{classactioncustom3skill9} @{classactioncustom3skill10} @{classactioncustom3skill11} @{classactioncustom3skill12} @{classactioncustom3skill13} @{classactioncustom3skill14} @{classactioncustom3skill15} @{classactioncustom3skill16} @{classactioncustom3skill17} @{classactioncustom3skill18} @{classactioncustom3skill19} @{classactioncustom3skill20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactioncustom4skill" value="@{classactioncustom4skill1} @{classactioncustom4skill2} @{classactioncustom4skill3} @{classactioncustom4skill4} @{classactioncustom4skill5} @{classactioncustom4skill6} @{classactioncustom4skill7} @{classactioncustom4skill8} @{classactioncustom4skill9} @{classactioncustom4skill10} @{classactioncustom4skill11} @{classactioncustom4skill12} @{classactioncustom4skill13} @{classactioncustom4skill14} @{classactioncustom4skill15} @{classactioncustom4skill16} @{classactioncustom4skill17} @{classactioncustom4skill18} @{classactioncustom4skill19} @{classactioncustom4skill20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionunskilledstr" value="@{classactionunskilledstr1} @{classactionunskilledstr2} @{classactionunskilledstr3} @{classactionunskilledstr4} @{classactionunskilledstr5} @{classactionunskilledstr6} @{classactionunskilledstr7} @{classactionunskilledstr8} @{classactionunskilledstr9} @{classactionunskilledstr10} @{classactionunskilledstr11} @{classactionunskilledstr12} @{classactionunskilledstr13} @{classactionunskilledstr14} @{classactionunskilledstr15} @{classactionunskilledstr16} @{classactionunskilledstr17} @{classactionunskilledstr18} @{classactionunskilledstr19} @{classactionunskilledstr20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionunskilleddex" value="@{classactionunskilleddex1} @{classactionunskilleddex2} @{classactionunskilleddex3} @{classactionunskilleddex4} @{classactionunskilleddex5} @{classactionunskilleddex6} @{classactionunskilleddex7} @{classactionunskilleddex8} @{classactionunskilleddex9} @{classactionunskilleddex10} @{classactionunskilleddex11} @{classactionunskilleddex12} @{classactionunskilleddex13} @{classactionunskilleddex14} @{classactionunskilleddex15} @{classactionunskilleddex16} @{classactionunskilleddex17} @{classactionunskilleddex18} @{classactionunskilleddex19} @{classactionunskilleddex20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionunskilledcon" value="@{classactionunskilledcon1} @{classactionunskilledcon2} @{classactionunskilledcon3} @{classactionunskilledcon4} @{classactionunskilledcon5} @{classactionunskilledcon6} @{classactionunskilledcon7} @{classactionunskilledcon8} @{classactionunskilledcon9} @{classactionunskilledcon10} @{classactionunskilledcon11} @{classactionunskilledcon12} @{classactionunskilledcon13} @{classactionunskilledcon14} @{classactionunskilledcon15} @{classactionunskilledcon16} @{classactionunskilledcon17} @{classactionunskilledcon18} @{classactionunskilledcon19} @{classactionunskilledcon20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionunskilledint" value="@{classactionunskilledint1} @{classactionunskilledint2} @{classactionunskilledint3} @{classactionunskilledint4} @{classactionunskilledint5} @{classactionunskilledint6} @{classactionunskilledint7} @{classactionunskilledint8} @{classactionunskilledint9} @{classactionunskilledint10} @{classactionunskilledint11} @{classactionunskilledint12} @{classactionunskilledint13} @{classactionunskilledint14} @{classactionunskilledint15} @{classactionunskilledint16} @{classactionunskilledint17} @{classactionunskilledint18} @{classactionunskilledint19} @{classactionunskilledint20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionunskilledwis" value="@{classactionunskilledwis1} @{classactionunskilledwis2} @{classactionunskilledwis3} @{classactionunskilledwis4} @{classactionunskilledwis5} @{classactionunskilledwis6} @{classactionunskilledwis7} @{classactionunskilledwis8} @{classactionunskilledwis9} @{classactionunskilledwis10} @{classactionunskilledwis11} @{classactionunskilledwis12} @{classactionunskilledwis13} @{classactionunskilledwis14} @{classactionunskilledwis15} @{classactionunskilledwis16} @{classactionunskilledwis17} @{classactionunskilledwis18} @{classactionunskilledwis19} @{classactionunskilledwis20}  {{showclassactions=1}}" disabled="disabled">
+			<input type="hidden" name="attr_classactionunskilledcha" value="@{classactionunskilledcha1} @{classactionunskilledcha2} @{classactionunskilledcha3} @{classactionunskilledcha4} @{classactionunskilledcha5} @{classactionunskilledcha6} @{classactionunskilledcha7} @{classactionunskilledcha8} @{classactionunskilledcha9} @{classactionunskilledcha10} @{classactionunskilledcha11} @{classactionunskilledcha12} @{classactionunskilledcha13} @{classactionunskilledcha14} @{classactionunskilledcha15} @{classactionunskilledcha16} @{classactionunskilledcha17} @{classactionunskilledcha18} @{classactionunskilledcha19} @{classactionunskilledcha20}  {{showclassactions=1}}" disabled="disabled">
 			<!--  END Hidden attributes to power output to other rolls ->
-			
+
 			<!-- END auto generated class actions section -->
-		  
-		  <hr/>
+			<h4 class="sheet-center">(OLD) Class Actions/Macros <span class="sheet-pictos">l</span></h4>
+			<div class="sheet-row">
+				<div class="sheet-col-1">
+					<p class="sheet-important-text">This section of the sheet is deprecated and will be removed in a future update. You should move any data here to the newer section above.</p>
+					<p class="sheet-small-note">Use this section to quickly create useful class macros for often used features or abilities. For example, channel divinity options, bardic performance options, Ki point using abilities, etc... You can also use this section for any custom macro you want that the sheet doesnt currently include.</p>
+					<div class="sheet-row sheet-sub-header sheet-small-label sheet-center">
+						<div class="sheet-col-7-24 sheet-padl sheet-padr">Name</div>
+						<div class="sheet-col-15-24">Description</div>
+						<div class="sheet-col-1-12">Macro</div>
+					</div>
+					<fieldset class="repeating_classactions">
+						<div class="sheet-row">
+							<div class="sheet-col-7-24 sheet-padl sheet-padt sheet-padr sheet-small-label sheet-center">
+								<input type="text" class="sheet-underlined sheet-center" name="attr_classactionname">
+								<br/>Name
+								<br/>
+							</div>
+							<div class="sheet-col-15-24 sheet-margin-top">
+								<textarea class="sheet-medium-textarea" name="attr_classactiondescription"></textarea>
+							</div>
+							<div class="sheet-col-1-12 sheet-padt sheet-center">
+								<button type='roll' class="sheet-roll" name='roll_ClassAction' value="&{template:5eDefault} {{title=@{classactionname}}} {{subheader=@{character_name}}} {{subheaderright=Class ability}} {{freetextname=@{classactionname}}} {{freetext=@{classactiondescription}}}">Use</button>
+							</div>
+						</div>
+					</fieldset>
+				</div>
+			</div>
+			<hr/>
 		</div>
 		<div class="sheet-section-weapons">
 			<!-- Hidden calcs to work out correct mod for finesse weapons -->
+			<!-- OLD split calcs easier to read but come with performance issues.  Consolidated single calc below
+			<input type="hidden" name="attr_finesse_str_weight" value="(ceil((@{strength_mod}/1e10) - (@{dexterity_mod}/1e10)))" disabled="disabled">
+			<input type="hidden" name="attr_finesse_dex_weight" value="(ceil((@{dexterity_mod}/1e10) - (@{strength_mod}/1e10)))" disabled="disabled">
+			<input type="hidden" name="attr_finesse_tie_weight" value="(1 - @{finesse_str_weight} - @{finesse_dex_weight})" disabled="disabled">
+			<input type="hidden" name="attr_finesse_mod" value="((@{finesse_str_weight} * @{strength_mod}) + (@{finesse_dex_weight} * @{dexterity_mod}) + ((@{finesse_tie_weight}) * (@{strength_mod})))" disabled="disabled">-->
 			<input type="hidden" name="attr_finesse_mod" value="(((ceil((@{strength_mod}/1e10) - (@{dexterity_mod}/1e10))) * @{strength_mod}) + ((ceil((@{dexterity_mod}/1e10) - (@{strength_mod}/1e10))) * @{dexterity_mod}) + ((1 - (ceil((@{strength_mod}/1e10) - (@{dexterity_mod}/1e10))) - (ceil((@{dexterity_mod}/1e10) - (@{strength_mod}/1e10)))) * (@{strength_mod})))" disabled="disabled">
 			<!-- BEGIN AUTO GENERATED WEAPON SECTION -->
 			<h4 class="sheet-center">Melee Weapons <span class="sheet-pictos">D</span></h4>
@@ -13067,7 +10347,7 @@
 				<div class="sheet-col-1-18 sheet-center sheet-small-label sheet-vert-bottom">&nbsp;</div>
 			</div>
 			<!-- BEGIN melee weapon row -->
-		  <div class="sheet-row">
+			<div class="sheet-row">
 				<div class="sheet-col-1-24 sheet-checkbox-row">
 					<input type="checkbox" value="@{PB}" name="attr_pbmelee1" checked="checked">
 				</div>
@@ -13110,7 +10390,7 @@
 					<input type="number" name="attr_meleeweaponcritrange1" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack1" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange1} + [[@{meleetohit1}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg1} + [[@{meleedmgbonus1}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype1}}} {{weaponcritdamage=Additional [[@{meleecritdmg1}]] damage}} @{classactionmeleeweapon}} @{ro_melee1} @{classactionmeleeweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_MeleeAttack1" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange1} + [[@{meleetohit1}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg1} + [[@{meleedmgbonus1}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype1}}} {{weaponcritdamage=Additional [[@{meleecritdmg1}]] damage}} @{classactionmeleeweapon}} @{ro_melee1} @{classactionmeleeweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_melee1_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -13131,7 +10411,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack1_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange1} + [[@{meleetohit1}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg1} + [[@{meleedmgbonus1}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype1}}} {{weaponcritdamage=Additional [[@{meleecritdmg1}]] damage}} @{classactionmeleeweapon}} @{ro_melee1} @{classactionmeleeweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_MeleeAttack1_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange1} + [[@{meleetohit1}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg1} + [[@{meleedmgbonus1}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype1}}} {{weaponcritdamage=Additional [[@{meleecritdmg1}]] damage}} @{classactionmeleeweapon}} @{ro_melee1} @{classactionmeleeweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -13222,7 +10502,7 @@
 					<input type="number" name="attr_meleeweaponcritrange2" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack2" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange2} + [[@{meleetohit2}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg2} + [[@{meleedmgbonus2}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype2}}} {{weaponcritdamage=Additional [[@{meleecritdmg2}]] damage}} @{classactionmeleeweapon}} @{ro_melee2} @{classactionmeleeweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_MeleeAttack2" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange2} + [[@{meleetohit2}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg2} + [[@{meleedmgbonus2}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype2}}} {{weaponcritdamage=Additional [[@{meleecritdmg2}]] damage}} @{classactionmeleeweapon}} @{ro_melee2} @{classactionmeleeweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_melee2_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -13243,7 +10523,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack2_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange2} + [[@{meleetohit2}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg2} + [[@{meleedmgbonus2}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype2}}} {{weaponcritdamage=Additional [[@{meleecritdmg2}]] damage}} @{classactionmeleeweapon}} @{ro_melee2} @{classactionmeleeweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_MeleeAttack2_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange2} + [[@{meleetohit2}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg2} + [[@{meleedmgbonus2}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype2}}} {{weaponcritdamage=Additional [[@{meleecritdmg2}]] damage}} @{classactionmeleeweapon}} @{ro_melee2} @{classactionmeleeweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -13334,7 +10614,7 @@
 					<input type="number" name="attr_meleeweaponcritrange3" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack3" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange3} + [[@{meleetohit3}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg3} + [[@{meleedmgbonus3}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype3}}} {{weaponcritdamage=Additional [[@{meleecritdmg3}]] damage}} @{classactionmeleeweapon}} @{ro_melee3} @{classactionmeleeweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_MeleeAttack3" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange3} + [[@{meleetohit3}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg3} + [[@{meleedmgbonus3}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype3}}} {{weaponcritdamage=Additional [[@{meleecritdmg3}]] damage}} @{classactionmeleeweapon}} @{ro_melee3} @{classactionmeleeweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_melee3_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -13355,7 +10635,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack3_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange3} + [[@{meleetohit3}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg3} + [[@{meleedmgbonus3}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype3}}} {{weaponcritdamage=Additional [[@{meleecritdmg3}]] damage}} @{classactionmeleeweapon}} @{ro_melee3} @{classactionmeleeweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_MeleeAttack3_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange3} + [[@{meleetohit3}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg3} + [[@{meleedmgbonus3}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype3}}} {{weaponcritdamage=Additional [[@{meleecritdmg3}]] damage}} @{classactionmeleeweapon}} @{ro_melee3} @{classactionmeleeweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -13446,7 +10726,7 @@
 					<input type="number" name="attr_meleeweaponcritrange4" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack4" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange4} + [[@{meleetohit4}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg4} + [[@{meleedmgbonus4}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype4}}} {{weaponcritdamage=Additional [[@{meleecritdmg4}]] damage}} @{classactionmeleeweapon}} @{ro_melee4} @{classactionmeleeweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_MeleeAttack4" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange4} + [[@{meleetohit4}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg4} + [[@{meleedmgbonus4}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype4}}} {{weaponcritdamage=Additional [[@{meleecritdmg4}]] damage}} @{classactionmeleeweapon}} @{ro_melee4} @{classactionmeleeweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_melee4_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -13467,7 +10747,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack4_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange4} + [[@{meleetohit4}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg4} + [[@{meleedmgbonus4}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype4}}} {{weaponcritdamage=Additional [[@{meleecritdmg4}]] damage}} @{classactionmeleeweapon}} @{ro_melee4} @{classactionmeleeweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_MeleeAttack4_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange4} + [[@{meleetohit4}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg4} + [[@{meleedmgbonus4}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype4}}} {{weaponcritdamage=Additional [[@{meleecritdmg4}]] damage}} @{classactionmeleeweapon}} @{ro_melee4} @{classactionmeleeweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -13558,7 +10838,7 @@
 					<input type="number" name="attr_meleeweaponcritrange5" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack5" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange5} + [[@{meleetohit5}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg5} + [[@{meleedmgbonus5}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype5}}} {{weaponcritdamage=Additional [[@{meleecritdmg5}]] damage}} @{classactionmeleeweapon}} @{ro_melee5} @{classactionmeleeweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_MeleeAttack5" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange5} + [[@{meleetohit5}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg5} + [[@{meleedmgbonus5}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype5}}} {{weaponcritdamage=Additional [[@{meleecritdmg5}]] damage}} @{classactionmeleeweapon}} @{ro_melee5} @{classactionmeleeweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_melee5_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -13579,7 +10859,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack5_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange5} + [[@{meleetohit5}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg5} + [[@{meleedmgbonus5}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype5}}} {{weaponcritdamage=Additional [[@{meleecritdmg5}]] damage}} @{classactionmeleeweapon}} @{ro_melee5} @{classactionmeleeweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_MeleeAttack5_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange5} + [[@{meleetohit5}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg5} + [[@{meleedmgbonus5}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype5}}} {{weaponcritdamage=Additional [[@{meleecritdmg5}]] damage}} @{classactionmeleeweapon}} @{ro_melee5} @{classactionmeleeweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -13670,7 +10950,7 @@
 					<input type="number" name="attr_meleeweaponcritrange6" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack6" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange6} + [[@{meleetohit6}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg6} + [[@{meleedmgbonus6}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype6}}} {{weaponcritdamage=Additional [[@{meleecritdmg6}]] damage}} @{classactionmeleeweapon}} @{ro_melee6} @{classactionmeleeweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_MeleeAttack6" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange6} + [[@{meleetohit6}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg6} + [[@{meleedmgbonus6}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype6}}} {{weaponcritdamage=Additional [[@{meleecritdmg6}]] damage}} @{classactionmeleeweapon}} @{ro_melee6} @{classactionmeleeweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_melee6_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -13691,7 +10971,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack6_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange6} + [[@{meleetohit6}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg6} + [[@{meleedmgbonus6}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype6}}} {{weaponcritdamage=Additional [[@{meleecritdmg6}]] damage}} @{classactionmeleeweapon}} @{ro_melee6} @{classactionmeleeweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_MeleeAttack6_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{meleeweaponcritrange6} + [[@{meleetohit6}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg6} + [[@{meleedmgbonus6}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype6}}} {{weaponcritdamage=Additional [[@{meleecritdmg6}]] damage}} @{classactionmeleeweapon}} @{ro_melee6} @{classactionmeleeweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -13738,229 +11018,7 @@
 				</div>
 			</div>
 			<!-- END melee weapon row -->
-			<!-- BEGIN melee weapon row -->
-		  <div class="sheet-row">
-				<div class="sheet-col-1-24 sheet-checkbox-row">
-					<input type="checkbox" value="@{PB}" name="attr_pbmelee7" checked="checked">
-				</div>
-				<div class="sheet-col-1-6">
-					<input type="text" name="attr_meleeweaponname7">
-				</div>
-				<div class="sheet-col-1-12">
-					<select name="attr_meleeattackstat7">
-						<option value="@{strength_mod}" selected="selected">STR</option>
-						<option value="@{finesse_mod}">Finesse</option>
-						<option value="@{dexterity_mod}">DEX</option>
-						<option value="@{constitution_mod}">CON</option>
-						<option value="@{intelligence_mod}">INT</option>
-						<option value="@{wisdom_mod}">WIS</option>
-						<option value="@{charisma_mod}">CHA</option>
-					</select>
-				</div>
-				<div class="sheet-col-1-12 sheet-padr" title="The magic bonus will be added as a bonus to BOTH the attack and damage rolls">
-					<input type="number" name="attr_meleemagic7" value="0" step="1">
-				</div>
-				<div class="sheet-col-1-24 sheet-padr">
-					<input type="number" name="attr_meleetohit7" value="@{meleeattackstat7} + @{pbmelee7} + @{meleemagic7}" disabled="disabled">
-				</div>
-				<div class="sheet-col-1-12" title="Only enter the base damage roll here without any bonuses from stats or other sources">
-					<input class="sheet-center" type="text" name="attr_meleedmg7" value="0">
-				</div>
-				<div class="sheet-col-1-24 sheet-checkbox-row">
-					<input type="checkbox" value="1" name="attr_meleeattackstatdmg7" checked="checked">
-				</div>
-				<div class="sheet-col-1-18">
-					<input type="number" name="attr_meleedmgbonus7" value="(@{meleeattackstat7} * @{meleeattackstatdmg7}) + @{meleemagic7}" disabled="disabled">
-				</div>
-				<div class="sheet-col-1-8 sheet-padr">
-					<input type="text" name="attr_meleedmgtype7">
-				</div>
-				<div class="sheet-col-1-12">
-					<input class="sheet-center" type="text" value="0" name="attr_meleecritdmg7">
-				</div>
-				<div class="sheet-col-1-12 sheet-padr">
-					<input type="number" name="attr_meleeweaponcritrange7" value="20" step="1">
-				</div>
-				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_MeleeAttack7" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname7}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange7} + [[@{meleetohit7}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg7} + [[@{meleedmgbonus7}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype7}}} {{weaponcritdamage=Additional [[@{meleecritdmg7}]] damage}} @{classactionmeleeweapon}} @{ro_melee7} @{classactionmeleeweapon}">Attack</button>
-				</div>
-				<div class="sheet-col-1-18 sheet-align-center">
-					<input type="checkbox" name="attr_melee7_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
-					<!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-					<div class="sheet-ro-modal sheet-weapon-modal">
-						<div>
-							<!-- Modal Title and close button row -->
-							<div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-								<div class="sheet-col-3-4 sheet-ro-title">Melee weapon roll options</div>
-								<div class="sheet-col-1-4 sheet-ro-close-wrapper">
-									<input type="checkbox" name="attr_melee7_ro" class="sheet-ro-close-checkbox" value="1" />
-									<span class="sheet-ro-close-label"></span>
-								</div>
-							</div>
-							<!-- define hidden attribute to store summary of all options selected -->
-							<input type="hidden" name="attr_ro_melee7" value="@{ro_melee7_rolltype}@{ro_melee7_roll2_closing} @{ro_melee7_emoteprompt} @{ro_melee7_showmath}" />
-							<!--Help text and copy of roll button-->
-							<div class="sheet-row sheet-padb">
-								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_MeleeAttack7_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname7}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange7} + [[@{meleetohit7}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg7} + [[@{meleedmgbonus7}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype7}}} {{weaponcritdamage=Additional [[@{meleecritdmg7}]] damage}} @{classactionmeleeweapon}} @{ro_melee7} @{classactionmeleeweapon}">Roll</button>
-								</div>
-							</div>
-							<hr/>
-							<!-- Define options here -->
-							<div class="sheet-row sheet-checkbox-row">
-								<div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-								<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-									<input type="hidden" name="attr_ro_melee7_roll2_closing" value="cs>@{meleeweaponcritrange7} + [[@{meleetohit7}]] + [[@{global_melee_attack_bonus}]] ]] }}" />
-									<select name="attr_ro_melee7_rolltype">
-										<option value="@{ro_default_rolltype}">Use Default</option>
-										<option value="{{showadvroll=1}} {{roll2=[[ 1d20">Roll 2d20</option>
-										<option value="{{noadvroll=1}}">Roll 1d20</option>
-										<option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20|Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-										<option value="{{rollhasadv=1}} {{roll2=[[ 1d20">ALWAYS Advantage</option>
-										<option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20">ALWAYS Disadvantage</option>
-									</select>
-								</div>
-							</div>
-							<hr/>
-							<div class="sheet-row sheet-checkbox-row">
-								<div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-								<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-									<input type="checkbox" name="attr_ro_melee7_emoteprompt" value="{{emote=?{Emote text} }}">
-								</div>
-							</div>
-							<hr/>
-							<div class="sheet-row sheet-checkbox-row">
-								<div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-								<div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-									<input type="checkbox" name="attr_ro_melee7_showmath" value="{{math=Attack:
-						1d20
-						+ [[@{meleetohit7}]] [To Hit mod]
-						+ (@{global_melee_attack_bonus}) [Global melee attack bonus]
-						Damage:
-						@{meleedmg7} [Damage dice] +
-						[[@{meleedmgbonus7}]] [Damage bonus] +
-						((@{global_melee_damage_bonus})) [Global melee damage bonus] }}">
-								</div>
-							</div>
-						</div>
-						<!-- close inner modal div -->
-					</div>
-					<!-- close outer modal div -->
-				</div>
-			</div>
-		  <div class="sheet-row">
-			  <div class="sheet-col-1-24 sheet-checkbox-row">
-			    <input type="checkbox" value="@{PB}" name="attr_pbmelee8" checked="checked">
-		      </div>
-			  <div class="sheet-col-1-6">
-			    <input type="text" name="attr_meleeweaponname8">
-		      </div>
-			  <div class="sheet-col-1-12">
-			    <select name="attr_meleeattackstat8">
-			      <option value="@{strength_mod}" selected="selected">STR</option>
-			      <option value="@{finesse_mod}">Finesse</option>
-			      <option value="@{dexterity_mod}">DEX</option>
-			      <option value="@{constitution_mod}">CON</option>
-			      <option value="@{intelligence_mod}">INT</option>
-			      <option value="@{wisdom_mod}">WIS</option>
-			      <option value="@{charisma_mod}">CHA</option>
-		        </select>
-		      </div>
-			  <div class="sheet-col-1-12 sheet-padr" title="The magic bonus will be added as a bonus to BOTH the attack and damage rolls">
-			    <input type="number" name="attr_meleemagic8" value="0" step="1">
-		      </div>
-			  <div class="sheet-col-1-24 sheet-padr">
-			    <input type="number" name="attr_meleetohit8" value="@{meleeattackstat8} + @{pbmelee8} + @{meleemagic8}" disabled="disabled">
-		      </div>
-			  <div class="sheet-col-1-12" title="Only enter the base damage roll here without any bonuses from stats or other sources">
-			    <input class="sheet-center" type="text" name="attr_meleedmg8" value="0">
-		      </div>
-			  <div class="sheet-col-1-24 sheet-checkbox-row">
-			    <input type="checkbox" value="1" name="attr_meleeattackstatdmg8" checked="checked">
-		      </div>
-			  <div class="sheet-col-1-18">
-			    <input type="number" name="attr_meleedmgbonus8" value="(@{meleeattackstat8} * @{meleeattackstatdmg8}) + @{meleemagic8}" disabled="disabled">
-		      </div>
-			  <div class="sheet-col-1-8 sheet-padr">
-			    <input type="text" name="attr_meleedmgtype8">
-		      </div>
-			  <div class="sheet-col-1-12">
-			    <input class="sheet-center" type="text" value="0" name="attr_meleecritdmg8">
-		      </div>
-			  <div class="sheet-col-1-12 sheet-padr">
-			    <input type="number" name="attr_meleeweaponcritrange8" value="20" step="1">
-		      </div>
-			  <div class="sheet-col-1-18 sheet-center">
-			    <button type="roll" class="sheet-roll" name="roll_MeleeAttack8" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname8}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange8} + [[@{meleetohit8}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg8} + [[@{meleedmgbonus8}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype8}}} {{weaponcritdamage=Additional [[@{meleecritdmg8}]] damage}} @{classactionmeleeweapon}} @{ro_melee8} @{classactionmeleeweapon}">Attack</button>
-		      </div>
-			  <div class="sheet-col-1-18 sheet-align-center">
-			    <input type="checkbox" name="attr_melee8_ro2" class="sheet-ro-checkbox" value="1" />
-			    <span class="sheet-ro-label">y</span>
-			    <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-			    <div class="sheet-ro-modal sheet-weapon-modal">
-			      <div>
-			        <!-- Modal Title and close button row -->
-			        <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-			          <div class="sheet-col-3-4 sheet-ro-title">Melee weapon roll options</div>
-			          <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-			            <input type="checkbox" name="attr_melee8_ro2" class="sheet-ro-close-checkbox" value="1" />
-			            <span class="sheet-ro-close-label"></span> </div>
-		            </div>
-			        <!-- define hidden attribute to store summary of all options selected -->
-			        <input type="hidden" name="attr_ro_melee8" value="@{ro_melee8_rolltype}@{ro_melee8_roll2_closing} @{ro_melee8_emoteprompt} @{ro_melee8_showmath}" />
-			        <!--Help text and copy of roll button-->
-			        <div class="sheet-row sheet-padb">
-			          <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-			          <div class="sheet-col-1-3 sheet-padl">
-			            <button type="roll" class="sheet-roll" name="roll_MeleeAttack8_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{meleeweaponname8}}} {{subheader=@{character_name}}} {{subheaderright=Melee attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{meleeweaponcritrange8} + [[@{meleetohit8}]] + [[@{global_melee_attack_bonus}]] ]]}} {{weapondamage=[[@{meleedmg8} + [[@{meleedmgbonus8}]] + [[(@{global_melee_damage_bonus})]] ]] @{meleedmgtype8}}} {{weaponcritdamage=Additional [[@{meleecritdmg8}]] damage}} @{classactionmeleeweapon}} @{ro_melee8} @{classactionmeleeweapon}">Roll</button>
-		              </div>
-		            </div>
-			        <hr/>
-			        <!-- Define options here -->
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="hidden" name="attr_ro_melee8_roll2_closing2" value="cs>@{meleeweaponcritrange8} + [[@{meleetohit8}]] + [[@{global_melee_attack_bonus}]] ]] }}" />
-			            <select name="attr_ro_melee8_rolltype2">
-			              <option value="@{ro_default_rolltype}">Use Default</option>
-			              <option value="{{showadvroll=1}} {{roll2=[[ 1d20">Roll 2d20</option>
-			              <option value="{{noadvroll=1}}">Roll 1d20</option>
-			              <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20|Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-			              <option value="{{rollhasadv=1}} {{roll2=[[ 1d20">ALWAYS Advantage</option>
-			              <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20">ALWAYS Disadvantage</option>
-		                </select>
-		              </div>
-		            </div>
-			        <hr/>
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="checkbox" name="attr_ro_melee8_emoteprompt2" value="{{emote=?{Emote text} }}">
-		              </div>
-		            </div>
-			        <hr/>
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="checkbox" name="attr_ro_melee8_showmath2" value="{{math=Attack:
-						1d20
-						+ [[@{meleetohit8}]] [To Hit mod]
-						+ (@{global_melee_attack_bonus}) [Global melee attack bonus]
-						Damage:
-						@{meleedmg8} [Damage dice] +
-						[[@{meleedmgbonus8}]] [Damage bonus] +
-						((@{global_melee_damage_bonus})) [Global melee damage bonus] }}">
-		              </div>
-		            </div>
-		          </div>
-			      <!-- close inner modal div -->
-		        </div>
-			    <!-- close outer modal div -->
-		      </div>
-		  </div>
-			<!-- END melee weapon row -->
-		  <h4 class="sheet-center">Ranged Weapons <span class="sheet-pictos">e</span></h4>
+			<h4 class="sheet-center">Ranged Weapons <span class="sheet-pictos">e</span></h4>
 			<div class="sheet-row sheet-sub-header">
 				<div class="sheet-col-1-24 sheet-center sheet-small-label sheet-vert-bottom">Prof?</div>
 				<div class="sheet-col-1-18 sheet-center sheet-small-label sheet-vert-bottom">Ammo</div>
@@ -14023,7 +11081,7 @@
 					<input class="sheet-center" type="number" name="attr_rangedweaponcritrange1" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_RangedAttack1" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange1} + [[@{rangedtohit1}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg1} + [[@{rangeddmgbonus1}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype1}}} {{weaponcritdamage=Additional [[@{rangedcritdmg1}]] damage}} @{classactionrangedweapon}} @{ro_ranged1} @{classactionrangedweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_RangedAttack1" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange1} + [[@{rangedtohit1}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg1} + [[@{rangeddmgbonus1}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype1}}} {{weaponcritdamage=Additional [[@{rangedcritdmg1}]] damage}} @{classactionrangedweapon}} @{ro_ranged1} @{classactionrangedweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_ranged1_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -14044,7 +11102,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_rangedAttack1_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange1} + [[@{rangedtohit1}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg1} + [[@{rangeddmgbonus1}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype1}}} {{weaponcritdamage=Additional [[@{rangedcritdmg1}]] damage}} @{classactionrangedweapon}} @{ro_ranged1} @{classactionrangedweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_rangedAttack1_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname1}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange1} + [[@{rangedtohit1}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg1} + [[@{rangeddmgbonus1}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype1}}} {{weaponcritdamage=Additional [[@{rangedcritdmg1}]] damage}} @{classactionrangedweapon}} @{ro_ranged1} @{classactionrangedweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -14135,7 +11193,7 @@
 					<input class="sheet-center" type="number" name="attr_rangedweaponcritrange2" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_RangedAttack2" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange2} + [[@{rangedtohit2}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg2} + [[@{rangeddmgbonus2}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype2}}} {{weaponcritdamage=Additional [[@{rangedcritdmg2}]] damage}} @{classactionrangedweapon}} @{ro_ranged2} @{classactionrangedweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_RangedAttack2" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange2} + [[@{rangedtohit2}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg2} + [[@{rangeddmgbonus2}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype2}}} {{weaponcritdamage=Additional [[@{rangedcritdmg2}]] damage}} @{classactionrangedweapon}} @{ro_ranged2} @{classactionrangedweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_ranged2_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -14156,7 +11214,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_rangedAttack2_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange2} + [[@{rangedtohit2}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg2} + [[@{rangeddmgbonus2}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype2}}} {{weaponcritdamage=Additional [[@{rangedcritdmg2}]] damage}} @{classactionrangedweapon}} @{ro_ranged2} @{classactionrangedweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_rangedAttack2_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname2}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange2} + [[@{rangedtohit2}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg2} + [[@{rangeddmgbonus2}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype2}}} {{weaponcritdamage=Additional [[@{rangedcritdmg2}]] damage}} @{classactionrangedweapon}} @{ro_ranged2} @{classactionrangedweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -14247,7 +11305,7 @@
 					<input class="sheet-center" type="number" name="attr_rangedweaponcritrange3" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_RangedAttack3" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange3} + [[@{rangedtohit3}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg3} + [[@{rangeddmgbonus3}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype3}}} {{weaponcritdamage=Additional [[@{rangedcritdmg3}]] damage}} @{classactionrangedweapon}} @{ro_ranged3} @{classactionrangedweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_RangedAttack3" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange3} + [[@{rangedtohit3}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg3} + [[@{rangeddmgbonus3}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype3}}} {{weaponcritdamage=Additional [[@{rangedcritdmg3}]] damage}} @{classactionrangedweapon}} @{ro_ranged3} @{classactionrangedweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_ranged3_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -14268,7 +11326,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_rangedAttack3_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange3} + [[@{rangedtohit3}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg3} + [[@{rangeddmgbonus3}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype3}}} {{weaponcritdamage=Additional [[@{rangedcritdmg3}]] damage}} @{classactionrangedweapon}} @{ro_ranged3} @{classactionrangedweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_rangedAttack3_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname3}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange3} + [[@{rangedtohit3}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg3} + [[@{rangeddmgbonus3}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype3}}} {{weaponcritdamage=Additional [[@{rangedcritdmg3}]] damage}} @{classactionrangedweapon}} @{ro_ranged3} @{classactionrangedweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -14359,7 +11417,7 @@
 					<input class="sheet-center" type="number" name="attr_rangedweaponcritrange4" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_RangedAttack4" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange4} + [[@{rangedtohit4}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg4} + [[@{rangeddmgbonus4}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype4}}} {{weaponcritdamage=Additional [[@{rangedcritdmg4}]] damage}} @{classactionrangedweapon}} @{ro_ranged4} @{classactionrangedweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_RangedAttack4" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange4} + [[@{rangedtohit4}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg4} + [[@{rangeddmgbonus4}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype4}}} {{weaponcritdamage=Additional [[@{rangedcritdmg4}]] damage}} @{classactionrangedweapon}} @{ro_ranged4} @{classactionrangedweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_ranged4_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -14380,7 +11438,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_rangedAttack4_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange4} + [[@{rangedtohit4}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg4} + [[@{rangeddmgbonus4}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype4}}} {{weaponcritdamage=Additional [[@{rangedcritdmg4}]] damage}} @{classactionrangedweapon}} @{ro_ranged4} @{classactionrangedweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_rangedAttack4_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname4}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange4} + [[@{rangedtohit4}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg4} + [[@{rangeddmgbonus4}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype4}}} {{weaponcritdamage=Additional [[@{rangedcritdmg4}]] damage}} @{classactionrangedweapon}} @{ro_ranged4} @{classactionrangedweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -14471,7 +11529,7 @@
 					<input class="sheet-center" type="number" name="attr_rangedweaponcritrange5" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_RangedAttack5" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange5} + [[@{rangedtohit5}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg5} + [[@{rangeddmgbonus5}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype5}}} {{weaponcritdamage=Additional [[@{rangedcritdmg5}]] damage}} @{classactionrangedweapon}} @{ro_ranged5} @{classactionrangedweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_RangedAttack5" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange5} + [[@{rangedtohit5}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg5} + [[@{rangeddmgbonus5}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype5}}} {{weaponcritdamage=Additional [[@{rangedcritdmg5}]] damage}} @{classactionrangedweapon}} @{ro_ranged5} @{classactionrangedweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_ranged5_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -14492,7 +11550,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_rangedAttack5_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange5} + [[@{rangedtohit5}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg5} + [[@{rangeddmgbonus5}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype5}}} {{weaponcritdamage=Additional [[@{rangedcritdmg5}]] damage}} @{classactionrangedweapon}} @{ro_ranged5} @{classactionrangedweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_rangedAttack5_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname5}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange5} + [[@{rangedtohit5}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg5} + [[@{rangeddmgbonus5}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype5}}} {{weaponcritdamage=Additional [[@{rangedcritdmg5}]] damage}} @{classactionrangedweapon}} @{ro_ranged5} @{classactionrangedweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -14583,7 +11641,7 @@
 					<input class="sheet-center" type="number" name="attr_rangedweaponcritrange6" value="20" step="1">
 				</div>
 				<div class="sheet-col-1-18 sheet-center">
-					<button type="roll" class="sheet-roll" name="roll_RangedAttack6" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange6} + [[@{rangedtohit6}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg6} + [[@{rangeddmgbonus6}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype6}}} {{weaponcritdamage=Additional [[@{rangedcritdmg6}]] damage}} @{classactionrangedweapon}} @{ro_ranged6} @{classactionrangedweapon}">Attack</button>
+					<button type="roll" class="sheet-roll" name="roll_RangedAttack6" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange6} + [[@{rangedtohit6}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg6} + [[@{rangeddmgbonus6}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype6}}} {{weaponcritdamage=Additional [[@{rangedcritdmg6}]] damage}} @{classactionrangedweapon}} @{ro_ranged6} @{classactionrangedweapon}">Attack</button>
 				</div>
 				<div class="sheet-col-1-18 sheet-align-center">
 					<input type="checkbox" name="attr_ranged6_ro" class="sheet-ro-checkbox" value="1" /><span class="sheet-ro-label">y</span>
@@ -14604,7 +11662,7 @@
 							<div class="sheet-row sheet-padb">
 								<div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
 								<div class="sheet-col-1-3 sheet-padl">
-									<button type="roll" class="sheet-roll" name="roll_rangedAttack6_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange6} + [[@{rangedtohit6}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg6} + [[@{rangeddmgbonus6}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype6}}} {{weaponcritdamage=Additional [[@{rangedcritdmg6}]] damage}} @{classactionrangedweapon}} @{ro_ranged6} @{classactionrangedweapon}">Roll</button>
+									<button type="roll" class="sheet-roll" name="roll_rangedAttack6_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname6}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d20cs>@{rangedweaponcritrange6} + [[@{rangedtohit6}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg6} + [[@{rangeddmgbonus6}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype6}}} {{weaponcritdamage=Additional [[@{rangedcritdmg6}]] damage}} @{classactionrangedweapon}} @{ro_ranged6} @{classactionrangedweapon}">Roll</button>
 								</div>
 							</div>
 							<hr/>
@@ -14650,226 +11708,6 @@
 					<!-- close outer modal div -->
 				</div>
 			</div>
-		  <div class="sheet-row">
-			  <div class="sheet-col-1-24 sheet-checkbox-row">
-			    <input type="checkbox" value="@{PB}" name="attr_pbranged7" checked="checked">
-		      </div>
-			  <div class="sheet-col-1-18">
-			    <input type="number" name="attr_rangedammo7" value="1">
-		      </div>
-			  <div class="sheet-col-1-6">
-			    <input type="text" name="attr_rangedweaponname7">
-		      </div>
-			  <div class="sheet-col-1-12" title="Choose either normal or thrown">
-			    <select name="attr_rangedtype7">
-			      <option value="@{dexterity_mod}" selected="selected">DEX</option>
-			      <option value="@{strength_mod}">STR</option>
-			      <option value="@{finesse_mod}">Finesse</option>
-			      <option value="@{constitution_mod}">CON</option>
-			      <option value="@{intelligence_mod}">INT</option>
-			      <option value="@{wisdom_mod}">WIS</option>
-			      <option value="@{charisma_mod}">CHA</option>
-		        </select>
-		      </div>
-			  <div class="sheet-col-1-12 sheet-padr" title="The magic bonus will be added as a bonus to BOTH the attack and damage rolls">
-			    <input type="number" name="attr_rangedmagic7" value="0" step="1">
-		      </div>
-			  <div class="sheet-col-1-24 sheet-padr">
-			    <input type="number" name="attr_rangedtohit7" value="@{rangedtype7} + @{pbranged7} + @{rangedmagic7}" disabled="disabled">
-		      </div>
-			  <div class="sheet-col-1-12" title="Only enter the base damage roll here without any bonuses from stats or other sources">
-			    <input class="sheet-center" type="text" name="attr_rangeddmg7" value="0">
-		      </div>
-			  <div class="sheet-col-1-24">
-			    <input type="number" name="attr_rangeddmgbonus7" value="@{rangedtype7} + @{rangedmagic7}" disabled="disabled">
-		      </div>
-			  <div class="sheet-col-1-8 sheet-padr">
-			    <input type="text" name="attr_rangeddmgtype7">
-		      </div>
-			  <div class="sheet-col-1-12">
-			    <input class="sheet-center" type="text" value="0" name="attr_rangedcritdmg7">
-		      </div>
-			  <div class="sheet-col-1-12 sheet-padr">
-			    <input class="sheet-center" type="number" name="attr_rangedweaponcritrange7" value="20" step="1">
-		      </div>
-			  <div class="sheet-col-1-18 sheet-center">
-			    <button type="roll" class="sheet-roll" name="roll_RangedAttack7" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname7}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange7} + [[@{rangedtohit7}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg7} + [[@{rangeddmgbonus7}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype7}}} {{weaponcritdamage=Additional [[@{rangedcritdmg7}]] damage}} @{classactionrangedweapon}} @{ro_ranged7} @{classactionrangedweapon}">Attack</button>
-		      </div>
-			  <div class="sheet-col-1-18 sheet-align-center">
-			    <input type="checkbox" name="attr_ranged7_ro2" class="sheet-ro-checkbox" value="1" />
-			    <span class="sheet-ro-label">y</span>
-			    <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-			    <div class="sheet-ro-modal sheet-weapon-modal">
-			      <div>
-			        <!-- Modal Title and close button row -->
-			        <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-			          <div class="sheet-col-3-4 sheet-ro-title">Ranged weapon roll options</div>
-			          <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-			            <input type="checkbox" name="attr_ranged7_ro2" class="sheet-ro-close-checkbox" value="1" />
-			            <span class="sheet-ro-close-label"></span> </div>
-		            </div>
-			        <!-- define hidden attribute to store summary of all options selected -->
-			        <input type="hidden" name="attr_ro_ranged7" value="@{ro_ranged7_rolltype}@{ro_ranged7_roll2_closing} @{ro_ranged7_emoteprompt} @{ro_ranged7_showmath}" />
-			        <!--Help text and copy of roll button-->
-			        <div class="sheet-row sheet-padb">
-			          <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-			          <div class="sheet-col-1-3 sheet-padl">
-			            <button type="roll" class="sheet-roll" name="roll_rangedAttack7_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname7}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange7} + [[@{rangedtohit7}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg7} + [[@{rangeddmgbonus7}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype7}}} {{weaponcritdamage=Additional [[@{rangedcritdmg7}]] damage}} @{classactionrangedweapon}} @{ro_ranged7} @{classactionrangedweapon}">Roll</button>
-		              </div>
-		            </div>
-			        <hr/>
-			        <!-- Define options here -->
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="hidden" name="attr_ro_ranged7_roll2_closing2" value="cs>@{rangedweaponcritrange7} + [[@{rangedtohit7}]] + [[@{global_ranged_attack_bonus}]] ]] }}" />
-			            <select name="attr_ro_ranged7_rolltype2">
-			              <option value="@{ro_default_rolltype}">Use Default</option>
-			              <option value="{{showadvroll=1}} {{roll2=[[ 1d20">Roll 2d20</option>
-			              <option value="{{noadvroll=1}}">Roll 1d20</option>
-			              <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20|Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-			              <option value="{{rollhasadv=1}} {{roll2=[[ 1d20">ALWAYS Advantage</option>
-			              <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20">ALWAYS Disadvantage</option>
-		                </select>
-		              </div>
-		            </div>
-			        <hr/>
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="checkbox" name="attr_ro_ranged7_emoteprompt2" value="{{emote=?{Emote text} }}">
-		              </div>
-		            </div>
-			        <hr/>
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="checkbox" name="attr_ro_ranged7_showmath2" value="{{math=Attack:
-						1d20
-						+ [[@{rangedtohit7}]] [To Hit mod]
-						+ (@{global_ranged_attack_bonus}) [Global ranged attack bonus]
-						Damage:
-						@{rangeddmg7} [Damage dice] +
-						[[@{rangeddmgbonus7}]] [Damage bonus] +
-						((@{global_ranged_damage_bonus})) [Global ranged damage bonus] }}">
-		              </div>
-		            </div>
-		          </div>
-			      <!-- close inner modal div -->
-		        </div>
-			    <!-- close outer modal div -->
-		      </div>
-		  </div>
-		  <div class="sheet-row">
-			  <div class="sheet-col-1-24 sheet-checkbox-row">
-			    <input type="checkbox" value="@{PB}" name="attr_pbranged7" checked="checked">
-		      </div>
-			  <div class="sheet-col-1-18">
-			    <input type="number" name="attr_rangedammo7" value="1">
-		      </div>
-			  <div class="sheet-col-1-6">
-			    <input type="text" name="attr_rangedweaponname7">
-		      </div>
-			  <div class="sheet-col-1-12" title="Choose either normal or thrown">
-			    <select name="attr_rangedtype7">
-			      <option value="@{dexterity_mod}" selected="selected">DEX</option>
-			      <option value="@{strength_mod}">STR</option>
-			      <option value="@{finesse_mod}">Finesse</option>
-			      <option value="@{constitution_mod}">CON</option>
-			      <option value="@{intelligence_mod}">INT</option>
-			      <option value="@{wisdom_mod}">WIS</option>
-			      <option value="@{charisma_mod}">CHA</option>
-		        </select>
-		      </div>
-			  <div class="sheet-col-1-12 sheet-padr" title="The magic bonus will be added as a bonus to BOTH the attack and damage rolls">
-			    <input type="number" name="attr_rangedmagic7" value="0" step="1">
-		      </div>
-			  <div class="sheet-col-1-24 sheet-padr">
-			    <input type="number" name="attr_rangedtohit7" value="@{rangedtype8} + @{pbranged8} + @{rangedmagic8}" disabled="disabled">
-		      </div>
-			  <div class="sheet-col-1-12" title="Only enter the base damage roll here without any bonuses from stats or other sources">
-			    <input class="sheet-center" type="text" name="attr_rangeddmg7" value="0">
-		      </div>
-			  <div class="sheet-col-1-24">
-			    <input type="number" name="attr_rangeddmgbonus7" value="@{rangedtype8} + @{rangedmagic8}" disabled="disabled">
-		      </div>
-			  <div class="sheet-col-1-8 sheet-padr">
-			    <input type="text" name="attr_rangeddmgtype7">
-		      </div>
-			  <div class="sheet-col-1-12">
-			    <input class="sheet-center" type="text" value="0" name="attr_rangedcritdmg7">
-		      </div>
-			  <div class="sheet-col-1-12 sheet-padr">
-			    <input class="sheet-center" type="number" name="attr_rangedweaponcritrange7" value="20" step="1">
-		      </div>
-			  <div class="sheet-col-1-18 sheet-center">
-			    <button type="roll" class="sheet-roll" name="roll_RangedAttack8" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname8}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange8} + [[@{rangedtohit8}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg8} + [[@{rangeddmgbonus8}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype8}}} {{weaponcritdamage=Additional [[@{rangedcritdmg8}]] damage}} @{classactionrangedweapon}} @{ro_ranged8} @{classactionrangedweapon}">Attack</button>
-		      </div>
-			  <div class="sheet-col-1-18 sheet-align-center">
-			    <input type="checkbox" name="attr_ranged8_ro2" class="sheet-ro-checkbox" value="1" />
-			    <span class="sheet-ro-label">y</span>
-			    <!-- Modal template Should be placed as the first element immediately after the input checkbox to open it -->
-			    <div class="sheet-ro-modal sheet-weapon-modal">
-			      <div>
-			        <!-- Modal Title and close button row -->
-			        <div class="sheet-row sheet-ro-header sheet-border-bottom sheet-padb">
-			          <div class="sheet-col-3-4 sheet-ro-title">Ranged weapon roll options</div>
-			          <div class="sheet-col-1-4 sheet-ro-close-wrapper">
-			            <input type="checkbox" name="attr_ranged8_ro2" class="sheet-ro-close-checkbox" value="1" />
-			            <span class="sheet-ro-close-label"></span> </div>
-		            </div>
-			        <!-- define hidden attribute to store summary of all options selected -->
-			        <input type="hidden" name="attr_ro_ranged7" value="@{ro_ranged8_rolltype}@{ro_ranged8_roll2_closing} @{ro_ranged8_emoteprompt} @{ro_ranged8_showmath}" />
-			        <!--Help text and copy of roll button-->
-			        <div class="sheet-row sheet-padb">
-			          <div class="sheet-col-2-3 sheet-small-note">The settings here apply <b>only</b> to the roll specified in the title above. </div>
-			          <div class="sheet-col-1-3 sheet-padl">
-			            <button type="roll" class="sheet-roll" name="roll_rangedAttack8_ro" value="&{template:5eDefault} {{character_name=@{character_name}}} {{title=@{rangedweaponname8}}} {{subheader=@{character_name}}} {{subheaderright=Ranged attack}}  {{weapon=1}} {{simple=1}} {{rollname=Attack}} {{roll1=[[ 1d2@{global_halfling}cs>@{rangedweaponcritrange8} + [[@{rangedtohit8}]] + [[@{global_ranged_attack_bonus}]] ]]}} {{weapondamage=[[@{rangeddmg8} + [[@{rangeddmgbonus8}]] + [[(@{global_ranged_damage_bonus})]] ]] @{rangeddmgtype8}}} {{weaponcritdamage=Additional [[@{rangedcritdmg8}]] damage}} @{classactionrangedweapon}} @{ro_ranged8} @{classactionrangedweapon}">Roll</button>
-		              </div>
-		            </div>
-			        <hr/>
-			        <!-- Define options here -->
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Roll type</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="hidden" name="attr_ro_ranged8_roll2_closing2" value="cs>@{rangedweaponcritrange8} + [[@{rangedtohit8}]] + [[@{global_ranged_attack_bonus}]] ]] }}" />
-			            <select name="attr_ro_ranged8_rolltype2">
-			              <option value="@{ro_default_rolltype}">Use Default</option>
-			              <option value="{{showadvroll=1}} {{roll2=[[ 1d20">Roll 2d20</option>
-			              <option value="{{noadvroll=1}}">Roll 1d20</option>
-			              <option value="?{Roll type?|Normal,&#123&#123noadvroll=1&#125&#125 |Advantage,&#123&#123rollhasadv=1&#125&#125 &#123&#123roll2=[[1d20|Disadvantage,&#123&#123rollhasdisadv=1&#125&#125 &#123&#123roll2=[[1d20}">Prompt for adv/disadv</option>
-			              <option value="{{rollhasadv=1}} {{roll2=[[ 1d20">ALWAYS Advantage</option>
-			              <option value="{{rollhasdisadv=1}} {{roll2=[[ 1d20">ALWAYS Disadvantage</option>
-		                </select>
-		              </div>
-		            </div>
-			        <hr/>
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Prompt for emote?</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="checkbox" name="attr_ro_ranged8_emoteprompt2" value="{{emote=?{Emote text} }}">
-		              </div>
-		            </div>
-			        <hr/>
-			        <div class="sheet-row sheet-checkbox-row">
-			          <div class="sheet-col-1-3 sheet-ro-optionlabel">Show math?</div>
-			          <div class="sheet-col-2-3 sheet-padl sheet-ro-option">
-			            <input type="checkbox" name="attr_ro_ranged8_showmath2" value="{{math=Attack:
-						1d20
-						+ [[@{rangedtohit8}]] [To Hit mod]
-						+ (@{global_ranged_attack_bonus}) [Global ranged attack bonus]
-						Damage:
-						@{rangeddmg8} [Damage dice] +
-						[[@{rangeddmgbonus8}]] [Damage bonus] +
-						((@{global_ranged_damage_bonus})) [Global ranged damage bonus] }}">
-		              </div>
-		            </div>
-		          </div>
-			      <!-- close inner modal div -->
-		        </div>
-			    <!-- close outer modal div -->
-		      </div>
-		  </div>
 			<!-- END ranged weapon row -->
 			<hr/>
 			<!-- END AUTO GENERATED WEAPON SECTION -->
@@ -14878,7 +11716,6 @@
 			<!-- Start hidden spell casting stats -->
 			<input type="hidden" name="attr_base_spell_dc" value="(8 + (@{global_spell_dc_bonus}))" />
 			<input type="hidden" name="attr_arcane_trickster_spell_bonus" value="(@{intelligence_mod}+@{PB})" />
-			<input type="hidden" name="attr_artificer_spell_bonus" value="(@{intelligence_mod}+@{PB})" />
 			<input type="hidden" name="attr_bard_spell_bonus" value="(@{charisma_mod}+@{PB})" />
 			<input type="hidden" name="attr_cleric_spell_bonus" value="(@{wisdom_mod}+@{PB})" />
 			<input type="hidden" name="attr_druid_spell_bonus" value="(@{wisdom_mod}+@{PB})" />
@@ -14897,166 +11734,186 @@
 				<div class="sheet-col-4-5">
 					<p class="sheet-small-note">The dashboard fields are auto calculated from the individual class levels/options (set in the Class section of the sheet) and your core stats.</p>
 					<div class="sheet-row sheet-sub-header">
-						<div class="sheet-col-1-7 sheet-vert-bottom sheet-center sheet-small-label">&nbsp;</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Arcane Trickster</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Artficer</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Bard</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Cleric</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Druid</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Eldritch Knight</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Paladin</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Ranger</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Sorcerer</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Warlock</div>
-						<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">Wizard</div>
+						<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">&nbsp;</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Arcane Trickster</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Bard</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Cleric</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Druid</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Eldritch Knight</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Paladin</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Ranger</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Sorcerer</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Warlock</div>
+						<div class="sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Wizard</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-1-7 sheet-margin-top sheet-center">Cantrips Known</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-6 sheet-margin-top sheet-center">Cantrips Known</div>
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_arcane_trickster" value="( (ceil((@{rogue_level}-2)/1e10)*3) + (ceil((@{rogue_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
-							<input type="number" name="attr_cantrips_known_artficer" value="( (ceil((@{artificer_level})/1e10)*2) + (ceil((@{artificer_level}-9)/1e10)) + (ceil((@{artificer_level}-13)/1e10)) )" disabled="disabled" />
-						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_bard" value="( (ceil(@{bard_level}/1e10)*2) + (ceil((@{bard_level}-3)/1e10)) + (ceil((@{bard_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_cleric" value="( (ceil(@{cleric_level}/1e10)*3) + (ceil((@{cleric_level}-3)/1e10)) + (ceil((@{cleric_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_druid" value="( (ceil(@{druid_level}/1e10)*2) + (ceil((@{druid_level}-3)/1e10)) + (ceil((@{druid_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_eldritch_knight" value="( (ceil((@{fighter_level}-2)/1e10)*2) + (ceil((@{fighter_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_paladin" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_ranger" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_sorcerer" value="( (ceil(@{sorcerer_level}/1e10)*4) + (ceil((@{sorcerer_level}-3)/1e10)) + (ceil((@{sorcerer_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_warlock" value="( (ceil(@{warlock_level}/1e10)*2) + (ceil((@{warlock_level}-3)/1e10)) + (ceil((@{warlock_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cantrips_known_wizard" value="( (ceil(@{wizard_level}/1e10)*3) + (ceil((@{wizard_level}-3)/1e10)) + (ceil((@{wizard_level}-9)/1e10)) )" disabled="disabled" />
 						</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-1-7 sheet-margin-top sheet-center">Spells Known</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-6 sheet-margin-top sheet-center">Spells Known</div>
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_arcane_trickster" value="( (ceil(@{rogue_level}/1e10)*3) +  (ceil((@{rogue_level}-3)/1e10)) + (ceil((@{rogue_level}-6)/1e10)) + (ceil((@{rogue_level}-7)/1e10)) + (ceil((@{rogue_level}-9)/1e10)) + (ceil((@{rogue_level}-10)/1e10)) + (ceil((@{rogue_level}-12)/1e10)) + (ceil((@{rogue_level}-13)/1e10)) + (ceil((@{rogue_level}-15)/1e10)) + (ceil((@{rogue_level}-18)/1e10)) + (ceil((@{rogue_level}-19)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
-							<input type="number" name="attr_spells_known_artificer" value="0" disabled="disabled" />
-						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_bard" value="( (ceil(@{bard_level}/1e10)*4) + (ceil((@{bard_level}-1)/1e10)) + (ceil((@{bard_level}-2)/1e10)) + (ceil((@{bard_level}-3)/1e10)) + (ceil((@{bard_level}-4)/1e10)) + (ceil((@{bard_level}-5)/1e10)) + (ceil((@{bard_level}-6)/1e10)) + (ceil((@{bard_level}-7)/1e10)) + (ceil((@{bard_level}-8)/1e10)) + (ceil((@{bard_level}-9)/1e10)*2) + (ceil((@{bard_level}-10)/1e10)) + (ceil((@{bard_level}-12)/1e10)) + (ceil((@{bard_level}-13)/1e10)*2) + (ceil((@{bard_level}-14)/1e10)) + (ceil((@{bard_level}-16)/1e10)) + (ceil((@{bard_level}-17)/1e10)*2) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_cleric" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_druid" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_eldritch_knight" value="( (ceil((@{fighter_level}-2)/1e10)*3) + (ceil((@{fighter_level}-3)/1e10)) + (ceil((@{fighter_level}-6)/1e10)) + (ceil((@{fighter_level}-7)/1e10)) + (ceil((@{fighter_level}-9)/1e10)) + (ceil((@{fighter_level}-10)/1e10)) + (ceil((@{fighter_level}-12)/1e10)) + (ceil((@{fighter_level}-13)/1e10)) + (ceil((@{fighter_level}-15)/1e10)) + (ceil((@{fighter_level}-18)/1e10)) + (ceil((@{fighter_level}-19)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_paladin" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_ranger" value="( (1+ceil(@{ranger_level}/2)) * (ceil((@{ranger_level}-1)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_sorcerer" value="( (ceil(@{sorcerer_level}/1e10)*2) + (ceil((@{sorcerer_level}-1)/1e10)) + (ceil((@{sorcerer_level}-2)/1e10)) + (ceil((@{sorcerer_level}-3)/1e10)) + (ceil((@{sorcerer_level}-4)/1e10)) + (ceil((@{sorcerer_level}-5)/1e10)) + (ceil((@{sorcerer_level}-6)/1e10)) + (ceil((@{sorcerer_level}-7)/1e10)) + (ceil((@{sorcerer_level}-8)/1e10)) + (ceil((@{sorcerer_level}-9)/1e10)) + (ceil((@{sorcerer_level}-10)/1e10)) + (ceil((@{sorcerer_level}-12)/1e10)) + (ceil((@{sorcerer_level}-14)/1e10)) + (ceil((@{sorcerer_level}-16)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_warlock" value="( (ceil(@{warlock_level}/1e10) + @{warlock_level}) - (ceil((@{warlock_level}-9)/1e10)) - (ceil((@{warlock_level}-11)/1e10)) - (ceil((@{warlock_level}-13)/1e10)) - (ceil((@{warlock_level}-15)/1e10)) - (ceil((@{warlock_level}-17)/1e10)) - (ceil((@{warlock_level}-19)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_known_wizard" value="0" disabled="disabled" />
 						</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-1-7 sheet-margin-top sheet-center">Can Prepare</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-6 sheet-margin-top sheet-center">Can Prepare</div>
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_arcane_trickster" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
-							<input type="number" name="attr_spells_prepared_artficer" value="( ((((@{artificer_level} + @{intelligence_mod}) + 1) + abs((@{artificer_level} + @{intelligence_mod}) - 1)) / 2) * (ceil(@{artificer_level}/1e10)) )" disabled="disabled" />
-						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_bard" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_cleric" value="( ((((@{cleric_level} + @{wisdom_mod}) + 1) + abs((@{cleric_level} + @{wisdom_mod}) - 1)) / 2) * (ceil(@{cleric_level}/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_druid" value="( ((((@{druid_level} + @{wisdom_mod}) + 1) + abs((@{druid_level} + @{wisdom_mod}) - 1)) / 2) * (ceil(@{druid_level}/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_eldritch_knight" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_paladin" value="( ((((floor(@{paladin_level}/2) + @{charisma_mod}) + 1) + abs((floor(@{paladin_level}/2) + @{charisma_mod}) - 1)) / 2) * (ceil((@{paladin_level}-1)/1e10)) )" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_ranger" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_sorcerer" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_warlock" value="0" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_spells_prepared_wizard" value="( ((((@{wizard_level} + @{intelligence_mod}) + 1) + abs((@{wizard_level} + @{intelligence_mod}) - 1)) / 2) * (ceil(@{wizard_level}/1e10)) )" disabled="disabled" />
 						</div>
 					</div>
 					<div class="sheet-row">
-						<div class="sheet-col-1-7 sheet-margin-top sheet-center">Save DC</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-6 sheet-margin-top sheet-center">Prepared</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_arcane_trickster" value="0" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_bard" value="0" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_cleric" value="(@{spells_prepared_count})" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_druid" value="(@{spells_prepared_count})" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_eldritch_knight" value="0" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_paladin" value="(@{spells_prepared_count})" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_ranger" value="0" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_sorcerer" value="0" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_warlock" value="0" disabled="disabled" />
+						</div>
+						<div class="sheet-col-1-12">
+							<input type="number" name="attr_spells_prepared_count_wizard" value="(@{spells_prepared_count})" disabled="disabled" />
+						</div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-6 sheet-margin-top sheet-center">Save DC</div>
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_arcane_trickster_spell_dc" value="(@{base_spell_dc}+@{arcane_trickster_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
-							<input type="number" name="attr_artificer_spell_dc" value="(@{base_spell_dc}+@{artificer_spell_bonus})" disabled="disabled" />
-						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_bard_spell_dc" value="(@{base_spell_dc}+@{bard_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_cleric_spell_dc" value="(@{base_spell_dc}+@{cleric_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_druid_spell_dc" value="(@{base_spell_dc}+@{druid_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_eldritch_knight_spell_dc" value="(@{base_spell_dc}+@{eldritch_knight_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_paladin_spell_dc" value="(@{base_spell_dc}+@{paladin_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_ranger_spell_dc" value="(@{base_spell_dc}+@{ranger_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_sorcerer_spell_dc" value="(@{base_spell_dc}+@{sorcerer_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_warlock_spell_dc" value="(@{base_spell_dc}+@{warlock_spell_bonus})" disabled="disabled" />
 						</div>
-						<div class="sheet-col-1-13">
+						<div class="sheet-col-1-12">
 							<input type="number" name="attr_wizard_spell_dc" value="(@{base_spell_dc}+@{wizard_spell_bonus})" disabled="disabled" />
 						</div>
 					</div>
 					<hr/>
 					<div class="sheet-row">
-						<div class="sheet-col-1-3 sheet-padr">
+						<div class="sheet-col-1-2 sheet-padr">
 							<div class="sheet-row sheet-sub-header">
 								<div class="sheet-col-1 sheet-vert-bottom sheet-center sheet-small-label">Sorcerer Specific</div>
 								<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">&nbsp;</div>
@@ -15078,7 +11935,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="sheet-col-1-3">
+						<div class="sheet-col-1-2 sheet-padl">
 							<div class="sheet-row sheet-sub-header">
 								<div class="sheet-col-1 sheet-vert-bottom sheet-center sheet-small-label">Warlock Specific</div>
 								<div class="sheet-col-1-4 sheet-vert-bottom sheet-center sheet-small-label">&nbsp;</div>
@@ -15100,7 +11957,7 @@
 							</div>
 							<div class="sheet-row">
 								<div class="sheet-col-1">
-									<p class="sheet-small-note">Recharge on a long or short rest and cast at the same level.</p>
+									<p class="sheet-small-note">Recharge on a long or short rest and are all of the same level</p>
 								</div>
 							</div>
 							<div class="sheet-row">
@@ -15110,26 +11967,6 @@
 								</div>
 							</div>
 						</div>
-						<div class="sheet-col-1-3 sheet-padl">
-							<div class="sheet-row sheet-sub-header">
-								<div class="sheet-col-1 sheet-vert-bottom sheet-center sheet-small-label">Artificer Specific</div>
-								<div class="sheet-col-1-2 sheet-padl sheet-padr sheet-vert-bottom sheet-center sheet-small-label">Infusions Known</div>
-								<div class="sheet-col-1-2 sheet-padl sheet-padr sheet-vert-bottom sheet-center sheet-small-label">Infused Items</div>
-							</div>
-							<div class="sheet-row">
-								<div class="sheet-col-1-2 sheet-padl sheet-padr">
-									<input type="number" name="attr_infusions" value="( @{infused_items} * 2 )" disabled="disabled" />
-								</div>
-								<div class="sheet-col-1-2 sheet-padl sheet-padr">
-									<input type="number" name="attr_infused_items" value="( (ceil(@{artificer_level}/1e10)*2) + (ceil((@{artificer_level}-5)/1e10)) + (ceil((@{artificer_level}-9)/1e10)) + (ceil((@{artificer_level}-13)/1e10)) + (ceil((@{artificer_level}-17)/1e10)) )" disabled="disabled" />
-								</div>
-							</div>
-							<div class="sheet-row">
-								<div class="sheet-col-1">
-									<p class="sheet-small-note">Can infuse items after a long rest has ended. The infusion lasts indefinitly. It ends when you die or give up your knowledge of the infusion for another one.</p>
-								</div>
-							</div>
-						</div>
 					</div>
 				</div>
 				<div class="sheet-col-1-5 sheet-padl">
@@ -15323,7 +12160,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -15359,11 +12195,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -15371,11 +12207,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -15387,7 +12223,7 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Damage
 								<br/>
-								<input type="checkbox" name="attr_spellshowdamage" value="{{spellshowdamage=1}} {{spelldamage=[[(@{dmgscale}@{damage}) + @{damagestatbonus} + @{damagemiscbonus} + (@{global_spell_damage_bonus}) + 0d0]] @{damagetype}}} @{spellcancrit}" />
+								<input type="checkbox" name="attr_spellshowdamage" value="{{spellshowdamage=1}} {{spelldamage=[[@{damage} + @{damagestatbonus} + @{damagemiscbonus} + (@{global_spell_damage_bonus}) + 0d0]] @{damagetype}}} @{spellcancrit}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Effects
 								<br/>
@@ -15450,7 +12286,7 @@
 							</div>
 							<div class="sheet-row">
 								<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -15463,7 +12299,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -15510,23 +12345,19 @@
 						<div class="sheet-spell-type-damage">
 							<div class="sheet-row">
 								<div class="sheet-offset-1-12 sheet-col-1-12 sheet-vert-bottom sheet-center sheet-small-label">Can Crit?</div>
-								<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Damage Die Size</div>
-								<div class="sheet-col-1-11 sheet-vert-bottom sheet-center sheet-small-label">Dmg Scale</div>
-								<div class="sheet-col-1-7 sheet-vert-bottom sheet-center sheet-small-label">Stat Bonus</div>
-								<div class="sheet-col-1-5 sheet-vert-bottom sheet-center sheet-small-label">Other Bonus</div>
-								<div class="sheet-col-1-8 sheet-vert-bottom sheet-center sheet-small-label">Damage Type</div>
-								<div class="sheet-col-1-13 sheet-vert-bottom sheet-center sheet-small-label">&nbsp;</div>
+								<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Damage Dice</div>
+								<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Stat Bonus</div>
+								<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Other Bonus</div>
+								<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">Damage Type</div>
+								<div class="sheet-col-1-6 sheet-vert-bottom sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
 								<div class=" sheet-offset-1-12 sheet-col-1-12 sheet-checkbox-row">
 									<input type="checkbox" name="attr_spellcancrit" value="{{spellcancrit=1}} {{spellcritdamage=Additional [[@{damage}]] damage}}" checked="checked" />
 								</div>
-								<div class="sheet-col-1-6 sheet-small-label sheet-center" title="Only input the die size, without a number, eg 'd8'.">
+								<div class="sheet-col-1-6 sheet-small-label sheet-center">
 									<input type="text" class="sheet-center" name="attr_damage" value="0" accept="Damage">
 								</div>
-								<div class=" sheet-col-1-12 sheet-checkbox-row">
-									<input type="checkbox" name="attr_dmgscale" value="[[ceil((@{level} + 2) / 6)]]" checked="checked" />
-								</div>
 								<div class="sheet-col-1-6">
 									<select name="attr_damagestatbonus">
 										<option value="0">None</option>
@@ -15637,7 +12468,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -15673,11 +12503,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -15685,11 +12515,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -15763,8 +12593,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -15777,7 +12607,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -15947,7 +12776,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -15983,11 +12811,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -15995,11 +12823,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -16073,8 +12901,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -16087,7 +12915,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -16257,7 +13084,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -16293,11 +13119,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -16305,11 +13131,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -16383,8 +13209,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -16397,7 +13223,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -16567,7 +13392,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -16603,11 +13427,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -16615,11 +13439,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -16693,8 +13517,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -16707,7 +13531,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -16877,7 +13700,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -16913,11 +13735,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -16925,11 +13747,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -17003,8 +13825,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -17017,7 +13839,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -17187,7 +14008,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -17223,11 +14043,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -17235,11 +14055,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -17313,8 +14133,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -17327,7 +14147,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -17497,7 +14316,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -17533,11 +14351,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -17545,11 +14363,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -17623,8 +14441,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -17637,7 +14455,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -17807,7 +14624,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -17843,11 +14659,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -17855,11 +14671,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -17933,8 +14749,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -17947,7 +14763,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -18117,7 +14932,6 @@
 								<select name="attr_spellgainedfrom">
 									<option value="Not Set">Not Set</option>
 									<option value="Arcane Trickster">Arcane Trickster</option>
-									<option value="Artificer">Artificer</option>
 									<option value="Bard">Bard</option>
 									<option value="Cleric">Cleric</option>
 									<option value="Druid">Druid</option>
@@ -18153,11 +14967,11 @@
 							<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Info block
 								<br/>
-								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" checked />
+								<input type="checkbox" name="attr_spellshowinfoblock" value="{{spellshowinfoblock=1}}" />
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Description
 								<br>
-								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" checked />
+								<input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">At higher levels
 								<br>
@@ -18165,11 +14979,11 @@
 							</div>
 							<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">2nd Attack roll
 								<br/>
-								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d2@{global_halfling} + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
+								<input type="checkbox" name="attr_spellshowattackadv" value="{{spellshowattackadv=1}} {{spellattackadv=[[1d20 + @{attackstat} + @{PB} + (@{global_spell_attack_bonus})]]}}" />
 							</div>
 							<div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw
 								<br/>
@@ -18243,8 +15057,8 @@
 								<div class="sheet-col-1-6 sheet-center sheet-small-label">&nbsp;</div>
 							</div>
 							<div class="sheet-row">
-								col-1-13<div class="sheet-col-1-12">
-									<select name="attr_savestat">
+								<div class="sheet-col-1-12">
+									<select name="attr_savestat" accept="Save">
 										<option value="STR">STR</option>
 										<option value="DEX">DEX</option>
 										<option value="CON">CON</option>
@@ -18257,7 +15071,6 @@
 									<select name="attr_spellsavedc">
 										<option value="0">Choose...</option>
 										<option value="@{arcane_trickster_spell_dc}">Arcane Trickster DC</option>
-										<option value="@{artificer_spell_dc}">Artificer DC</option>
 										<option value="@{bard_spell_dc}">Bard DC</option>
 										<option value="@{cleric_spell_dc}">Cleric DC</option>
 										<option value="@{druid_spell_dc}">Druid DC</option>
@@ -19901,7 +16714,7 @@
     <input type="hidden" name="attr_drop_skills" accept="Skills">
     <input type="hidden" name="attr_drop_token_size" accept="Token Size">
     <!-- END COMPENDIUM DROP CATCHERS -->
-    
+
 		<h4 class="sheet-center">NPC/Monster Sheet <span class="sheet-pictos">F</span></h4>
 		<p class="sheet-small-note">This page of the character sheet is intended for use by GM/DM's only. All the macros on this page send their output only to the GM via a private whisper/tell. GM/DM's should be sure to make sure any data entered into larger text fields is all on one line as any line breaks will break the output and some of it will be shown in public chat. There is no current workaround for this but the Roll20 devs are aware and reviewing the options. </p>
 		<div class="sheet-row sheet-npc-output-options sheet-checkbox-row sheet-margin-bottom">
@@ -19929,7 +16742,7 @@
 						<input class="sheet-underlined" type="number" name="attr_npc_initiative_overall" value="@{npc_dexterity_mod} + @{npc_initiative}" disabled="disabled">
 						<br/>Total</div>
 					<div class="sheet-col-1-3 sheet-center">
-						<button type="roll" class="sheet-roll" name="roll_NPC_Initiative" value="@{npc_output_option} &{template:5eDefault} {{title=Initiative}} {{subheader=@{character_name}}} {{rollname=Initiative}} {{roll=[[ 1d2@{global_halfling} + @{selected|npc_initiative_overall} &{tracker} ]]}}">Initiative</button>
+						<button type="roll" class="sheet-roll" name="roll_NPC_Initiative" value="@{npc_output_option} &{template:5eDefault} {{title=Initiative}} {{subheader=@{character_name}}} {{rollname=Initiative}} {{roll=[[ 1d20 + @{selected|npc_initiative_overall} &{tracker} ]]}}">Initiative</button>
 					</div>
 				</div>
 			</div>
@@ -19960,7 +16773,7 @@
 						<input type="number" name="attr_npc_strength_save_mod" value="@{npc_strength_mod} + @{npc_strength_save_bonus}" disabled="disabled">
 					</div>
 					<div class="sheet-col-1-6 sheet-center">
-						<button type="roll" class="sheet-core-save" name="roll_NPC_Strength_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{rollname=STR save}} {{roll=[[ 1d2@{global_halfling} + @{npc_strength_save_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_strength_save_mod}]]}}">Save</button>
+						<button type="roll" class="sheet-core-save" name="roll_NPC_Strength_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{rollname=STR save}} {{roll=[[ 1d20 + @{npc_strength_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_strength_save_mod}]]}}">Save</button>
 					</div>
 				</div>
 				<div class="sheet-row">
@@ -19978,7 +16791,7 @@
 						<input type="number" name="attr_npc_dexterity_save_mod" value="@{npc_dexterity_mod} + @{npc_dexterity_save_bonus}" disabled="disabled">
 					</div>
 					<div class="sheet-col-1-6 sheet-center">
-						<button type="roll" class="sheet-core-save" name="roll_NPC_Dexterity_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{rollname=DEX save}} {{roll=[[ 1d2@{global_halfling} + @{npc_dexterity_save_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_dexterity_save_mod}]]}}">Save</button>
+						<button type="roll" class="sheet-core-save" name="roll_NPC_Dexterity_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{rollname=DEX save}} {{roll=[[ 1d20 + @{npc_dexterity_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_dexterity_save_mod}]]}}">Save</button>
 					</div>
 				</div>
 				<div class="sheet-row">
@@ -19996,7 +16809,7 @@
 						<input type="number" name="attr_npc_constitution_save_mod" value="@{npc_constitution_mod} + @{npc_constitution_save_bonus}" disabled="disabled">
 					</div>
 					<div class="sheet-col-1-6 sheet-center">
-						<button type="roll" class="sheet-core-save" name="roll_NPC_Constitution_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{rollname=CON save}} {{roll=[[ 1d2@{global_halfling} + @{npc_constitution_save_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_constitution_save_mod}]]}}">Save</button>
+						<button type="roll" class="sheet-core-save" name="roll_NPC_Constitution_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{rollname=CON save}} {{roll=[[ 1d20 + @{npc_constitution_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_constitution_save_mod}]]}}">Save</button>
 					</div>
 				</div>
 				<div class="sheet-row">
@@ -20014,7 +16827,7 @@
 						<input type="number" name="attr_npc_intelligence_save_mod" value="@{npc_intelligence_mod} + @{npc_intelligence_save_bonus}" disabled="disabled">
 					</div>
 					<div class="sheet-col-1-6 sheet-center">
-						<button type="roll" class="sheet-core-save" name="roll_NPC_Intelligence_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{rollname=INT save}} {{roll=[[ 1d2@{global_halfling} + @{npc_intelligence_save_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_intelligence_save_mod}]]}}">Save</button>
+						<button type="roll" class="sheet-core-save" name="roll_NPC_Intelligence_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{rollname=INT save}} {{roll=[[ 1d20 + @{npc_intelligence_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_intelligence_save_mod}]]}}">Save</button>
 					</div>
 				</div>
 				<div class="sheet-row">
@@ -20032,7 +16845,7 @@
 						<input type="number" name="attr_npc_wisdom_save_mod" value="@{npc_wisdom_mod} + @{npc_wisdom_save_bonus}" disabled="disabled">
 					</div>
 					<div class="sheet-col-1-6 sheet-center">
-						<button type="roll" class="sheet-core-save" name="roll_NPC_Wisdom_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{rollname=WIS save}} {{roll=[[ 1d2@{global_halfling} + @{npc_wisdom_save_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_wisdom_save_mod}]]}}">Save</button>
+						<button type="roll" class="sheet-core-save" name="roll_NPC_Wisdom_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{rollname=WIS save}} {{roll=[[ 1d20 + @{npc_wisdom_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_wisdom_save_mod}]]}}">Save</button>
 					</div>
 				</div>
 				<div class="sheet-row sheet-padb">
@@ -20050,7 +16863,7 @@
 						<input type="number" name="attr_npc_charisma_save_mod" value="@{npc_charisma_mod} + @{npc_charisma_save_bonus}" disabled="disabled">
 					</div>
 					<div class="sheet-col-1-6 sheet-center">
-						<button type="roll" class="sheet-core-save" name="roll_NPC_Charisma_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{rollname=CHA save}} {{roll=[[ 1d2@{global_halfling} + @{npc_charisma_save_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_charisma_save_mod}]]}}">Save</button>
+						<button type="roll" class="sheet-core-save" name="roll_NPC_Charisma_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{rollname=CHA save}} {{roll=[[ 1d20 + @{npc_charisma_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_charisma_save_mod}]]}}">Save</button>
 					</div>
 				</div>
 			</div>
@@ -20193,7 +17006,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Acrobatics_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Acrobatics (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_acrobatics} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_acrobatics} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Acrobatics_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Acrobatics (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_acrobatics} ]]}} {{rolladv=[[ 1d20 + @{npc_acrobatics} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Acrobatics (Dex)</div>
 					<div class="sheet-col-1-8">
@@ -20208,7 +17021,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_AnimalHandling_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Animal Handling (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_animalhandling}]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_animalhandling}]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_AnimalHandling_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Animal Handling (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_animalhandling}]]}} {{rolladv=[[ 1d20 + @{npc_animalhandling}]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Animal Handling (Wis)</div>
 					<div class="sheet-col-1-8">
@@ -20223,7 +17036,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Arcana_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Arcana (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_arcana}]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_arcana}]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Arcana_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Arcana (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_arcana}]]}} {{rolladv=[[ 1d20 + @{npc_arcana}]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Arcana (Int)</div>
 					<div class="sheet-col-1-8">
@@ -20238,7 +17051,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Athletics_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Athletics (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_athletics} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_athletics} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Athletics_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Athletics (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_athletics} ]]}} {{rolladv=[[ 1d20 + @{npc_athletics} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Athletics (Str)</div>
 					<div class="sheet-col-1-8">
@@ -20253,7 +17066,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Deception_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Deception (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_deception} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_deception} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Deception_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Deception (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_deception} ]]}} {{rolladv=[[ 1d20 + @{npc_deception} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Deception (Cha)</div>
 					<div class="sheet-col-1-8">
@@ -20268,7 +17081,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_History_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=History (INT)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d2@{global_halfling} + @{npc_history} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_history} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_History_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=History (INT)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d20 + @{npc_history} ]]}} {{rolladv=[[ 1d20 + @{npc_history} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">History (Int)</div>
 					<div class="sheet-col-1-8">
@@ -20283,7 +17096,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Insight_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Insight (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_insight} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_insight} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Insight_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Insight (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_insight} ]]}} {{rolladv=[[ 1d20 + @{npc_insight} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Insight (Wis)</div>
 					<div class="sheet-col-1-8">
@@ -20298,7 +17111,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Intimidation_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Intimidation (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_intimidation} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_intimidation} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Intimidation_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Intimidation (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_intimidation} ]]}} {{rolladv=[[ 1d20 + @{npc_intimidation} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Intimidation (Cha)</div>
 					<div class="sheet-col-1-8">
@@ -20313,7 +17126,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Investigation_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Investigation (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_investigation} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_investigation} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Investigation_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Investigation (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_investigation} ]]}} {{rolladv=[[ 1d20 + @{npc_investigation} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Investigation (Int)</div>
 					<div class="sheet-col-1-8">
@@ -20337,7 +17150,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Medicine_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Medicine (WIS)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d2@{global_halfling} + @{npc_medicine} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_medicine} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Medicine_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Medicine (WIS)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d20 + @{npc_medicine} ]]}} {{rolladv=[[ 1d20 + @{npc_medicine} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Medicine (Wis)</div>
 					<div class="sheet-col-1-8">
@@ -20352,7 +17165,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Nature_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Nature (INT)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d2@{global_halfling} + @{npc_nature}]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_nature} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Nature_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Nature (INT)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d20 + @{npc_nature}]]}} {{rolladv=[[ 1d20 + @{npc_nature} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Nature (Int)</div>
 					<div class="sheet-col-1-8">
@@ -20367,7 +17180,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Perception_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Perception (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_perception} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_perception} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Perception_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Perception (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_perception} ]]}} {{rolladv=[[ 1d20 + @{npc_perception} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Perception (Wis)</div>
 					<div class="sheet-col-1-8">
@@ -20382,7 +17195,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Performance_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Performance (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_performance} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_performance} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Performance_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Performance (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_performance} ]]}} {{rolladv=[[ 1d20 + @{npc_performance} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Performance (Cha)</div>
 					<div class="sheet-col-1-8">
@@ -20397,7 +17210,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Persuasion_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Persuasion (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_persuasion} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_persuasion} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Persuasion_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Persuasion (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_persuasion} ]]}} {{rolladv=[[ 1d20 + @{npc_persuasion} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Persuasion (Cha)</div>
 					<div class="sheet-col-1-8">
@@ -20412,7 +17225,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Religion_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Religion (INT)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d2@{global_halfling} + @{npc_religion} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_religion} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Religion_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Religion (INT)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d20 + @{npc_religion} ]]}} {{rolladv=[[ 1d20 + @{npc_religion} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Religion (Int)</div>
 					<div class="sheet-col-1-8">
@@ -20427,7 +17240,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_SleightOfHand_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Sleight of Hand (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_sleightofhand} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_sleightofhand} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_SleightOfHand_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Sleight of Hand (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_sleightofhand} ]]}} {{rolladv=[[ 1d20 + @{npc_sleightofhand} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Sleight of Hand (Dex)</div>
 					<div class="sheet-col-1-8">
@@ -20442,7 +17255,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Stealth_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Stealth (DEX)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d2@{global_halfling} + @{npc_stealth} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_stealth} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Stealth_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Stealth (DEX)}} {{subheader=@{character_name}}} {{rollname=Result}} {{subheaderright=Ability check}} {{roll=[[ 1d20 + @{npc_stealth} ]]}} {{rolladv=[[ 1d20 + @{npc_stealth} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Stealth (Dex)</div>
 					<div class="sheet-col-1-8">
@@ -20457,7 +17270,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-12">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Survival_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Survival (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_survival} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_survival} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Survival_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Survival (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_survival} ]]}} {{rolladv=[[ 1d20 + @{npc_survival} ]]}}"></button>
 					</div>
 					<div class="sheet-col-1-2 sheet-skill-name sheet-center">Survival (Wis)</div>
 					<div class="sheet-col-1-8">
@@ -20483,7 +17296,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Strength_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_basic_strength_check_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_basic_strength_check_mod} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Strength_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (STR)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_basic_strength_check_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_basic_strength_check_mod} ]]}}"></button>
 					</div>
 					<div class="sheet-col-4-7 sheet-skill-name sheet-center">(Unskilled STR check)</div>
 					<div class="sheet-col-1-7">
@@ -20495,7 +17308,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Dexterity_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_basic_dexterity_check_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_basic_dexterity_check_mod} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Dexterity_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (DEX)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_basic_dexterity_check_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_basic_dexterity_check_mod} ]]}}"></button>
 					</div>
 					<div class="sheet-col-4-7 sheet-skill-name sheet-center">(Unskilled DEX check)</div>
 					<div class="sheet-col-1-7">
@@ -20507,7 +17320,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Constitution_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (CON)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_basic_constitution_check_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_basic_constitution_check_mod} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Constitution_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (CON)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_basic_constitution_check_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_basic_constitution_check_mod} ]]}}"></button>
 					</div>
 					<div class="sheet-col-4-7 sheet-skill-name sheet-center">(Unskilled CON check)</div>
 					<div class="sheet-col-1-7">
@@ -20527,7 +17340,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Wisdom_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_basic_wisdom_check_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_basic_wisdom_check_mod} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Wisdom_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (WIS)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_basic_wisdom_check_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_basic_wisdom_check_mod} ]]}}"></button>
 					</div>
 					<div class="sheet-col-4-7 sheet-skill-name sheet-center">(Unskilled WIS check)</div>
 					<div class="sheet-col-1-7">
@@ -20539,7 +17352,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Intelligence_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_basic_intelligence_check_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_basic_intelligence_check_mod} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Intelligence_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (INT)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_basic_intelligence_check_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_basic_intelligence_check_mod} ]]}}"></button>
 					</div>
 					<div class="sheet-col-4-7 sheet-skill-name sheet-center">(Unskilled INT check)</div>
 					<div class="sheet-col-1-7">
@@ -20551,7 +17364,7 @@
 				</div>
 				<div class="sheet-row sheet-skill-row">
 					<div class="sheet-col-1-7">
-						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Charisma_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d2@{global_halfling} + @{npc_basic_charisma_check_mod} ]]}} {{rolladv=[[ 1d2@{global_halfling} + @{npc_basic_charisma_check_mod} ]]}}"></button>
+						<button class="sheet-skill-roll" type="roll" name="roll_NPC_Basic_Charisma_Check" value="@{npc_output_option} &{template:5eDefault} {{ability=1}} {{title=Unskilled (CHA)}} {{subheader=@{character_name}}} {{subheaderright=Ability check}} {{rollname=Result}} {{roll=[[ 1d20 + @{npc_basic_charisma_check_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_basic_charisma_check_mod} ]]}}"></button>
 					</div>
 					<div class="sheet-col-4-7 sheet-skill-name sheet-center">(Unskilled CHA check)</div>
 					<div class="sheet-col-1-7">
@@ -21482,29 +18295,128 @@
 	</div>
   <script type="text/worker">
 
-    on("change:drop_category", function(eventinfo) {
-        if(eventinfo.newValue === "Monsters") {
-            handle_drop_monster(eventinfo.newValue);
-        }
+    const countPreparedSpells = () => {
+      const doCalc = (level1IDs, level2IDs, level3IDs, level4IDs, level5IDs, level6IDs, level7IDs, level8IDs, level9IDs) => {
+        const attrs = [
+          ...level1IDs.map(id => `repeating_spellbooklevel1_${id}_spellisprepared`),
+          ...level2IDs.map(id => `repeating_spellbooklevel2_${id}_spellisprepared`),
+          ...level3IDs.map(id => `repeating_spellbooklevel3_${id}_spellisprepared`),
+          ...level4IDs.map(id => `repeating_spellbooklevel4_${id}_spellisprepared`),
+          ...level5IDs.map(id => `repeating_spellbooklevel5_${id}_spellisprepared`),
+          ...level6IDs.map(id => `repeating_spellbooklevel6_${id}_spellisprepared`),
+          ...level7IDs.map(id => `repeating_spellbooklevel7_${id}_spellisprepared`),
+          ...level8IDs.map(id => `repeating_spellbooklevel8_${id}_spellisprepared`),
+          ...level9IDs.map(id => `repeating_spellbooklevel9_${id}_spellisprepared`)
+        ];
+        getAttrs(attrs, v => {
+          values = Object.values(v).map(a=>(parseInt(a)));
+          const total = values.reduce((a,b) => a + b, 0);
+          setAttrs({
+            spells_prepared_count: total
+          });
+        });
+      };
+
+      getSectionIDs("repeating_spellbooklevel1", level1IDs => {
+        getSectionIDs("repeating_spellbooklevel2", level2IDs => {
+          getSectionIDs("repeating_spellbooklevel3", level3IDs => {
+            getSectionIDs("repeating_spellbooklevel4", level4IDs => {
+              getSectionIDs("repeating_spellbooklevel5", level5IDs => {
+                getSectionIDs("repeating_spellbooklevel6", level6IDs => {
+                  getSectionIDs("repeating_spellbooklevel7", level7IDs => {
+                    getSectionIDs("repeating_spellbooklevel8", level8IDs => {
+                      getSectionIDs("repeating_spellbooklevel9", level9IDs => doCalc(level1IDs, level2IDs, level3IDs, level4IDs, level5IDs, level6IDs, level7IDs, level8IDs, level9IDs));
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    };
+
+    on('sheet:opened',function(){
+      countPreparedSpells();
     });
-    
+
+    on("change:repeating_spellbooklevel1", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel2", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel3", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel4", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel5", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel6", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel7", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel8", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:repeating_spellbooklevel9", function(eventInfo) {
+      if(eventInfo.sourceAttribute.match(/spellisprepared/)) {
+        countPreparedSpells();
+      }
+   });
+
+    on("change:drop_category", function(eventinfo) {
+      if(eventinfo.newValue === "Monsters") {
+        handle_drop_monster(eventinfo.newValue);
+      }
+    });
+
     var handle_drop_monster = function(category, eventinfo) {
         var callbacks = [];
         var update = {};
         var id = generateRowID();
-        
+
         drop_attrs = ["drop_name","drop_weight","drop_properties",
                       "drop_modifiers","drop_content","drop_itemtype",
                       "drop_damage","drop_damagetype","drop_damage2",
-                      "drop_damagetype2","drop_range","drop_ac", 
-                      "drop_speed", "drop_str", "drop_dex", "drop_con", 
-                      "drop_int", "drop_wis", "drop_cha", 
-                      "drop_vulnerabilities", "drop_resistances", 
-                      "drop_immunities", "drop_condition_immunities", 
-                      "drop_languages", "drop_challenge_rating", "drop_size", 
-                      "drop_type", "drop_alignment", "drop_hp", 
-                      "drop_saving_throws", "drop_senses", 
-                      "drop_passive_perception", "drop_skills", 
+                      "drop_damagetype2","drop_range","drop_ac",
+                      "drop_speed", "drop_str", "drop_dex", "drop_con",
+                      "drop_int", "drop_wis", "drop_cha",
+                      "drop_vulnerabilities", "drop_resistances",
+                      "drop_immunities", "drop_condition_immunities",
+                      "drop_languages", "drop_challenge_rating", "drop_size",
+                      "drop_type", "drop_alignment", "drop_hp",
+                      "drop_saving_throws", "drop_senses",
+                      "drop_passive_perception", "drop_skills",
                       "drop_token_size", "character_id"]
         getAttrs(drop_attrs, function(v) {
             if(category === "Monsters") {
@@ -21600,7 +18512,7 @@
                 //Challenge --> Languages
                  //Challenge/XP handling
                 if(v["drop_challenge_rating"] && v["drop_challenge_rating"] != "") {
-                  update["npc_challenge"] = v["drop_challenge_rating"];                  
+                  update["npc_challenge"] = v["drop_challenge_rating"];
                   var xp = 0;
                   var pb = 0;
                   switch(v["drop_challenge_rating"]) {
@@ -21746,7 +18658,7 @@
                 update["npc_senses"] = v["drop_senses"] ? v["drop_senses"] : "";
                 update["npc_languages"] = v["drop_languages"] ? v["drop_languages"] : "";
                 //Traits/Background
-                update["npc_damage_resistance"] = v["drop_resistances"] ? v["drop_resistances"] : "";        
+                update["npc_damage_resistance"] = v["drop_resistances"] ? v["drop_resistances"] : "";
                 update["npc_damage_vulnerability"] = v["drop_vulnerabilities"] ? v["drop_vulnerabilities"] : "";
                 update["npc_damage_immunity"] = v["drop_immunities"] ? v["drop_immunities"] : "";
                 update["npc_condition_immunity"] = v["drop_condition_immunities"] ? v["drop_condition_immunities"] : "";
@@ -21785,7 +18697,7 @@
 
 
     };
-    
+
     var cleanup_drop_fields = function() {
         var update = {};
         update["drop_name"] = "";