diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index 34536ef653..67ecf17f5f 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -3450,7 +3450,7 @@
             <td>Wizard caster level</td>
         </tr>
         <tr>
-            <td><input type="text" name="attr_level-wizard" title="@{level-wizard}" class="sheet-display" placeholder="@{level-class#} or 2" value="1"></td>
+            <td><input type="text" name="attr_level-wizard" title="@{level-wizard}" class="sheet-display" placeholder="Select level" list="level-select"></td>
         </tr>
     </table>
 
@@ -7051,7 +7051,7 @@
             <td>Priest caster level</td>
         </tr>
         <tr>
-            <td><input type="text" name="attr_level-priest" title="@{level-priest}" class="sheet-display" placeholder="@{level-class#} or 2" value="1"></td>
+            <td><input type="text" name="attr_level-priest" title="@{level-priest}" class="sheet-display" placeholder="Select level" list="level-select"></td>
         </tr>
     </table>
     
@@ -16756,6 +16756,13 @@
     <option value="@{Wisdom}"></option>
     <option value="@{Charisma}"></option>
 </datalist>
+<datalist id="level-select">
+    <option value="@{level-class1}"></option>
+    <option value="@{level-class2}"></option>
+    <option value="@{level-class3}"></option>
+    <option value="@{level-class4}"></option>
+    <option value="@{level-class5}"></option>
+</datalist>
 <datalist id="rogue-skill-macros">
     <option value="30+(30*@{level-class1})">Rogue</option>
     <option value="5+(15*@{level-class1})">Bard</option>
@@ -16772,6 +16779,20 @@
     <option value="-3">Priest</option>
     <option value="-3">Rogue</option>
 </datalist>
+<datalist id="prof-macros">
+    <option value="(3+floor(@{level-class1}/3)+@{intlang})">Warrior</option>
+    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Wizard</option>
+    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Priest</option>
+    <option value="(3+floor(@{level-class1}/4)+@{intlang})">Rogue</option>
+</datalist>
+<datalist id="base-thac0">
+    <option value="20"></option>
+    <option value="(21-@{level-class1})">Warrior</option>
+    <option value="(21-ceil(@{level-class1}/3))">Wizard</option>
+    <option value="(22-(ceil(@{level-class1}/3)*2))">Priest</option>
+    <option value="(21-ceil(@{level-class1}/2))">Rogue</option>
+    <option value="(21-ceil(@{level-class1}/2))">Psionic</option>
+</datalist>
 <datalist id="weapon-proficiencies">
     <option value="Arquebus"></option>
     <option value="Battle axe"></option>
@@ -16837,12 +16858,7 @@
     <option value="Warhammer"></option>
     <option value="Whip"></option>
 </datalist>
-<datalist id="prof-macros">
-    <option value="(3+floor(@{level-class1}/3)+@{intlang})">Warrior</option>
-    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Wizard</option>
-    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Priest</option>
-    <option value="(3+floor(@{level-class1}/4)+@{intlang})">Rogue</option>
-</datalist>
+
 <datalist id="nonweapon-proficiencies">
     <option value="Agriculture"></option>
     <option value="Animal Handling"></option>
@@ -16912,14 +16928,6 @@
     <option value="Weaponsmithing">Warrior</option>
 </datalist>
 
-<datalist id="base-thac0">
-    <option value="20"></option>
-    <option value="(21-@{level-class1})">Warrior</option>
-    <option value="(21-ceil(@{level-class1}/3))">Wizard</option>
-    <option value="(22-(ceil(@{level-class1}/3)*2))">Priest</option>
-    <option value="(21-ceil(@{level-class1}/2))">Rogue</option>
-    <option value="(21-ceil(@{level-class1}/2))">Psionic</option>
-</datalist>
 <datalist id="melee-weapons">
     <option value="Battle axe"></option>
     <option value="Club"></option>
diff --git a/AD&D 2E Revised/raw/2ESheet-raw.html b/AD&D 2E Revised/raw/2ESheet-raw.html
index 5e11490c07..2fc4aba003 100644
--- a/AD&D 2E Revised/raw/2ESheet-raw.html	
+++ b/AD&D 2E Revised/raw/2ESheet-raw.html	
@@ -3450,7 +3450,7 @@
             <td>Wizard caster level</td>
         </tr>
         <tr>
-            <td><input type="text" name="attr_level-wizard" title="@{level-wizard}" class="sheet-display" placeholder="@{level-class#} or 2" value="1"></td>
+            <td><input type="text" name="attr_level-wizard" title="@{level-wizard}" class="sheet-display" placeholder="Select level" list="level-select"></td>
         </tr>
     </table>
 
@@ -7051,7 +7051,7 @@
             <td>Priest caster level</td>
         </tr>
         <tr>
-            <td><input type="text" name="attr_level-priest" title="@{level-priest}" class="sheet-display" placeholder="@{level-class#} or 2" value="1"></td>
+            <td><input type="text" name="attr_level-priest" title="@{level-priest}" class="sheet-display" placeholder="Select level" list="level-select"></td>
         </tr>
     </table>
     
diff --git a/AD&D 2E Revised/raw/datalists.html b/AD&D 2E Revised/raw/datalists.html
index 64966d2ce7..b6d176cd49 100644
--- a/AD&D 2E Revised/raw/datalists.html	
+++ b/AD&D 2E Revised/raw/datalists.html	
@@ -7,6 +7,13 @@
     <option value="@{Wisdom}"></option>
     <option value="@{Charisma}"></option>
 </datalist>
+<datalist id="level-select">
+    <option value="@{level-class1}"></option>
+    <option value="@{level-class2}"></option>
+    <option value="@{level-class3}"></option>
+    <option value="@{level-class4}"></option>
+    <option value="@{level-class5}"></option>
+</datalist>
 <datalist id="rogue-skill-macros">
     <option value="30+(30*@{level-class1})">Rogue</option>
     <option value="5+(15*@{level-class1})">Bard</option>
@@ -23,6 +30,20 @@
     <option value="-3">Priest</option>
     <option value="-3">Rogue</option>
 </datalist>
+<datalist id="prof-macros">
+    <option value="(3+floor(@{level-class1}/3)+@{intlang})">Warrior</option>
+    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Wizard</option>
+    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Priest</option>
+    <option value="(3+floor(@{level-class1}/4)+@{intlang})">Rogue</option>
+</datalist>
+<datalist id="base-thac0">
+    <option value="20"></option>
+    <option value="(21-@{level-class1})">Warrior</option>
+    <option value="(21-ceil(@{level-class1}/3))">Wizard</option>
+    <option value="(22-(ceil(@{level-class1}/3)*2))">Priest</option>
+    <option value="(21-ceil(@{level-class1}/2))">Rogue</option>
+    <option value="(21-ceil(@{level-class1}/2))">Psionic</option>
+</datalist>
 <datalist id="weapon-proficiencies">
     <option value="Arquebus"></option>
     <option value="Battle axe"></option>
@@ -88,12 +109,7 @@
     <option value="Warhammer"></option>
     <option value="Whip"></option>
 </datalist>
-<datalist id="prof-macros">
-    <option value="(3+floor(@{level-class1}/3)+@{intlang})">Warrior</option>
-    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Wizard</option>
-    <option value="(4+floor(@{level-class1}/3)+@{intlang})">Priest</option>
-    <option value="(3+floor(@{level-class1}/4)+@{intlang})">Rogue</option>
-</datalist>
+
 <datalist id="nonweapon-proficiencies">
     <option value="Agriculture"></option>
     <option value="Animal Handling"></option>
@@ -163,14 +179,6 @@
     <option value="Weaponsmithing">Warrior</option>
 </datalist>
 
-<datalist id="base-thac0">
-    <option value="20"></option>
-    <option value="(21-@{level-class1})">Warrior</option>
-    <option value="(21-ceil(@{level-class1}/3))">Wizard</option>
-    <option value="(22-(ceil(@{level-class1}/3)*2))">Priest</option>
-    <option value="(21-ceil(@{level-class1}/2))">Rogue</option>
-    <option value="(21-ceil(@{level-class1}/2))">Psionic</option>
-</datalist>
 <datalist id="melee-weapons">
     <option value="Battle axe"></option>
     <option value="Club"></option>