diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index 4c25689952..7b12484737 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -1262,9 +1262,9 @@
 			<div class="sheet-repeating-fields">		
 				<fieldset class="repeating_class-ability">
 					<input type="checkbox" class="sheet-counted sheet-sect-show" name="attr_class-show" title="@{repeating_class-ability_$X_class-show}" value="1" style="opacity: 0 ; height: 1.5em ; position: absolute; top: 10px; width: 5% ; cursor: pointer ; z-index: 1" checked="checked" />
-					<span class="sheet-table-data sheet-divider" ></span>				
-					<span class="sheet-table-data sheet-center" style="width:4%;"><button type="roll" name="attr_roll" title="%{selected|repeating_class-ability_$X_roll}" value="@{PC-whisper} @{macro-text}"></button></span>
-					<span class="sheet-table-data sheet-center" style="width:3em;">
+					<span class="sheet-table-data sheet-center" style="width:5%;"></span>				
+					<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll" title="%{selected|repeating_class-ability_$X_roll}" value="@{PC-whisper} @{macro-text}"></button></span>
+					<span class="sheet-table-data sheet-center" style="width:10%;">
 						<select title="@{repeating_class-ability_$X_class-number}" name="attr_class-number">
 							<option value="" selected>&#8226;Select Class</option>
 							<option value="@{class-0-name}">0</option>
@@ -1274,12 +1274,12 @@
 							<option value="@{class-4-name}">4</option>
 						</select>
 					</span>
-					<span class="sheet-table-data sheet-center" style="width:8%;"><input title="@{repeating_class-ability_$X_class-name}" type="text" name="attr_class-name" value="@{class-number}" disabled /></span>
+					<span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_$X_class-name}" type="text" name="attr_class-name" value="@{class-number}" disabled /></span>
 					<span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_$X_name}" type="text" name="attr_name" placeholder="Ability Name"></span>
 					<span class="sheet-table-data sheet-center" style="width:32%;"><input title="@{repeating_class-ability_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"></span>
-					<span class="sheet-table-data sheet-center" ><input title="@{repeating_class-ability_$X_used}" type="number" name="attr_used" value="0" /></span>
+					<span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_class-ability_$X_used}" type="number" name="attr_used" value="0" /></span>
 					<span class="sheet-table-data sheet-divider-lg" >/</span>
-					<span class="sheet-table-data sheet-center" ><input title="@{repeating_class-ability_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /></span>
+					<span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_class-ability_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /></span>
 					<span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /></span>
 					<div class="sheet-sect">									
 						<b>Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
@@ -1602,8 +1602,7 @@
                 </span>
                 <span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="%{selected|Spell-Fail-Check}" name="roll_Spell-Fail-Check" style="font-size:13px; line-height:10px; vertical-align:text-bottom;" value="@{PC-whisper} &{template:pf_generic} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Spell Fail}} {{Spell Fail Chance=[[ @{spell-fail} ]]}} {{Check=[[ 1d100 ]]}}"> Spell Fail Chance</button></span>
                 <span class="sheet-table-data sheet-center"><input title="@{spell-fail}" type="number" name="attr_spell-fail" value="0" style="width:3.5em;" class="sheet-calc" readonly="readonly" />&#37;</span>
-
-			</div>
+            </div>
         </div>
         <br>
     </div>
@@ -1730,7 +1729,7 @@
 					<input type="hidden" name="attr_var_resistances_notes" value="{{resistances_notes=@{resistances}}}" disabled />
 					<input type="hidden" name="attr_var_immunities_notes" value="{{immunities_notes=@{immunities}}}" disabled />
 					<input type="hidden" name="attr_var_weaknesses_notes" value="{{weaknesses_notes=@{weaknesses}}}" disabled />
-					<input type="hidden" name="attr_var_sr0_notes" value="{{sr0_notes=@{SR}}}" disabled />
+					<input type="hidden" name="attr_var_sr_notes" value="{{sr_notes=@{SR}}}" disabled />
 					<input type="hidden" name="attr_var_armor_notes" value="{{armor_notes=@{Armor-notes}}}" disabled />
 					<input type="hidden" name="attr_var_save_notes" value="{{save_notes=@{Save-notes}}}" disabled />
 					<input type="hidden" name="attr_var_cmd_notes" value="{{cmd_notes=@{cmd-notes}}}" disabled />
@@ -1742,7 +1741,7 @@
 					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_resistances_notes" value="@{var_resistances_notes}" title="Show Resistances" /><b title="Show Resistances"> Resistances</b></label></span>
 					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_immunities_notes" value="@{var_immunities_notes}" title="Show Immunities" /><b title="Show Immunities"> Immunities</b></label></span>
 					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_weaknesses_notes" value="@{var_weaknesses_notes}" title="Show Weaknesses" /><b title="Show Weaknesses"> Weaknesses</b></label></span>
-					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr0_notes" value="@{var_sr0_notes}" title="@{toggle_sr0_notes}" /><b title="Show Spell Resistance"> SR</b></label></span>
+					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{toggle_sr_notes}" /><b title="Show Spell Resistance"> SR</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
 					  <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
@@ -1753,7 +1752,7 @@
 					  <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 					</div>
 				</div>
-					<input type="hidden" name="attr_save_options" value="@{toggle_dr_notes} @{toggle_resistances_notes} @{toggle_immunities_notes} @{toggle_weaknesses_notes} @{toggle_sr0_notes} @{toggle_armor_notes} @{toggle_save_notes} @{toggle_cmd_notes} @{toggle_defense_notes}" disabled />	
+					<input type="hidden" name="attr_save_options" value="@{toggle_dr_notes} @{toggle_resistances_notes} @{toggle_immunities_notes} @{toggle_weaknesses_notes} @{toggle_sr_notes} @{toggle_armor_notes} @{toggle_save_notes} @{toggle_cmd_notes} @{toggle_defense_notes}" disabled />	
 			</div>		
 		</div>		
     </div>
@@ -2012,7 +2011,7 @@
 				<span class="sheet-table-data sheet-center"></span>
 				<span class="sheet-table-data sheet-divider">+</span>
 				<span class="sheet-table-data sheet-center"><input title="@{attk-penalty}" type="number" name="attr_attk-penalty" value="0" class="sheet-calc" readonly="readonly" /></span>
-				<span class="sheet-table-data sheet-divider"></span>
+				<span class="sheet-table-data sheet-center"></span>
 				<span class="sheet-table-data sheet-center" style="width:100px;"><input title="@{attk-CMB-cnote} : grappled condition" type="text" name="attr_attk-CMB-cnote" value="" class="sheet-calc" readonly="readonly" /></span>
 			</div>
 		</div>
@@ -2205,9 +2204,9 @@
 							<div class="sheet-table-row">
 								<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_$X_damage-dice-num}" style="width:40px;" value="0" min="0" /><br>Dice</span>
 								<span class="sheet-table-data sheet-divider-lg" style="padding-bottom: 10px;">d</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:3em;" ><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" style="width:40px;" value="0" min="0" /><br>Die</span>
+								<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" style="width:40px;" value="0" min="0" /><br>Die</span>
 								<span class="sheet-table-data sheet-divider">+</span>
-								<span class="sheet-table-data sheet-center sheet-small-label sheet-entry_med" ><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Damage Modifiers" /><br>DMG Mods</span>
+								<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Damage Modifiers" /><br>DMG Mods</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input type="number" name="attr_damage-mod" title="@{repeating_weapon_$X_damage-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>val</span>
 								<span class="sheet-table-data sheet-divider">+</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
@@ -7103,7 +7102,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-0-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7125,7 +7124,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-0-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7202,7 +7201,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-1-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7224,7 +7223,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-1-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7301,7 +7300,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-2-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7323,7 +7322,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-2-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7400,7 +7399,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-3-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7422,7 +7421,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-3-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7499,7 +7498,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-4-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7521,7 +7520,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-4-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7598,7 +7597,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-5-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7620,7 +7619,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-5-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7697,7 +7696,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-6-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7719,7 +7718,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-6-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7796,7 +7795,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-7-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7818,7 +7817,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-7-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7895,7 +7894,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-8-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -7917,7 +7916,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-8-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -7994,7 +7993,7 @@
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Spell Name"><br>Name</span>
 								<span class="sheet-table-data sheet-center sheet-small-label">
 									<select title="@{repeating_lvl-9-spells_$X_spellclass}" name="attr_spellclass">
-										<option value="" selected>&#8226;N/A</option>
+										<option value="N/A" selected>&#8226;N/A</option>
 										<option value="@{spellclass-0-name}">Class 0</option>
 										<option value="@{spellclass-1-name}">Class 1</option>
 										<option value="@{spellclass-2-name}">Class 2</option>
@@ -8016,7 +8015,7 @@
 									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Save Effect"><br>Save Effect</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">
 										<select title="@{repeating_lvl-9-spells_$X_sr}" name="attr_sr">
-											<option value="" selected>&#8226;N/A</option>
+											<option value="N/A" selected>&#8226;N/A</option>
 											<option value="Yes">Yes</option>
 											<option value="No">No</option>
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
@@ -8388,7 +8387,7 @@
 					<input type="hidden" name="attr_var_resistances_notes" value="{{resistances_notes=@{resistances}}}" disabled />
 					<input type="hidden" name="attr_var_immunities_notes" value="{{immunities_notes=@{immunities}}}" disabled />
 					<input type="hidden" name="attr_var_weaknesses_notes" value="{{weaknesses_notes=@{weaknesses}}}" disabled />
-					<input type="hidden" name="attr_var_sr0_notes" value="{{sr0_notes=@{SR}}}" disabled />
+					<input type="hidden" name="attr_var_sr_notes" value="{{sr_notes=@{SR}}}" disabled />
 					<input type="hidden" name="attr_var_armor_notes" value="{{armor_notes=@{Armor-notes}}}" disabled />
 					<input type="hidden" name="attr_var_save_notes" value="{{save_notes=@{Save-notes}}}" disabled />
 					<input type="hidden" name="attr_var_cmd_notes" value="{{cmd_notes=@{cmd-notes}}}" disabled />
@@ -8400,7 +8399,7 @@
 					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_resistances_notes" value="@{var_resistances_notes}" title="Show Resistances" /><b title="Show Resistances"> Resistances</b></label></span>
 					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_immunities_notes" value="@{var_immunities_notes}" title="Show Immunities" /><b title="Show Immunities"> Immunities</b></label></span>
 					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_weaknesses_notes" value="@{var_weaknesses_notes}" title="Show Weaknesses" /><b title="Show Weaknesses"> Weaknesses</b></label></span>
-					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr0_notes" value="@{var_sr0_notes}" title="@{toggle_sr0_notes}" /><b title="Show Spell Resistance"> SR</b></label></span>
+					  <span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{toggle_sr_notes}" /><b title="Show Spell Resistance"> SR</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
 					  <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
@@ -8411,7 +8410,7 @@
 					  <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 					</div>
 				</div>
-					<input type="hidden" name="attr_save_options" value="@{toggle_dr_notes} @{toggle_resistances_notes} @{toggle_immunities_notes} @{toggle_weaknesses_notes} @{toggle_sr0_notes} @{toggle_armor_notes} @{toggle_save_notes} @{toggle_cmd_notes} @{toggle_defense_notes}" disabled />	
+					<input type="hidden" name="attr_save_options" value="@{toggle_dr_notes} @{toggle_resistances_notes} @{toggle_immunities_notes} @{toggle_weaknesses_notes} @{toggle_sr_notes} @{toggle_armor_notes} @{toggle_save_notes} @{toggle_cmd_notes} @{toggle_defense_notes}" disabled />	
 			</div>
 		</div>
     </div>
@@ -10027,15 +10026,15 @@
 			</div>
 		 </td></tr>
 		{{#subtitle}}<tr><td colspan="2" class="sheet-subtitle"><div class="sheet-header-table"><span class="sheet-header-middle">{{subtitle}}</span></div></td></tr>{{/subtitle}}
-		{{#allprops() header_image character_name character_id name_link subtitle dr_notes resistances_notes immunities_notes weaknesses_notes sr0_notes armor_notes save_notes cmd_notes defense_notes description}}
+		{{#allprops() header_image character_name character_id name_link subtitle dr_notes resistances_notes immunities_notes weaknesses_notes sr_notes armor_notes save_notes cmd_notes defense_notes description}}
 		<tr><td>{{key}}</td><td>{{value}}</td></tr>
-		{{/allprops() header_image character_name character_id name_link subtitle dr_notes resistances_notes immunities_notes weaknesses_notes sr0_notes armor_notes save_notes cmd_notes defense_notes description}}
+		{{/allprops() header_image character_name character_id name_link subtitle dr_notes resistances_notes immunities_notes weaknesses_notes sr_notes armor_notes save_notes cmd_notes defense_notes description}}
 		
 		{{#dr_notes}}<tr><td colspan="2">**DR:** <span style="font-size:.90em;">{{dr_notes}}</span></td></tr>{{/dr_notes}}
 		{{#resistances_notes}}<tr><td colspan="2">**Resistances:** <span style="font-size:.90em;">{{resistances_notes}}</span></td></tr>{{/resistances_notes}}
 		{{#immunities_notes}}<tr><td colspan="2">**Immunities:** <span style="font-size:.90em;">{{immunities_notes}}</span></td></tr>{{/immunities_notes}}
 		{{#weaknesses_notes}}<tr><td colspan="2">**Weaknesses:** <span style="font-size:.90em;">{{weaknesses_notes}}</span></td></tr>{{/weaknesses_notes}}
-		{{#sr0_notes}}<tr><td colspan="2">**SR:** <span style="font-size:.90em;">{{sr0_notes}}</span></td></tr>{{/sr0_notes}}
+		{{#sr_notes}}<tr><td colspan="2">**SR:** <span style="font-size:.90em;">{{sr_notes}}</span></td></tr>{{/sr_notes}}
 		{{#armor_notes}}<tr><td colspan="2">**Armor Notes:** <span style="font-size:.90em;">{{armor_notes}}</span></td></tr>{{/armor_notes}}
 		{{#save_notes}}<tr><td colspan="2">**Save Notes:** <span style="font-size:.90em;">{{save_notes}}</span></td></tr>{{/save_notes}}
 		{{#cmd_notes}}<tr><td colspan="2">**CMD Notes:** <span style="font-size:.90em;">{{cmd_notes}}</span></td></tr>{{/cmd_notes}}