diff --git a/Basic Fantasy RPG - Expanded/bfrpgsheet-expanded.html b/Basic Fantasy RPG - Expanded/bfrpgsheet-expanded.html
index da94f72d48..08ac29a652 100644
--- a/Basic Fantasy RPG - Expanded/bfrpgsheet-expanded.html	
+++ b/Basic Fantasy RPG - Expanded/bfrpgsheet-expanded.html	
@@ -1570,15 +1570,6 @@ on("sheet:opened", function () {
 						<div class="sheet-col-1-8 sheet-center">
 							<button type="roll" name="roll_SDB" value="&{template:5eDefault} {{save=1}} {{title=Dragon's Breath}} {{subheader=@{character_name} Saving Throw}} {{rollname=Success: N(0)/Y(1))}} {{roll=[[{1d20+@{save_dragons_breath_mod}}>@{save_dragons_breath}]]}}"></button>
 						</div>
-					</div>
-					<div class="sheet-row">
-						<div class="sheet-col-1-8 sheet-padr"><input type="number" name="attr_save_rod_staff_spell" min="1" step="1" /></div>
-						<div class="sheet-col-1-2 sheet-small-label">Rod or Staff</div>
-						<div class="sheet-col-1-10 sheet-center sheet-small-label">&nbsp;</div>
-						<div class="sheet-col-1-8 sheet-left"><input type="number" name="attr_save_rod_staff_spell_mod" Title="Modifier" value="0" min="0" step="1" /></div>
-						<div class="sheet-col-1-8 sheet-center">
-							<button type="roll" name="roll_SRSS" value="&{template:5eDefault} {{save=1}} {{title=Rod or Staff}} {{subheader=@{character_name} Saving Throw}} {{rollname=Success: N(0)/Y(1))}} {{roll=[[{1d20+@{save_rod_staff_spell_mod}}>@{save_rod_staff_spell}]]}}"></button>
-						</div>
 					</div>
 						<div class="sheet-row">
 						<div class="sheet-col-1-8 sheet-padr"><input type="number" name="attr_save_spell" min="1" step="1" /></div>
@@ -1811,7 +1802,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 0<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 0<input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -1857,7 +1848,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -1926,7 +1916,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 1<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 1<input type="hidden" name="attr_spellfriendlylevel" value="1"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -1972,7 +1962,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -2041,7 +2030,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 2<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 2<input type="hidden" name="attr_spellfriendlylevel" value="2"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -2087,7 +2076,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -2156,7 +2144,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 3<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 3<input type="hidden" name="attr_spellfriendlylevel" value="3"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -2202,7 +2190,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -2271,7 +2258,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 4<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 4<input type="hidden" name="attr_spellfriendlylevel" value="4"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -2317,7 +2304,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -2386,7 +2372,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 5<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 5<input type="hidden" name="attr_spellfriendlylevel" value="5"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -2432,7 +2418,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -2501,7 +2486,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 6<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 6<input type="hidden" name="attr_spellfriendlylevel" value="6"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -2547,7 +2532,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>
@@ -2616,7 +2600,7 @@ on("sheet:opened", function () {
 							<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-small-label">Spell name</div>
 						</div>
 						<div class="sheet-row">
-							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 7<input type="hidden" name="attr_spellbaselevel" value="0"><input type="hidden" name="attr_spellfriendlylevel" value="0"></div>
+							<div class="sheet-col-1-12 sheet-vert-middle sheet-center sheet-padr">Level 7<input type="hidden" name="attr_spellfriendlylevel" value="7"></div>
 							<div class="sheet-col-1-3 sheet-vert-middle sheet-padr"><input type="text" class=" sheet-center" name="attr_spellname"></div>
 						</div>
 						<div class="sheet-row">
@@ -2662,7 +2646,6 @@ on("sheet:opened", function () {
 										<option value="Paralysis">Paralysis</option>
 										<option value="Turn to Stone">Turn to Stone</option>
 										<option value="Dragon's Breath">Dragon's Breath</option>
-										<option value="Rod or Staff">Rod or Staff</option>
 										<option value="Spell">Spell</option>
 									</select>
 								</div>