diff --git a/5eShaped/precompiled/components/core/spells.html b/5eShaped/precompiled/components/core/spells.html
index 8ae8662730..b844a57a6f 100644
--- a/5eShaped/precompiled/components/core/spells.html
+++ b/5eShaped/precompiled/components/core/spells.html
@@ -1,27 +1,16 @@
 <div class="wrap-box">
-  <input type="checkbox" name="attr_spell_display_filters" class="toggle-spell-filters" value="1" checked><span class="toggle-spell-filters button" data-i18n="FILTERS"></span>
-  <input type="checkbox" name="attr_spell_contents" class="toggle-spells-filter-content presentation"><span class="toggle-spells-filter-content presentation button" data-i18n="CONTENT"></span>
-  <input type="checkbox" name="attr_spell_condensed" class="toggle-spells-filter-condense presentation"><span class="toggle-spells-filter-condense presentation button" data-i18n="CONDENSE"></span>
-  <input type="checkbox" name="attr_spell_only_show_prepared" class="toggle-spells-filter-prepared"><span class="toggle-spells-filter-prepared button" data-i18n="PREPARED"></span>
-  <input type="checkbox" name="attr_spell_only_show_rituals" class="toggle-spells-filter-ritual"><span class="toggle-spells-filter-ritual button" data-i18n="RITUAL"></span>
+  <input type="checkbox" name="attr_spell_slots_toggle" class="toggle-spell-slots edit" checked><span class="toggle-spell-slots edit button" data-i18n="SPELL_SLOTS"></span>
+  <input type="checkbox" name="attr_spell_points_toggle" class="toggle-spell-points edit"><span class="toggle-spell-points edit button" data-i18n="SPELL_POINTS"></span>
+  <input type="checkbox" name="attr_spell_slots_all" class="toggle-spell-slots-all edit"><span class="toggle-spell-slots-all edit button" data-i18n="ALL"></span>
 
-  <input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-cantrips" value="0"><span class="toggle-spells-filter-level-cantrips button" data-i18n="CANTRIPS"></span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-1 spell-level-1" value="1"><span class="toggle-spells-filter-level-1 spell-level-1 button border-left">1</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-2 spell-level-2" value="2"><span class="toggle-spells-filter-level-2 spell-level-2 button border-left">2</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-3 spell-level-3" value="3"><span class="toggle-spells-filter-level-3 spell-level-3 button border-left">3</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-4 spell-level-4" value="4"><span class="toggle-spells-filter-level-4 spell-level-4 button border-left">4</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-5 spell-level-5"  value="5"><span class="toggle-spells-filter-level-5 spell-level-5 button border-left">5</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-6 spell-level-6" value="6"><span class="toggle-spells-filter-level-6 spell-level-6 button border-left">6</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-7 spell-level-7" value="7"><span class="toggle-spells-filter-level-7 spell-level-7 button border-left">7</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-8 spell-level-8" value="8"><span class="toggle-spells-filter-level-8 spell-level-8 button border-left">8</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-9 spell-level-9" value="9"><span class="toggle-spells-filter-level-9 spell-level-9 button border-left">9</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-all" value="all" checked><span class="toggle-spells-filter-level-all button border-left" data-i18n="ALL"></span>
+  <div class="shaped-row space-around no-wrap mar-b-smd">
+    <div>
+      //= include ../spells/warlockSpellSlots.html
+    </div>
+    <div>
+      //= include ../spells/spellSlots.html
+    </div>
+  </div>
 
-  <input type="hidden" name="attr_spell_level_filter" class="toggle-spells-filter-level">
-
-  <input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-reaction" value="reaction"><span class="toggle-spells-filter-casting-time-reaction button" data-i18n="REACTION"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-bonus" value="bonus"><span class="toggle-spells-filter-casting-time-bonus button border-left" data-i18n="BONUS"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-action" value="action"><span class="toggle-spells-filter-casting-time-action button border-left" data-i18n="ACTION"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-all" value="all" checked><span class="toggle-spells-filter-casting-time-all button border-left" data-i18n="ALL"></span>
-
-  <input type="checkbox" name="attr_spell_only_show_concentration" class="toggle-spells-filter-concentration" checked><span class="toggle-spells-filter-concentration button" data-i18n="CONCENTRATION"></span>
-  <input type="checkbox" name="attr_spell_only_show_verbal" class="toggle-spells-filter-verbal" checked><span class="toggle-spells-filter-verbal button" data-i18n="COMPONENTS_V"></span>
-  <input type="checkbox" name="attr_spell_only_show_somatic" class="toggle-spells-filter-somatic" checked><span class="toggle-spells-filter-somatic button" data-i18n="COMPONENTS_S"></span>
-  <input type="checkbox" name="attr_spell_only_show_material" class="toggle-spells-filter-material" checked><span class="toggle-spells-filter-material button" data-i18n="COMPONENTS_M"></span>
-
-  <div class="mar-t-sm"></div>
-
-  //= include ../spells/spell.html
-
-  <div class="center small-label italic" data-i18n="TURN_OFF_FILTERING"></div>
-  <button type="roll" name="roll_shaped_spells" class="wrapper-button" value="@{spells_macro_var}">
-    <div class="wrap-box-title center" data-i18n="SPELLS"></div>
-  </button>
+  //= include ../spells/spellInner.html
 </div>
\ No newline at end of file
diff --git a/5eShaped/precompiled/components/spells/spells.html b/5eShaped/precompiled/components/spells/spells.html
index 0ea49d369e..f9e6e1552a 100644
--- a/5eShaped/precompiled/components/spells/spells.html
+++ b/5eShaped/precompiled/components/spells/spells.html
@@ -22,31 +22,7 @@
   <div class="shaped-row mar-b-sm">
     <div class="col-80">
       <div class="wrap-box">
-        <input type="checkbox" name="attr_spell_display_filters" class="toggle-spell-filters" value="1" checked><span class="toggle-spell-filters button" data-i18n="FILTERS"></span>
-        <input type="checkbox" name="attr_spell_contents" class="toggle-spells-filter-content presentation"><span class="toggle-spells-filter-content presentation button" data-i18n="CONTENT"></span>
-        <input type="checkbox" name="attr_spell_condensed" class="toggle-spells-filter-condense presentation"><span class="toggle-spells-filter-condense presentation button" data-i18n="CONDENSE"></span>
-        <input type="checkbox" name="attr_spell_only_show_prepared" class="toggle-spells-filter-prepared"><span class="toggle-spells-filter-prepared button" data-i18n="PREPARED"></span>
-        <input type="checkbox" name="attr_spell_only_show_rituals" class="toggle-spells-filter-ritual"><span class="toggle-spells-filter-ritual button" data-i18n="RITUAL"></span>
-
-        <input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-cantrips" value="0"><span class="toggle-spells-filter-level-cantrips button" data-i18n="CANTRIPS"></span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-1 spell-level-1" value="1"><span class="toggle-spells-filter-level-1 spell-level-1 button border-left">1</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-2 spell-level-2" value="2"><span class="toggle-spells-filter-level-2 spell-level-2 button border-left">2</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-3 spell-level-3" value="3"><span class="toggle-spells-filter-level-3 spell-level-3 button border-left">3</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-4 spell-level-4" value="4"><span class="toggle-spells-filter-level-4 spell-level-4 button border-left">4</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-5 spell-level-5"  value="5"><span class="toggle-spells-filter-level-5 spell-level-5 button border-left">5</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-6 spell-level-6" value="6"><span class="toggle-spells-filter-level-6 spell-level-6 button border-left">6</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-7 spell-level-7" value="7"><span class="toggle-spells-filter-level-7 spell-level-7 button border-left">7</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-8 spell-level-8" value="8"><span class="toggle-spells-filter-level-8 spell-level-8 button border-left">8</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-9 spell-level-9" value="9"><span class="toggle-spells-filter-level-9 spell-level-9 button border-left">9</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-all" value="all" checked><span class="toggle-spells-filter-level-all button border-left" data-i18n="ALL"></span>
-
-        <input type="hidden" name="attr_spell_level_filter" class="toggle-spells-filter-level">
-
-        <input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-reaction" value="reaction"><span class="toggle-spells-filter-casting-time-reaction button" data-i18n="REACTION"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-bonus" value="bonus"><span class="toggle-spells-filter-casting-time-bonus button border-left" data-i18n="BONUS"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-action" value="action"><span class="toggle-spells-filter-casting-time-action button border-left" data-i18n="ACTION"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-all" value="all" checked><span class="toggle-spells-filter-casting-time-all button border-left" data-i18n="ALL"></span>
-
-        <input type="checkbox" name="attr_spell_only_show_concentration" class="toggle-spells-filter-concentration" checked><span class="toggle-spells-filter-concentration button" data-i18n="CONCENTRATION"></span>
-        <input type="checkbox" name="attr_spell_only_show_verbal" class="toggle-spells-filter-verbal" checked><span class="toggle-spells-filter-verbal button" data-i18n="COMPONENTS_V"></span>
-        <input type="checkbox" name="attr_spell_only_show_somatic" class="toggle-spells-filter-somatic" checked><span class="toggle-spells-filter-somatic button" data-i18n="COMPONENTS_S"></span>
-        <input type="checkbox" name="attr_spell_only_show_material" class="toggle-spells-filter-material" checked><span class="toggle-spells-filter-material button" data-i18n="COMPONENTS_M"></span>
-
-        <div class="mar-t-sm"></div>
-
-        //= include spell.html
-
-        <div class="center small-label italic" data-i18n="TURN_OFF_FILTERING"></div>
-        <button type="roll" name="roll_shaped_spells" class="wrapper-button" value="@{spells_macro_var}">
-          <div class="wrap-box-title center" data-i18n="SPELLS"></div>
-        </button>
+        //= include spellInner.html
       </div>
     </div>
 
diff --git a/5eShaped/precompiled/components/spells/spellsInner.html b/5eShaped/precompiled/components/spells/spellsInner.html
new file mode 100644
index 0000000000..89a782a254
--- /dev/null
+++ b/5eShaped/precompiled/components/spells/spellsInner.html
@@ -0,0 +1,23 @@
+<input type="checkbox" name="attr_spell_display_filters" class="toggle-spell-filters" value="1" checked><span class="toggle-spell-filters button" data-i18n="FILTERS"></span>
+<input type="checkbox" name="attr_spell_contents" class="toggle-spells-filter-content presentation"><span class="toggle-spells-filter-content presentation button" data-i18n="CONTENT"></span>
+<input type="checkbox" name="attr_spell_condensed" class="toggle-spells-filter-condense presentation"><span class="toggle-spells-filter-condense presentation button" data-i18n="CONDENSE"></span>
+<input type="checkbox" name="attr_spell_only_show_prepared" class="toggle-spells-filter-prepared"><span class="toggle-spells-filter-prepared button" data-i18n="PREPARED"></span>
+<input type="checkbox" name="attr_spell_only_show_rituals" class="toggle-spells-filter-ritual"><span class="toggle-spells-filter-ritual button" data-i18n="RITUAL"></span>
+
+<input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-cantrips" value="0"><span class="toggle-spells-filter-level-cantrips button" data-i18n="CANTRIPS"></span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-1 spell-level-1" value="1"><span class="toggle-spells-filter-level-1 spell-level-1 button border-left">1</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-2 spell-level-2" value="2"><span class="toggle-spells-filter-level-2 spell-level-2 button border-left">2</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-3 spell-level-3" value="3"><span class="toggle-spells-filter-level-3 spell-level-3 button border-left">3</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-4 spell-level-4" value="4"><span class="toggle-spells-filter-level-4 spell-level-4 button border-left">4</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-5 spell-level-5"  value="5"><span class="toggle-spells-filter-level-5 spell-level-5 button border-left">5</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-6 spell-level-6" value="6"><span class="toggle-spells-filter-level-6 spell-level-6 button border-left">6</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-7 spell-level-7" value="7"><span class="toggle-spells-filter-level-7 spell-level-7 button border-left">7</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-8 spell-level-8" value="8"><span class="toggle-spells-filter-level-8 spell-level-8 button border-left">8</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-9 spell-level-9" value="9"><span class="toggle-spells-filter-level-9 spell-level-9 button border-left">9</span><input type="radio" name="attr_spell_level_filter" class="toggle-spells-filter-level-all" value="all" checked><span class="toggle-spells-filter-level-all button border-left" data-i18n="ALL"></span>
+
+<input type="hidden" name="attr_spell_level_filter" class="toggle-spells-filter-level">
+
+<input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-reaction" value="reaction"><span class="toggle-spells-filter-casting-time-reaction button" data-i18n="REACTION"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-bonus" value="bonus"><span class="toggle-spells-filter-casting-time-bonus button border-left" data-i18n="BONUS"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-action" value="action"><span class="toggle-spells-filter-casting-time-action button border-left" data-i18n="ACTION"></span><input type="radio" name="attr_spell_casting_time_only_show" class="toggle-spells-filter-casting-time-all" value="all" checked><span class="toggle-spells-filter-casting-time-all button border-left" data-i18n="ALL"></span>
+
+<input type="checkbox" name="attr_spell_only_show_concentration" class="toggle-spells-filter-concentration" checked><span class="toggle-spells-filter-concentration button" data-i18n="CONCENTRATION"></span>
+<input type="checkbox" name="attr_spell_only_show_verbal" class="toggle-spells-filter-verbal" checked><span class="toggle-spells-filter-verbal button" data-i18n="COMPONENTS_V"></span>
+<input type="checkbox" name="attr_spell_only_show_somatic" class="toggle-spells-filter-somatic" checked><span class="toggle-spells-filter-somatic button" data-i18n="COMPONENTS_S"></span>
+<input type="checkbox" name="attr_spell_only_show_material" class="toggle-spells-filter-material" checked><span class="toggle-spells-filter-material button" data-i18n="COMPONENTS_M"></span>
+
+//= include spell.html
+
+<div class="center small-label italic" data-i18n="TURN_OFF_FILTERING"></div>
+<button type="roll" name="roll_shaped_spells" class="wrapper-button" value="@{spells_macro_var}">
+  <div class="wrap-box-title center" data-i18n="SPELLS"></div>
+</button>
\ No newline at end of file