diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index a595b14b19..7ee790e52a 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -3829,34 +3829,74 @@
     <br><br>
     
 <div class="body">
-        <div class="sheet-3colrow">
-            <div class="sheet-col">
-<h4><b>Spells Memorized and Spell Book</b></h4><br>
-    <h4><b>Spells Memorized</b></h4><br><ul><br>
-            <fieldset name="repeating_spells" class="repeating_spells"><table>
-    <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"><span></span></td>
-    </tr>
-    <tr>
-        <td><h4><b>SP / Arc Used:</b></h4><input type="number" name="attr_spell-points1" title="@{repeating_spells_$X_spell-points1}" class="sheet-short" value="0"><h4><b> / </b></h4><input type="number" name="attr_arc1" title="@{repeating_spells_$X_arc1}" class="sheet-short" value="0"></td>
-    </tr>
-    <tr>
-        <td>
-            <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>
-    </tr>
-    <tr>
-        <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><button type="roll" name="roll_spellcast" title="%{repeating_spells_$X_spellcast}" value="@{cast-macro}">Roll Spell Effects</button></td>
-    </tr>
-</table><hr></fieldset>
-</ul></div>
-<div class="sheet-col">
+    <h4><b>Spells Memorized and Spell Book</b></h4>
+    <br>
+    <h4><b>Spells Memorized</b></h4>
+    <br>
+    <br>
+    <div class="sheet-3colrow">
+        <div class="sheet-col">
+            <fieldset name="repeating_spells" class="repeating_spells">
+                <table class="sheet-table-center">
+                    <tr>
+                        <td>
+                            <select name="attr_spell-select" title="@{spell-select}" class="sheet-fill">
+                                <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-fill" placeholder="Spell name"></td>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="attr_spell-level" class="sheet-fill" placeholder="Spell level"></td>
+                        <td><input type="text" name="attr_spell-school" class="sheet-fill" placeholder="School"></td>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="attr_spell-range" class="sheet-fill" placeholder="Range"></td>
+                        <td><input type="text" name="attr_spell-duration" class="sheet-fill" placeholder="Duration"></td>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="attr_spell-aoe" class="sheet-fill" placeholder="Area of Effect"></td>
+                        <td><input type="text" name="attr_spell-saving-throw" class="sheet-fill" placeholder="Saving Throw"></td>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="attr_spell-damage" class="sheet-fill" placeholder="[[Damage]]"></td>
+                        <td><input type="text" name="attr_spell-damage-type" class="sheet-fill" placeholder="Damage type"></td>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="attr_spell-healing" class="sheet-fill" placeholder="[[Healing]]"></td>
+                        <td><input type="text" name="attr_spell-components" class="sheet-fill" placeholder="Components"></td>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="attr_spell-reference" class="sheet-fill" placeholder="Book Reference"></td>
+                        <td><input type="text" name="attr_spell-materials" class="sheet-fill" placeholder="Materials"></td>
+                    </tr>
+                    <tr>
+                        <td><h4><b>Cast Today:</b></h4></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><h4><b>SP / Arc Used:</b></h4></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_spell-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="label-like" 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=@{spell-casttime}}}{{range=@{spell-range}}}{{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 Effects</button></td>
+                    </tr>
+                </table>
+                <hr>
+            </fieldset>
+        </div>
+        <div class="sheet-col">
     <br><br><ul><br>
             <fieldset name="repeating_spells2" class="repeating_spells2"><table>
     <tr>
diff --git a/AD&D 2E Revised/2EStyle.css b/AD&D 2E Revised/2EStyle.css
index b00f9bbb21..077af5d79d 100644
--- a/AD&D 2E Revised/2EStyle.css	
+++ b/AD&D 2E Revised/2EStyle.css	
@@ -46,6 +46,7 @@
     display: inline-block;
     width: 106px;
 }
+
 .charsheet input.sheet-medium {
     display: inline-block;
     width: 115px;
@@ -168,6 +169,10 @@ input.sheet-tab:not(:first-child)::before
     box-sizing: border-box;
 }
 
+textarea.label-like {
+    height: 28px;
+}
+
 /* Fake checkbox */
 label input[type="radio"] + span::before,
 input[type="checkbox"] + span::before
@@ -1177,6 +1182,11 @@ table.sheet-default-header-first-column th:first-child,
     vertical-align: middle;
 }
 
+.sheet-table-center {
+    margin-left: auto;
+    margin-right: auto;
+}
+
 .sheet-centering-padding {
     padding-left: 2px;
     padding-right: 2px;