diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index 24b0f0fe89..b1a31627d5 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -3839,35 +3839,35 @@
     <br>
     <br>
     <div class="sheet-flex-wrap">
-        <fieldset name="repeating_spells" class="repeating_spells">
+        <fieldset name="repeating_spells-wiz1" class="repeating_spells-wiz1">
             <div class="sheet-flex-item">
                 <table class="sheet-default-header-every-third-column">
                     <tr>
                         <td>Spell name:</td>
                         <td>
-                            <select name="attr_spell-select-wiz" title="@{repeating_spells_$X_spell-select-wiz}" class="sheet-spell-half">
+                            <select name="attr_spell-select" title="@{repeating_spells-wiz1_$X_spell-select}" class="sheet-spell-half">
                                 <option value="0" selected="selected">Custom</option>
                                 <option value="1">Magic Missle</option>
                                 <option value="2">Read Magic</option>
                                 <option value="3">Detect Magic</option>
                             </select>
                         </td>
-                        <td><input type="text" name="attr_spellname" title="@{repeating_spells_$X_spellname}" class="sheet-spell-half" placeholder="Spell name"></td>
+                        <td><input type="text" name="attr_spell-name" title="@{repeating_spells-wiz1_$X_spell-name}" class="sheet-spell-half" placeholder="Spell name"></td>
                         <td>Casting time:</td>
-                        <td><input type="text" name="attr_casttime" title="@{repeating_spells_$X_casttime}" class="sheet-short" placeholder="Cast time"></td>
-                        <td><button type="roll" name="roll_initspell" title="@{repeating_spells_$X_initspell}" value="/gmroll [[{([[1d10]]+@{casttime}), 1}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button></td>
+                        <td><input type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz1_$X_spell-cast-time}" class="sheet-short" placeholder="Cast time"></td>
+                        <td><button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz1_$X_spell-init}" value="/gmroll [[{([[1d10]]+@{spell-cast-time}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button></td>
                     </tr>
                 </table>
                 <table class="sheet-default-header-first-column sheet-inline">
                     <tr>
                         <td>Cast / Memorized:</td>
-                        <td><input type="number" name="attr_cast-value" title="@{repeating_spells_$X_cast-value}" value="0" class="sheet-short"><b> / </b><input type="number" name="attr_cast-max" title="@{repeating_spells_$X_cast-max}" value="0" class="sheet-short"></td>
+                        <td><input type="number" name="attr_spell-cast-value" title="@{repeating_spells-wiz1_$X_spell-cast-value}" value="0" class="sheet-short"><b> / </b><input type="number" name="attr_spell-memorized" title="@{repeating_spells-wiz1_$X_spell-memorized}" value="0" class="sheet-short"></td>
                     </tr>
                 </table>
                 <table class="sheet-default-header-first-column sheet-inline">
                     <tr>
-                        <td>SP / Arc Used:</td>
-                        <td><input type="number" name="attr_spell-points1" title="@{repeating_spells_$X_spell-points1}" class="sheet-short" value="0"><b> / </b><input type="number" name="attr_arc1" title="@{repeating_spells_$X_arc1}" class="sheet-short" value="0"></td>
+                        <td>Spell Points / Arc Used:</td>
+                        <td><input type="number" name="attr_spell-points" title="@{repeating_spells-wiz1_$X_spell-points}" class="sheet-short" value="0"><b> / </b><input type="number" name="attr_spell-arc" title="@{repeating_spells-wiz1_$X_spell-arc}" class="sheet-short" value="0"></td>
                     </tr>
                 </table>
                 <input type="checkbox" class="sheet-show-spell-details sheet-show-spell-hack" title="Show spell details"/><span class="sheet-show-spell-hack"></span><label class="sheet-show-spell-hack">Show spell details</label>
@@ -3875,45 +3875,45 @@
                     <table class="sheet-default-header-odd-column">
                         <tr>
                             <td>Level:</td>
-                            <td><input type="text" name="attr_spell-level" title="@{repeating_spells_$X_spell-level}" class="sheet-spell-half" placeholder="Spell level"></td>
+                            <td><input type="text" name="attr_spell-level" title="@{repeating_spells-wiz1_$X_spell-level}" class="sheet-spell-half" placeholder="Spell level"></td>
                             <td>School:</td>
-                            <td><input type="text" name="attr_spell-school" title="@{repeating_spells_$X_spell-school}" class="sheet-spell-half" placeholder="School"></td>
+                            <td><input type="text" name="attr_spell-school" title="@{repeating_spells-wiz1_$X_spell-school}" class="sheet-spell-half" placeholder="School"></td>
                             <td>Compoenets:</td>
-                            <td><input type="text" name="attr_spell-components" title="@{repeating_spells_$X_spell-components}" class="sheet-spell-half" placeholder="Components"></td>
+                            <td><input type="text" name="attr_spell-components" title="@{repeating_spells-wiz1_$X_spell-components}" class="sheet-spell-half" placeholder="Components"></td>
                         </tr>
                         <tr>
                             <td>Range:</td>
-                            <td><input type="text" name="attr_spell-range" title="@{repeating_spells_$X_spell-range}" class="sheet-spell-half" placeholder="Range"></td>
+                            <td><input type="text" name="attr_spell-range" title="@{repeating_spells-wiz1_$X_spell-range}" class="sheet-spell-half" placeholder="Range"></td>
                             <td>Area of Effect:</td>
-                            <td><input type="text" name="attr_spell-aoe" title="@{repeating_spells_$X_spell-aoe}" class="sheet-spell-half" placeholder="Area of Effect"></td>
+                            <td><input type="text" name="attr_spell-aoe" title="@{repeating_spells-wiz1_$X_spell-aoe}" class="sheet-spell-half" placeholder="Area of Effect"></td>
                             <td>Duration:</td>
-                            <td><input type="text" name="attr_spell-duration" title="@{repeating_spells_$X_spell-duration}" class="sheet-spell-half" placeholder="Duration"></td>
+                            <td><input type="text" name="attr_spell-duration" title="@{repeating_spells-wiz1_$X_spell-duration}" class="sheet-spell-half" placeholder="Duration"></td>
                         </tr>
                         <tr>
                             <td>Damage:</td>
-                            <td><input type="text" name="attr_spell-damage" title="@{repeating_spells_$X_spell-damage}" class="sheet-spell-half" placeholder="[[Damage]]"></td>
+                            <td><input type="text" name="attr_spell-damage" title="@{repeating_spells-wiz1_$X_spell-damage}" class="sheet-spell-half" placeholder="[[Damage]]"></td>
                             <td>Damage type:</td>
-                            <td><input type="text" name="attr_spell-damage-type" title="@{repeating_spells_$X_spell-damage-type}" class="sheet-spell-half" placeholder="Damage type"></td>
+                            <td><input type="text" name="attr_spell-damage-type" title="@{repeating_spells-wiz1_$X_spell-damage-type}" class="sheet-spell-half" placeholder="Damage type"></td>
                             <td>Saving throw:</td>
-                            <td><input type="text" name="attr_spell-saving-throw" title="@{repeating_spells_$X_spell-saving-throw}" class="sheet-spell-half" placeholder="Saving Throw"></td>
+                            <td><input type="text" name="attr_spell-saving-throw" title="@{repeating_spells-wiz1_$X_spell-saving-throw}" class="sheet-spell-half" placeholder="Saving Throw"></td>
                         </tr>
                         <tr>
                             <td>Healing:</td>
-                            <td><input type="text" name="attr_spell-healing" title="@{repeating_spells_$X_spell-healing}" class="sheet-spell-half" placeholder="[[Healing]]"></td>
+                            <td><input type="text" name="attr_spell-healing" title="@{repeating_spells-wiz1_$X_spell-healing}" class="sheet-spell-half" placeholder="[[Healing]]"></td>
                             <td>Materials:</td>
-                            <td><input type="text" name="attr_spell-materials" title="@{repeating_spells_$X_spell-materials}" class="sheet-spell-half" placeholder="Materials"></td>
+                            <td><input type="text" name="attr_spell-materials" title="@{repeating_spells-wiz1_$X_spell-materials}" class="sheet-spell-half" placeholder="Materials"></td>
                             <td>Book reference:</td>
-                            <td><input type="text" name="attr_spell-reference" title="@{repeating_spells_$X_spell-reference}" class="sheet-spell-half" placeholder="Book Reference"></td>
+                            <td><input type="text" name="attr_spell-reference" title="@{repeating_spells-wiz1_$X_spell-reference}" class="sheet-spell-half" placeholder="Book Reference"></td>
                         </tr>
                     </table>
                 </div>
                 <table class="sheet-spell-effect">
                     <tr>
-                        <td class="sheet-spell-effect"><textarea name="attr_cast-macro" title="@{repeating_spells_$X_cast-macro}" placeholder="Insert Spell effects." style="margin: 0; height: 60px"></textarea></td>
+                        <td class="sheet-spell-effect"><textarea name="attr_spell-effect" title="@{repeating_spells-wiz1_$X_spell-effect}" placeholder="Insert Spell effects." style="margin: 0; height: 60px"></textarea></td>
                         <td>
-                            <button type="roll" name="roll_spellcast" title="%{repeating_spells_$X_spellcast}" value="@{cast-macro}" style="margin-bottom: 5px">Roll Spell Effects</button>
+                            <button type="roll" name="roll_spell-cast" title="%{repeating_spells-wiz1_$X_spell-cast}" value="@{spell-effect}" style="margin-bottom: 5px">Roll Spell Effects</button>
                             <br>
-                            <button type="roll" name="roll_spelltemplate" title="%{repeating_spells_$X_spelltemplate}">Roll Template</button>
+                            <button type="roll" name="roll_spell-template" title="%{repeating_spells-wiz1_$X_spell-template}" value="&{template:2Espell}{{title=@{spell-name}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{components=@{spell-components}}}{{time=@{spell-cast-time}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{effects=@{spell-effect}}}">Roll Template</button>
                         </td>
                     </tr>
                 </table>
@@ -3925,59 +3925,28 @@
         <div class="sheet-col">
             <fieldset name="repeating_spells" class="repeating_spells">
                 <table class="sheet-table-center">
+                    <tr>
+                        <td><input type="text" name="attr_spellname" title="@{repeating_spells_$X_spellname}" class="sheet-spell" placeholder="Spell name"></td>
+                    </tr>
+                    <tr>
+                        <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value" title="@{repeating_spells_$X_cast-value}" value="0" class="sheet-short"><h4><b> / </b></h4><input type="number" name="attr_cast-max" title="@{repeating_spells_$X_cast-max}" value="0" class="sheet-short"></td>
+                    </tr>
+                    <tr>
+                        <td><h4><b>SP / Arc Used:</b></h4><input type="number" name="attr_spell-points1" title="@{repeating_spells_$X_spell-points}" class="sheet-short" value="0"><h4><b> / </b></h4><input type="number" name="attr_arc1" title="@{repeating_spells_$X_arc}" class="sheet-short" value="0"></td>
+                    </tr>
                     <tr>
                         <td>
-                            <select name="attr_spell-select" title="@{spell-select}" class="sheet-spell-half">
-                                <option value="0" selected="selected">Custom</option>
-                                <option value="1">Magic Missle</option>
-                                <option value="2">Read Magic</option>
-                                <option value="3">Detect Magic</option>
-                            </select>
+                            <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime" title="@{repeating_spells_$X_casttime}" class="sheet-short">
+                            <button type="roll" name="roll_initspell" title="@{repeating_spells_$X_initspell}" value="/gmroll [[{([[1d10]]+@{casttime}), 1}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button>
                         </td>
-                        <td><input type="text" name="attr_spellname" title="@{repeating_spells_$X_spellname}" class="sheet-spell-half" placeholder="Spell name"></td>
                     </tr>
                     <tr>
-                        <td><input type="text" name="attr_spell-level" class="sheet-spell-half" placeholder="Spell level"></td>
-                        <td><input type="text" name="attr_spell-school" class="sheet-spell-half" placeholder="School"></td>
+                        <td><input type="text" name="attr_cast-macro" title="@{repeating_spells_$X_cast-macro}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
                     </tr>
                     <tr>
-                        <td><input type="text" name="attr_spell-range" class="sheet-spell-half" placeholder="Range"></td>
-                        <td><input type="text" name="attr_spell-duration" class="sheet-spell-half" placeholder="Duration"></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_spell-aoe" class="sheet-spell-half" placeholder="Area of Effect"></td>
-                        <td><input type="text" name="attr_spell-saving-throw" class="sheet-spell-half" placeholder="Saving Throw"></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_spell-damage" class="sheet-spell-half" placeholder="[[Damage]]"></td>
-                        <td><input type="text" name="attr_spell-damage-type" class="sheet-spell-half" placeholder="Damage type"></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_spell-healing" class="sheet-spell-half" placeholder="[[Healing]]"></td>
-                        <td><input type="text" name="attr_spell-components" class="sheet-spell-half" placeholder="Components"></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_spell-reference" class="sheet-spell-half" placeholder="Book Reference"></td>
-                        <td><input type="text" name="attr_spell-materials" class="sheet-spell-half" placeholder="Materials"></td>
-                    </tr>
-                    <tr>
-                        <td class="sheet-default-header">Cast / Memorized:</td>
-                        <td><input type="number" name="attr_cast-value" title="@{repeating_spells_$X_cast-value}" value="0" class="sheet-short"><b> / </b><input type="number" name="attr_cast-max" title="@{repeating_spells_$X_cast-max}" value="0" class="sheet-short"><span></span></td>
-                    </tr>
-                    <tr>
-                        <td class="sheet-default-header">SP / Arc Used:</td>
-                        <td><input type="number" name="attr_spell-points1" title="@{repeating_spells_$X_spell-points1}" class="sheet-short" value="0"><b> / </b><input type="number" name="attr_arc1" title="@{repeating_spells_$X_arc1}" class="sheet-short" value="0"></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_casttime" title="@{repeating_spells_$X_casttime}" class="sheet-table-dynamic" placeholder="Cast time"></td>
-                        <td><button type="roll" name="roll_initspell" title="@{repeating_spells_$X_initspell}" value="/gmroll [[{([[1d10]]+@{casttime}), 1}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button></td>
-                    </tr>
-                    <tr>
-                        <td colspan="2"><textarea name="attr_cast-macro" title="@{repeating_spells_$X_cast-macro}" class="sheet-label-like" style="margin: 0;" placeholder="Insert Spell effects."></textarea></td>
-                    </tr>
-                    <tr>
-                        <td><button type="roll" name="roll_spellcast" title="%{repeating_spells_$X_spellcast}" value="@{cast-macro}">Spell Effects</button></td>
-                        <td><button type="roll" name="roll_spelltemplate" title="%{repeating_spells_$X_spelltemplate}" value="&{template:2Espell}{{title=@{spellname}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{components=@{spell-components}}}{{time=@{casttime}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{effects=@{cast-macro}}}">Template</button></td>
+                        <td>
+                            <button type="roll" name="roll_spellcast" title="%{repeating_spells_$X_spellcast}" value="@{cast-macro}">Roll Spell Effects</button>
+                        </td>
                     </tr>
                 </table>
                 <hr>
@@ -3987,85 +3956,62 @@
             <fieldset name="repeating_spells2" class="repeating_spells2">
                 <table class="sheet-table-center">
                     <tr>
-                        <td colspan="2">
-                            <select name="attr_spell-select" title="@{spell-select}" class="sheet-attr">
-                                <option value="0" selected="selected">Custom</option>
-                                <option value="1">Magic Missle</option>
-                                <option value="2">Read Magic</option>
-                                <option value="3">Detect Magic</option>
-                            </select>
+                        <td><input type="text" name="attr_spellname2" title="@{repeating_spells2_$X_spellname2}" class="sheet-spell" placeholder="Spell name"></td>
+                    </tr>
+                    <tr>
+                        <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value2" title="@{repeating_spells2_$X_cast-value2}" value="0" class="sheet-short"><h4><b> / </b></h4><input type="number" name="attr_cast-max2" title="@{repeating_spells2_$X_cast-max2}" value="0" class="sheet-short"></td>
+                    </tr>
+                    <tr>
+                        <td><h4><b>SP / Arc Used:</b></h4><input type="number" name="attr_spell-points2" title="@{repeating_spells2_$X_spell-points2}" class="sheet-short" value="0"><h4><b> / </b></h4><input type="number" name="attr_arc2" title="@{repeating_spells2_$X_arc2}" class="sheet-short" value="0"></td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime2" title="@{repeating_spells2_$X_casttime2}" class="sheet-short">
+                            <button type="roll" name="roll_initspell2" title="@{repeating_spells2_$X_initspell2}" value="/gmroll [[{([[1d10]]+@{casttime2}), 1}kh1]] [Initiative (@{spellname2})]&{tracker}">Initiative</button>
                         </td>
-                        <td colspan="4"><input type="text" name="attr_spellname2" title="@{repeating_spells_$X_spellname}" class="sheet-table-dynamic" placeholder="Spell name"></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><input type="text" name="attr_spell-level" class="sheet-attr" placeholder="Spell level"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-school" class="sheet-attr" placeholder="School"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-sphere" class="sheet-attr" placeholder="Sphere"></td>
+                        <td><input type="text" name="attr_cast-macro2" title="@{repeating_spells2_$X_cast-macro2}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><input type="text" name="attr_spell-aoe" class="sheet-attr" placeholder="Area of Effect"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-range" class="sheet-attr" placeholder="Range"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-duration" class="sheet-attr" placeholder="Duration"></td>
+                        <td>
+                            <button type="roll" name="roll_spellcast2" title="%{repeating_spells2_$X_spellcast2}" value="@{cast-macro2}">Roll Spell Effects</button>
+                        </td>
                     </tr>
+                </table>
+                <hr>
+            </fieldset>
+        </div>
+        <div class="sheet-col">
+            <fieldset name="repeating_spells3" class="repeating_spells3">
+                <table class="sheet-table-center">
                     <tr>
-                        <td colspan="2"><input type="text" name="attr_spell-damage" class="sheet-attr" placeholder="[[Damage]]"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-damage-type" class="sheet-attr" placeholder="Damage type"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-saving-throw" class="sheet-attr" placeholder="Saving Throw"></td>
+                        <td><input type="text" name="attr_spellname3" title="@{repeating_spells3_$X_spellname3}" class="sheet-spell" placeholder="Spell name"></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><input type="text" name="attr_spell-components" class="sheet-attr" placeholder="Components"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-materials" class="sheet-attr" placeholder="Materials"></td>
-                        <td colspan="2"><input type="text" name="attr_spell-reference" class="sheet-attr" placeholder="Book Reference"></td>
+                        <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value3" title="@{repeating_spells3_$X_cast-value3}" value="0" class="sheet-short"><h4><b> / </b></h4><input type="number" name="attr_cast-max3" title="@{repeating_spells3_$X_cast-max3}" value="0" class="sheet-short"></td>
                     </tr>
                     <tr>
-                        <td colspan="3" class="sheet-default-header">Cast / Memorized:</td>
-                        <td colspan="3" class="sheet-default-header"><input type="number" name="attr_cast-value2" title="@{repeating_spells2_$X_cast-value2}" value="0" class="sheet-short"><b> / </b><input type="number" name="attr_cast-max2" title="@{repeating_spells2_$X_cast-max2}" value="0" class="sheet-short"><span></span></td>
+                        <td><h4><b>SP / Arc Used:</b></h4><input type="number" name="attr_spell-points3" title="@{repeating_spells3_$X_spell-points3}" class="sheet-short" value="0"><h4><b> / </b></h4><input type="number" name="attr_arc3" title="@{repeating_spells3_$X_arc3}" class="sheet-short" value="0"></td>
                     </tr>
                     <tr>
-                        <td colspan="3" class="sheet-default-header">SP / Arc Used:</td>
-                        <td colspan="3" class="sheet-default-header"><input type="number" name="attr_spell-points2" title="@{repeating_spells2_$X_spell-points2}" class="sheet-short" value="0"><b> / </b><input type="number" name="attr_arc2" title="@{repeating_spells2_$X_arc2}" class="sheet-short" value="0"></td>
+                        <td>
+                            <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime3" title="@{repeating_spells3_$X_casttime3}" class="sheet-short">
+                            <button type="roll" name="roll_initspell3" title="@{repeating_spells3_$X_initspell3}" value="/gmroll [[{([[1d10]]+@{casttime3}), 1}kh1]] [Initiative (@{spellname3})]&{tracker}">Initiative</button>
+                        </td>
                     </tr>
                     <tr>
-                        <td colspan="2" class="sheet-default-header">Casting time:</td>
-                        <td colspan="2"><input type="text" name="attr_casttime" title="@{repeating_spells_$X_casttime}" class="sheet-table-dynamic" placeholder="Cast time"></td>
-                        <td colspan="2"><button type="roll" name="roll_initspell2" title="@{repeating_spells2_$X_initspell2}" value="/gmroll [[{([[1d10]]+@{casttime2}), 1}kh1]] [Initiative (@{spellname2})]&{tracker}">Initiative</button></td>
+                        <td><input type="text" name="attr_cast-macro3" title="@{repeating_spells3_$X_cast-macro3}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
                     </tr>
                     <tr>
-                        <td colspan="6"><textarea name="attr_cast-macro2" title="@{repeating_spells_$X_cast-macro2}" class="sheet-label-like" style="margin: 0;" placeholder="Insert Spell effects."></textarea></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3"><button type="roll" name="roll_spellcast2" title="%{repeating_spells2_$X_spellcast2}" value="@{cast-macro2}">Spell Effects</button></td>
-                        <td colspan="3"><button type="roll" name="roll_spelltemplate" title="%{repeating_spells_$X_spelltemplate}" value="&{template:2Espell}{{title=@{spellname2}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{components=@{spell-components}}}{{time=@{casttime2}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{effects=@{cast-macro2}}}">Template</button></td>
+                        <td>
+                            <button type="roll" name="roll_spellcast3" title="%{repeating_spells3_$X_spellcast3}" value="@{cast-macro3}">Roll Spell Effects</button>
+                        </td>
                     </tr>
                 </table>
                 <hr>
             </fieldset>
         </div>
-<div class="sheet-col">
-    <br><br><ul><br>
-    <fieldset name="repeating_spells3" class="repeating_spells3"><table>
-    <tr>
-            <td><input type="text" name="attr_spellname3" title="@{repeating_spells3_$X_spellname3}" class="sheet-spell" placeholder="Spell name"></td>
-    </tr>
-    <tr>
-        <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value3" title="@{repeating_spells3_$X_cast-value3}" value="0" class="sheet-short"><h4><b> / </b></h4><input type="number" name="attr_cast-max3" title="@{repeating_spells3_$X_cast-max3}" value="0" class="sheet-short"><span></span></td>
-    </tr>
-    <tr>
-        <td><h4><b>SP / Arc Used:</b></h4><input type="number" name="attr_spell-points3" title="@{repeating_spells3_$X_spell-points3}" class="sheet-short" value="0"><h4><b> / </b></h4><input type="number" name="attr_arc3" title="@{repeating_spells3_$X_arc3}" class="sheet-short" value="0"></td>
-    </tr>
-    <tr>
-        <td>
-            <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime3" title="@{repeating_spells3_$X_casttime3}" class="sheet-short"><button type="roll" name="roll_initspell3" title="@{repeating_spells3_$X_initspell3}" value="/gmroll [[{([[1d10]]+@{casttime3}), 1}kh1]] [Initiative (@{spellname3})]&{tracker}">Initiative</button>
-        </td>
-    </tr>
-    <tr>
-        <td><input type="text" name="attr_cast-macro3" title="@{repeating_spells3_$X_cast-macro3}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-    </tr>
-    <tr>
-        <td><button type="roll" name="roll_spellcast3" title="%{repeating_spells3_$X_spellcast3}" value="@{cast-macro3}">Roll Spell Effects</button></td>
-    </tr>
-</table><hr></fieldset>
-</ul></div>
 </div>
     <br>
     <h4><b>Spell Book</b></h4>
@@ -15494,13 +15440,9 @@ on('change:repeating_spells remove:repeating_spells', function(){
         .fields('cast-value','cast-max','spell-points1','arc1')
         .reduce(function(m,r){
             m['cast-value']+=(r.F['cast-value']);
-            r['spell-level1-integer1']=(r.F['cast-value']);
             m['cast-max']+=(r.F['cast-max']);
-            r['spell-level1-sum1']=(r.F['cast-max']);
             m['spell-points1']+=(r.F['spell-points1']);
-            r['spell-points1-spent-wiz1']=(r.F['spell-points1']);
             m['arc1']+=(r.F['arc1']);
-            r['total-arc1-spent']=(r.F['arc1']);
             return m;
             
         },{['cast-value']:0,['cast-max']:0,['spell-points1']:0,['arc1']:0, desc: []},function(m,r,a){
@@ -15519,13 +15461,9 @@ on('change:repeating_spells2 remove:repeating_spells2', function(){
         .fields('cast-value2','cast-max2','spell-points2','arc2')
         .reduce(function(m,r){
             m['cast-value2']+=(r.F['cast-value2']);
-            r['spell-level1-integer2']=(r.F['cast-value2']);
             m['cast-max2']+=(r.F['cast-max2']);
-            r['spell-level1-sum2']=(r.F['cast-max2']);
             m['spell-points2']+=(r.F['spell-points2']);
-            r['spell-points2-spent-wiz1']=(r.F['spell-points2']);
             m['arc2']+=(r.F['arc2']);
-            r['total-arc2-spent']=(r.F['arc2']);
             return m;
             
         },{['cast-value2']:0,['cast-max2']:0,['spell-points2']:0,['arc2']:0, desc: []},function(m,r,a){
@@ -15544,13 +15482,9 @@ on('change:repeating_spells3 remove:repeating_spells3', function(){
         .fields('cast-value3','cast-max3','spell-points3','arc3')
         .reduce(function(m,r){
             m['cast-value3']+=(r.F['cast-value3']);
-            r['spell-level1-integer3']=(r.F['cast-value3']);
             m['cast-max3']+=(r.F['cast-max3']);
-            r['spell-level1-sum3']=(r.F['cast-max3']);
             m['spell-points3']+=(r.F['spell-points3']);
-            r['spell-points3-spent-wiz1']=(r.F['spell-points3']);
             m['arc3']+=(r.F['arc3']);
-            r['total-arc3-spent']=(r.F['arc3']);
             return m;
             
         },{['cast-value3']:0,['cast-max3']:0,['spell-points3']:0,['arc3']:0, desc: []},function(m,r,a){