diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index b9fa49863b..f01c07f0d6 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -1333,7 +1333,7 @@
             <br>
             <h4><b>Related weapons / familiarity penalty:</b></h4><input type="text" name="attr_famil-penalty" title="@{famil-penalty}" value="-0" class="sheet-min" readonly/>
             <br>
-            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" value="20" class="sheet-display" readonly/>
+            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" value="20" class="sheet-display" list="base-thac0" readonly/>
             <br>
             <br>
 
@@ -1574,7 +1574,7 @@
                     <h4><b>Specializing in a melee weapon grants: +1/+2 and extra attacks</b></h4>
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
-                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea>
+                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder=""></textarea>
                     <br>
                     <h4><b>Weapon Notes</b></h4>
                     <br><textarea name="attr_weaponnotes" title="@{weaponnotes}"></textarea>
@@ -1749,7 +1749,7 @@
                     <h4><b>Specializing in a bow or crossbow grants: An additional range category, Point-blank: +2/+0 and extra attacks </b></h4>
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
-                    <br><textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea><br>
+                    <br><textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder=""></textarea><br>
                     <h4><b>Weapon Notes</b></h4>
                     <br><textarea name="attr_rangedweaponnotes" title="@{rangedweaponnotes}"></textarea>
                     <hr>
@@ -1932,7 +1932,7 @@
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
                     <br>
-                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea>
+                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder=""></textarea>
                     <br>
                     <h4><b>Weapon Notes</b></h4>
                     <br><textarea name="attr_weaponnotes" title="@{weaponnotes}"></textarea>
@@ -2143,7 +2143,7 @@
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
                     <br>
-                    <textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea>
+                    <textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder=""></textarea>
                     <br>
                     <h4><b>Weapon Notes</b></h4>
                     <br>
@@ -16802,24 +16802,24 @@
     <option value="Medium horse lance"></option>
     <option value="Mancatcher"></option>
     <option value="Morning star"></option>
-    <option value="Awl pike"></option>
-    <option value="Bardiche"></option>
-    <option value="Bec de corbin"></option>
-    <option value="Bill-guisarme"></option>
-    <option value="Fauchard"></option>
-    <option value="Fauchard-fork"></option>
-    <option value="Glaive"></option>
-    <option value="Glaive-guisarme"></option>
-    <option value="Guisarme"></option>
-    <option value="Guisarme-voulge"></option>
-    <option value="Halberd"></option>
-    <option value="Hook fauchard"></option>
-    <option value="Lucern hammer"></option>
-    <option value="Military fork"></option>
-    <option value="Partisan"></option>
-    <option value="Ranseur"></option>
-    <option value="Spetum"></option>
-    <option value="Voulge"></option>
+    <option value="Awl pike">Polearm</option>
+    <option value="Bardiche">Polearm</option>
+    <option value="Bec de corbin">Polearm</option>
+    <option value="Bill-guisarme">Polearm</option>
+    <option value="Fauchard">Polearm</option>
+    <option value="Fauchard-fork">Polearm</option>
+    <option value="Glaive">Polearm</option>
+    <option value="Glaive-guisarme">Polearm</option>
+    <option value="Guisarme">Polearm</option>
+    <option value="Guisarme-voulge">Polearm</option>
+    <option value="Halberd">Polearm</option>
+    <option value="Hook fauchard">Polearm</option>
+    <option value="Lucern hammer">Polearm</option>
+    <option value="Military fork">Polearm</option>
+    <option value="Partisan">Polearm</option>
+    <option value="Ranseur">Polearm</option>
+    <option value="Spetum">Polearm</option>
+    <option value="Voulge">Polearm</option>
     <option value="Quarterstaff"></option>
     <option value="Scourge"></option>
     <option value="Sickle"></option>
@@ -16828,9 +16828,9 @@
     <option value="Staff sling"></option>
     <option value="Bastard sword"></option>
     <option value="Broad sword"></option>
-    <option value="Khopesh"></option>
+    <option value="Khopesh">Sword</option>
     <option value="Long sword"></option>
-    <option value="Scimitar"></option>
+    <option value="Scimitar">Sword</option>
     <option value="Short sword"></option>
     <option value="Two-handed sword"></option>
     <option value="Trident"></option>
@@ -16914,10 +16914,11 @@
 
 <datalist id="base-thac0">
     <option value="20"></option>
-    <option value="">20</option>
-    <option value="">20</option>
-    <option value="">20</option>
-    <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>
diff --git a/AD&D 2E Revised/raw/2ESheet-raw.html b/AD&D 2E Revised/raw/2ESheet-raw.html
index 1f287db064..dd995ca1b9 100644
--- a/AD&D 2E Revised/raw/2ESheet-raw.html	
+++ b/AD&D 2E Revised/raw/2ESheet-raw.html	
@@ -1333,7 +1333,7 @@
             <br>
             <h4><b>Related weapons / familiarity penalty:</b></h4><input type="text" name="attr_famil-penalty" title="@{famil-penalty}" value="-0" class="sheet-min" readonly/>
             <br>
-            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" value="20" class="sheet-display" readonly/>
+            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" value="20" class="sheet-display" list="base-thac0" readonly/>
             <br>
             <br>
 
@@ -1574,7 +1574,7 @@
                     <h4><b>Specializing in a melee weapon grants: +1/+2 and extra attacks</b></h4>
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
-                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea>
+                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder=""></textarea>
                     <br>
                     <h4><b>Weapon Notes</b></h4>
                     <br><textarea name="attr_weaponnotes" title="@{weaponnotes}"></textarea>
@@ -1749,7 +1749,7 @@
                     <h4><b>Specializing in a bow or crossbow grants: An additional range category, Point-blank: +2/+0 and extra attacks </b></h4>
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
-                    <br><textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea><br>
+                    <br><textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder=""></textarea><br>
                     <h4><b>Weapon Notes</b></h4>
                     <br><textarea name="attr_rangedweaponnotes" title="@{rangedweaponnotes}"></textarea>
                     <hr>
@@ -1932,7 +1932,7 @@
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
                     <br>
-                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea>
+                    <textarea name="attr_abilitiesnotes" title="@{abilitiesnotes}" placeholder=""></textarea>
                     <br>
                     <h4><b>Weapon Notes</b></h4>
                     <br><textarea name="attr_weaponnotes" title="@{weaponnotes}"></textarea>
@@ -2143,7 +2143,7 @@
                     <br>
                     <h4><b>Special Abilities and Attacks</b></h4>
                     <br>
-                    <textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder="You can optionally use these macros in place of your ThAC0 advancement. (Be sure to insert your relevant class level into the macro. If you are not sure which one to use, mouse over the level box to retrieve its call.): &#10;Warrior: 21-@{level-class#} &#10;Wizard: 21-ceil(@{level-class#}/3) &#10;Priest: 22-(ceil(@{level-class#}/3)*2) &#10;Rogue: 21-ceil(@{level-class#}/2) &#10;Psion: 21-ceil(@{level-class#}/2)"></textarea>
+                    <textarea name="attr_abilitiesnotesranged" title="@{abilitiesnotesranged}" placeholder=""></textarea>
                     <br>
                     <h4><b>Weapon Notes</b></h4>
                     <br>
diff --git a/AD&D 2E Revised/raw/datalists.html b/AD&D 2E Revised/raw/datalists.html
index ad85bfcfb3..64966d2ce7 100644
--- a/AD&D 2E Revised/raw/datalists.html	
+++ b/AD&D 2E Revised/raw/datalists.html	
@@ -165,10 +165,11 @@
 
 <datalist id="base-thac0">
     <option value="20"></option>
-    <option value="">20</option>
-    <option value="">20</option>
-    <option value="">20</option>
-    <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>