diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index 3a8103193b..a054f4294a 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -1497,7 +1497,7 @@
                         </thead>
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus' title="@{repeating_weapons_$X_strbonus}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle" list="melee-weapons"></td>
                             <td>
                                 <select name="attr_prof-level" title="@{repeating_weapons_$X_prof-level}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -1538,7 +1538,7 @@
                         </tr>
                         <tr class="sheet-centering sheet-collapse">
                             <td><label><input type='checkbox' title="@{strbonus1}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" title="@{weaponname1}" class="sheet-middle"></td>
+                            <td><input type="text" title="@{weaponname1}" class="sheet-middle" list="melee-weapons"></td>
                             <td><label><input type="checkbox" title="@{specialist-damage}" value="2"/><span></span></label></td>
                             <td><input type="text" title="@{damadj}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" title="@{damsm}" class="sheet-short"></td>
@@ -1669,7 +1669,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus2' title="@{repeating_weapons2_$X_strbonus2}" value='1'/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus2' title="@{repeating_weapons2_$X_dexbonus2}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle" list="ranged-weapons"></td>
                             <td>
                                 <select name="attr_prof-level2" title="@{repeating_weapons2_$X_prof-level2}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -1735,7 +1735,7 @@
                         </tr>
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus3' title="@{repeating_ammo_$X_strbonus3}" value="1"/><span></span></label></td>
-                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle" list="ranged-weapons"></td>
                             <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
                             <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[@{damsm2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(?{Misc. bonus|0})]])]] damage using their @{ammoname}!"></button></td>
@@ -1840,7 +1840,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus' title="@{repeating_weapons_$X_strbonus}" value='1' checked/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus' title="@{repeating_weapons_$X_dexbonus}" value='1'/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle" list="melee-weapons"></td>
                             <td>
                                 <select name="attr_prof-level" title="@{repeating_weapons_$X_prof-level}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -1916,7 +1916,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus1' title="@{repeating_weapons-damage_$X_strbonus1}" value='1' checked/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus1' title="@{repeating_weapons-damage_$X_dexbonus1}" value='1'/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle" list="melee-weapons"></td>
                             <td><label><input type="checkbox" name="attr_specialist-damage" title="@{repeating_weapons-damage_$X_specialist-damage}" value="2"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_mastery-damage" title="@{repeating_weapons-damage_$X_mastery-damage}" value="3"/><span></span></label></td>
                             <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
@@ -2032,7 +2032,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus2' title="@{repeating_weapons2_$X_strbonus2}" value='1'/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus2' title="@{repeating_weapons2_$X_dexbonus2}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle">
+                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle" list="ranged-weapons">
                             <td>
                                 <select name="attr_prof-level2" title="@{repeating_weapons2_$X_prof-level2}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -2126,7 +2126,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus3' title="@{repeating_ammo_$X_strbonus3}" value="1"/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus3' title="@{repeating_ammo_$X_dexbonus3}" value="1"/><span></span></label></td>
-                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle" list="ranged-weapons"></td>
                             <td><label><input type='checkbox' name='attr_specialist-damage2' title="@{repeating_ammo_$X_specialist-damage2}" value='2'/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_mastery-damage2' title="@{repeating_ammo_$X_mastery-damage2}" value='3'/><span></span></label></td>
                             <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
@@ -2162,15 +2162,9 @@
             <input type="radio" name="attr_tab15" class="sheet-tab sheet-tab60" value="2"/><span class="sheet-tab sheet-tab60">S.P./D.S.</span><br><br>
 
             <h4><b>Backstab Multiplier:</b></h4>
-            <input type="text" name="attr_backstabmultiplier" title="@{backstabmultiplier}" class="tiny">&nbsp;&nbsp;
-            <h4><b>Please input a similar macro (see below) here:</b></h4>
-            <input type="text" name="attr_rogue-level-base" title="@{rogue-level-base}" class="sheet-display" value="30+(30*@{level-class1})">
-<!--            <datalist id="rogue-skill-macros">-->
-<!--                <option value="30+(30*@{level-class#})">Rogue</option>-->
-<!--                <option value="5+(15*@{level-class#})">Bard</option>-->
-<!--            </datalist>-->
-            <br>
-            <h4><b>Rogue: 30+(30*@{level-class#}) Bard: 5+(15*@{level-class#}) etc</b></h4>
+            <input type="text" name="attr_backstabmultiplier" title="@{backstabmultiplier}" class="sheet-tiny">&nbsp;&nbsp;
+            <h4><b>Please input or select a macro here:</b></h4>
+            <input type="text" name="attr_rogue-level-base" title="@{rogue-level-base}" class="sheet-display" list="rogue-skill-macros">
             <br>
             
             <div class="sheet-tab-content sheet-section-rogue-standard">
@@ -3267,13 +3261,7 @@
                 <h4><b>Weapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Weapon proficiency slots:</b></h4>
-                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" value="(2+floor(@{level-class1}/4))"/>
-<!--                <datalist id="weapprof-macros">-->
-<!--                    <option value="(4+floor(@{level-class#}/3))">Warrior</option>-->
-<!--                    <option value="(1+floor(@{level-class#}/6))">Wizard</option>-->
-<!--                    <option value="(2+floor(@{level-class#}/4))">Priest</option>-->
-<!--                    <option value="(2+floor(@{level-class#}/4))">Rogue</option>-->
-<!--                </datalist>-->
+                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" list="weapprof-macros"/>
                 <input type="text" name="attr_weapprofslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -3296,7 +3284,7 @@
                         </tr>
                     </thead>
                     <tr>
-                        <td><input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weaponprofname}" class="sheet-middle" placeholder="Name of Weapon Prof"></td>
+                        <td><input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weaponprofname}" class="sheet-middle" placeholder="Name of Weapon Prof" list="weapon-proficiencies"></td>
                         <td><input type="number" name="attr_weapprofnum" title="@{repeating_weaponprofs_$X_weapprofnum}" class="sheet-short" placeholder="Slots"></td>
                         <td><label><input type="checkbox" name="attr_expert" title="@{repeating_weaponprofs_$X_expert}" value="1"/><span></span></label></td>
                         <td><label><input type="checkbox" name="attr_specialist" title="@{repeating_weaponprofs_$X_specialist}" value="1"/><span></span></label></td>
@@ -3335,19 +3323,13 @@
                 </fieldset>
                 <br>
                 <h4><b>Proficiency notes</b></h4>
-                <textarea name="attr_profnotes1" title="@{profnotes1}" placeholder="You can optionally use these macros in place of your Weapon proficiency 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: (4+floor(@{level-class#}/3)) &#10;Wizard: (1+floor(@{level-class#}/6)) &#10;Priest: (2+floor(@{level-class#}/4)) &#10;Rogue: (2+floor(@{level-class#}/4))"></textarea>
+                <textarea name="attr_profnotes1" title="@{profnotes1}" placeholder=""></textarea>
             </div>
             <div class="sheet-col">
                 <h4><b>Nonweapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Nonweapon proficiency slots:</b></h4>
-                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" value="(4+floor(@{level-class1}/3)+@{intlang})"/>
-<!--                <datalist id="prof-macros">-->
-<!--                    <option value="(3+floor(@{level-class#}/3)+@{intlang})">Warrior</option>-->
-<!--                    <option value="(4+floor(@{level-class#}/3)+@{intlang})">Wizard</option>-->
-<!--                    <option value="(4+floor(@{level-class#}/3)+@{intlang})">Priest</option>-->
-<!--                    <option value="(3+floor(@{level-class#}/4)+@{intlang})">Rogue</option>-->
-<!--                </datalist>-->
+                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" list="prof-macros" />
                 <input type="text" name="attr_profslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -3366,9 +3348,9 @@
                         </tr>
                     </thead>
                     <tr>
-                        <td><input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf"></td>
+                        <td><input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf" list="nonweapon-proficiencies"></td>
                         <td><input type="number" name="attr_profslots" title="@{repeating_profs_$X_profslots}" class="sheet-short" placeholder="Slots"></td>
-                        <td><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext"></td>
+                        <td><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext" list="ability-scores"></td>
                         <td>&plusmn;</td>
                         <td><input type="text" name="attr_profmod" title="@{repeating_profs_$X_profmod}" value="0" class="sheet-short"></td>
                         <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="/em tries to use their proficiency in @{profname}, with a roll of [[1d20cs<1cf>20]]&le;[[(@{profstatnum})+(@{profmod})]]"></button></td>
@@ -3390,7 +3372,7 @@
                 </table>
                 </fieldset>
                 <h4><b>Proficiency notes</b></h4>
-                <textarea name="attr_profnotes2" title="@{profnotes2}" placeholder="You can optionally use these macros in place of your Nonweapon proficiency 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: (3+floor(@{level-class#}/3)+@{intlang}) &#10;Wizard: (4+floor(@{level-class#}/3)+@{intlang}) &#10;Priest: (4+floor(@{level-class#}/3)+@{intlang}) &#10;Rogue: (3+floor(@{level-class#}/4)+@{intlang})"></textarea>
+                <textarea name="attr_profnotes2" title="@{profnotes2}" placeholder=""></textarea>
             </div>
         </div>
         <hr>
@@ -12720,7 +12702,7 @@
     <input type="radio" name="attr_tab20" class="sheet-tab sheet-tab62" value="2"/><span class="sheet-tab sheet-tab62">S.P./D.S.</span><br><br>
     
 <div class="sheet-tab-content sheet-section-rogue-standard-hench">
-<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
 <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -12834,7 +12816,7 @@
     </tr></table>
     </div>
     <div class="sheet-tab-content sheet-section-rogue-spds-hench">
-    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
     <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -13114,7 +13096,7 @@
     <input type="radio" name="attr_tab21" class="sheet-tab sheet-tab64" value="2"/><span class="sheet-tab sheet-tab64">S.P./D.S.</span><br><br>
     
     <div class="sheet-tab-content sheet-section-rogue-standard-repeat">
-<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
 <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -13228,7 +13210,7 @@
     </tr></table>
     </div>
     <div class="sheet-tab-content sheet-section-rogue-spds-repeat">
-    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
     <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -16629,7 +16611,7 @@
 <tr><td><h4><b>Special Attacks:</b></h4></td><td><input type="text" name="attr_monsterspecattacks" title="@{monsterspecattacks}"></td></tr>
 <tr><td><h4><b>Special Defenses:</b></h4></td><td><input type="text" name="attr_monsterspecdefenses" title="@{monsterspecdefenses}"></td></tr>
 <tr><td><h4><b>Magic Resistance:</b></h4></td><td><input type="text" name="attr_monstermagicresist" title="@{monstermagicresist}" class="short"><h4><b>%</b></h4><button type="roll" name="roll_monstermagicresist" title="%{monstermagicresist}" value="/gmroll [[1d100+(?{Modifier?|0})]]<[[@{monstermagicresist}]]">Roll</button></td></tr>
-<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{monstersize}" class="tiny"></td></tr>
+<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{monstersize}" class="sheet-tiny"></td></tr>
 <tr><td><h4><b>Morale:</b></h4></td><td><input type="text" name="attr_monstermorale" title="@{monstermorale}"></td></tr>
 <tr><td><h4><b>XP Value:</b></h4></td><td><input type="text" name="attr_monsterxp" title="@{monsterxp}"></td></tr>
 </table>
@@ -16715,7 +16697,7 @@
 <tr><td><h4><b>Special Attacks:</b></h4></td><td><input type="text" name="attr_monsterspecattacks" title="@{repeating_monstervariants_$X_monsterspecattacks}"></td></tr>
 <tr><td><h4><b>Special Defenses:</b></h4></td><td><input type="text" name="attr_monsterspecdefenses" title="@{repeating_monstervariants_$X_monsterspecdefenses}"></td></tr>
 <tr><td><h4><b>Magic Resistance:</b></h4></td><td><input type="text" name="attr_monstermagicresist" title="@{repeating_monstervariants_$X_monstermagicresist}" class="short"><h4><b>%</b></h4><button type="roll" name="roll_monstermagicresist" title="%{repeating_monstervariants_$X_monstermagicresist}" value="/gmroll [[1d100+(?{Modifier?|0})]]<[[@{monstermagicresist}]]">Roll</button></td></tr>
-<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{repeating_monstervariants_$X_monstersize}" class="tiny"></td></tr>
+<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{repeating_monstervariants_$X_monstersize}" class="sheet-tiny"></td></tr>
 <tr><td><h4><b>Morale:</b></h4></td><td><input type="text" name="attr_monstermorale" title="@{repeating_monstervariants_$X_monstermorale}"></td></tr>
 <tr><td><h4><b>XP Value:</b></h4></td><td><input type="text" name="attr_monsterxp" title="@{repeating_monstervariants_$X_monsterxp}"></td></tr>
 </table>
@@ -16765,6 +16747,256 @@
 </fieldset>
 </div>
 
+<!-- Data lists -->
+<datalist id="ability-scores">
+    <option value="@{Strength}"></option>
+    <option value="@{Dexterity}"></option>
+    <option value="@{Constitution}"></option>
+    <option value="@{Intelligence}"></option>
+    <option value="@{Wisdom}"></option>
+    <option value="@{Charisma}"></option>
+</datalist>
+<datalist id="rogue-skill-macros">
+    <option value="30+(30*@{level-class1})">Rogue</option>
+    <option value="5+(15*@{level-class1})">Bard</option>
+</datalist>
+<datalist id="weapprof-macros">
+    <option value="(4+floor(@{level-class1}/3))">Warrior</option>
+    <option value="(1+floor(@{level-class1}/6))">Wizard</option>
+    <option value="(2+floor(@{level-class1}/4))">Priest</option>
+    <option value="(2+floor(@{level-class1}/4))">Rogue</option>
+</datalist>
+<datalist id="weapprof-penalty">
+    <option value="-2">Warrior</option>
+    <option value="-5">Wizard</option>
+    <option value="-3">Priest</option>
+    <option value="-3">Rogue</option>
+</datalist>
+<datalist id="weapon-proficiencies">
+    <option value="Arquebus"></option>
+    <option value="Battle axe"></option>
+    <option value="Blowgun"></option>
+    <option value="Short bow"></option>
+    <option value="Long bow"></option>
+    <option value="Composite short bow"></option>
+    <option value="Composite long bow"></option>
+    <option value="Club"></option>
+    <option value="Hand crossbow"></option>
+    <option value="Light crossbow"></option>
+    <option value="Heavy crossbow"></option>
+    <option value="Dagger / Dirk"></option>
+    <option value="Dart"></option>
+    <option value="Footman’s flail"></option>
+    <option value="Footman’s mace"></option>
+    <option value="Footman’s pick"></option>
+    <option value="Hand / Throwing axe"></option>
+    <option value="Harpoon"></option>
+    <option value="Horseman’s flail"></option>
+    <option value="Horseman’s mace"></option>
+    <option value="Horseman’s pick"></option>
+    <option value="Javelin"></option>
+    <option value="Knife"></option>
+    <option value="Heavy horse lance"></option>
+    <option value="Light horse lance"></option>
+    <option value="Jousting lance"></option>
+    <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="Quarterstaff"></option>
+    <option value="Scourge"></option>
+    <option value="Sickle"></option>
+    <option value="Sling"></option>
+    <option value="Spear"></option>
+    <option value="Staff sling"></option>
+    <option value="Bastard sword"></option>
+    <option value="Broad sword"></option>
+    <option value="Khopesh"></option>
+    <option value="Long sword"></option>
+    <option value="Scimitar"></option>
+    <option value="Short sword"></option>
+    <option value="Two-handed sword"></option>
+    <option value="Trident"></option>
+    <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>
+    <option value="Animal Training"></option>
+    <option value="Artistic Ability"></option>
+    <option value="Blacksmithing"></option>
+    <option value="Brewing"></option>
+    <option value="Carpentry"></option>
+    <option value="Cobbling"></option>
+    <option value="Cooking"></option>
+    <option value="Dancing"></option>
+    <option value="Direction Sense"></option>
+    <option value="Etiquette"></option>
+    <option value="Fire-building"></option>
+    <option value="Fishing"></option>
+    <option value="Heraldry"></option>
+    <option value="Languages, Modern"></option>
+    <option value="Leatherworking"></option>
+    <option value="Mining"></option>
+    <option value="Pottery"></option>
+    <option value="Riding, Airborne"></option>
+    <option value="Riding, Land-based"></option>
+    <option value="Rope Use"></option>
+    <option value="Seamanship"></option>
+    <option value="Seamstress/Tailor"></option>
+    <option value="Singing"></option>
+    <option value="Stonemasonry"></option>
+    <option value="Swimming"></option>
+    <option value="Weather Sense"></option>
+    <option value="Weaving"></option>
+    
+    <option value="Ancient History">Priest/Rogue/Wizard</option>
+    <option value="Animal Lore">Warrior</option>
+    <option value="Appraising">Rogue</option>
+    <option value="Armorer">Warrior</option>
+    <option value="Astrology">Priest/Wizard</option>
+    <option value="Blind-fighting">Rogue/Warrior</option>
+    <option value="Bowyer/Fletcher">Warrior</option>
+    <option value="Charioteering">Warrior</option>
+    <option value="Disguise">Rogue</option>
+    <option value="Endurance">Warrior</option>
+    <option value="Engineering">Priest/Wizard</option>
+    <option value="Forgery">Rogue</option>
+    <option value="Gaming">Rogue/Warrior</option>
+    <option value="Gem Cutting">Rogue/Wizard</option>
+    <option value="Healing">Priest</option>
+    <option value="Herbalism">Priest/Wizard</option>
+    <option value="Hunting">Warrior</option>
+    <option value="Juggling">Rogue</option>
+    <option value="Jumping">Rogue</option>
+    <option value="Languages, Ancient">Priest/Wizard</option>
+    <option value="Local History">Priest/Rogue</option>
+    <option value="Mountaineering">Warrior</option>
+    <option value="Musical Instrument">Priest/Rogue</option>
+    <option value="Navigation">Priest/Warrior/Wizard</option>
+    <option value="Reading Lips">Rogue</option>
+    <option value="Reading/Writing">Priest/Wizard</option>
+    <option value="Religion">Priest/Wizard</option>
+    <option value="Running">Warrior</option>
+    <option value="Set Snares">Rogue/Warrior</option>
+    <option value="Spellcraft">Priest/Wizard</option>
+    <option value="Survival">Warrior</option>
+    <option value="Tightrope Walking">Rogue</option>
+    <option value="Tracking">Warrior</option>
+    <option value="Tumbling">Rogue</option>
+    <option value="Ventriloquism">Rogue</option>
+    <option value="Weaponsmithing">Warrior</option>
+</datalist>
+
+<datalist id="melee-weapons">
+    <option value="Battle axe"></option>
+    <option value="Club"></option>
+    <option value="Dagger"></option>
+    <option value="Dirk"></option>
+    <option value="Dart"></option>
+    <option value="Footman’s flail"></option>
+    <option value="Footman’s mace"></option>
+    <option value="Footman’s pick"></option>
+    <option value="Hand axe"></option>
+    <option value="Harpoon"></option>
+    <option value="Horseman’s flail"></option>
+    <option value="Horseman’s mace"></option>
+    <option value="Horseman’s pick"></option>
+    <option value="Javelin"></option>
+    <option value="Knife"></option>
+    <option value="Heavy horse lance"></option>
+    <option value="Light horse lance"></option>
+    <option value="Jousting lance"></option>
+    <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="Quarterstaff"></option>
+    <option value="Scourge"></option>
+    <option value="Sickle"></option>
+    <option value="Spear"></option>
+    <option value="Bastard sword (One-handed)"></option>
+    <option value="Bastard sword (Two-handed)"></option>
+    <option value="Broad sword"></option>
+    <option value="Khopesh"></option>
+    <option value="Long sword"></option>
+    <option value="Scimitar"></option>
+    <option value="Short sword"></option>
+    <option value="Two-handed sword"></option>
+    <option value="Trident"></option>
+    <option value="Warhammer"></option>
+    <option value="Whip"></option>
+</datalist>
+
+<datalist id="ranged-weapons">
+    <option value="Arquebus"></option>
+    <option value="Blowgun (Barbed Dart)"></option>
+    <option value="Blowgun (Needle)"></option>
+    <option value="Short bow (Flight arrow)"></option>
+    <option value="Long bow (Flight arrow)"></option>
+    <option value="Long bow (Sheaf arrow)"></option>
+    <option value="Composite short bow (Flight arrow)"></option>
+    <option value="Composite long bow (Flight arrow)"></option>
+    <option value="Composite long bow (Sheaf arrow)"></option>
+    <option value="Club"></option>
+    <option value="Hand crossbow"></option>
+    <option value="Light crossbow"></option>
+    <option value="Heavy crossbow"></option>
+    <option value="Dagger"></option>
+    <option value="Dirk"></option>
+    <option value="Dart"></option>
+    <option value="Hand axe"></option>
+    <option value="Harpoon"></option>
+    <option value="Javelin"></option>
+    <option value="Knife"></option>
+    <option value="Sling (Bullet)"></option>
+    <option value="Sling (Stone)"></option>
+    <option value="Spear"></option>
+    <option value="Staff sling (Bullet)"></option>
+    <option value="Staff sling (Stone)"></option>
+    <option value="Warhammer"></option>
+</datalist>
 
 <rolltemplate class="sheet-rolltemplate-2Edefault">
     <div class="sheet-template-container">
diff --git a/AD&D 2E Revised/raw/2ESheet-raw.html b/AD&D 2E Revised/raw/2ESheet-raw.html
index 70e5b25434..07889d453f 100644
--- a/AD&D 2E Revised/raw/2ESheet-raw.html	
+++ b/AD&D 2E Revised/raw/2ESheet-raw.html	
@@ -1497,7 +1497,7 @@
                         </thead>
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus' title="@{repeating_weapons_$X_strbonus}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle" list="melee-weapons"></td>
                             <td>
                                 <select name="attr_prof-level" title="@{repeating_weapons_$X_prof-level}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -1538,7 +1538,7 @@
                         </tr>
                         <tr class="sheet-centering sheet-collapse">
                             <td><label><input type='checkbox' title="@{strbonus1}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" title="@{weaponname1}" class="sheet-middle"></td>
+                            <td><input type="text" title="@{weaponname1}" class="sheet-middle" list="melee-weapons"></td>
                             <td><label><input type="checkbox" title="@{specialist-damage}" value="2"/><span></span></label></td>
                             <td><input type="text" title="@{damadj}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" title="@{damsm}" class="sheet-short"></td>
@@ -1669,7 +1669,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus2' title="@{repeating_weapons2_$X_strbonus2}" value='1'/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus2' title="@{repeating_weapons2_$X_dexbonus2}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle" list="ranged-weapons"></td>
                             <td>
                                 <select name="attr_prof-level2" title="@{repeating_weapons2_$X_prof-level2}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -1735,7 +1735,7 @@
                         </tr>
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus3' title="@{repeating_ammo_$X_strbonus3}" value="1"/><span></span></label></td>
-                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle" list="ranged-weapons"></td>
                             <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
                             <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[@{damsm2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(?{Misc. bonus|0})]])]] damage using their @{ammoname}!"></button></td>
@@ -1840,7 +1840,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus' title="@{repeating_weapons_$X_strbonus}" value='1' checked/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus' title="@{repeating_weapons_$X_dexbonus}" value='1'/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle" list="melee-weapons"></td>
                             <td>
                                 <select name="attr_prof-level" title="@{repeating_weapons_$X_prof-level}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -1916,7 +1916,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus1' title="@{repeating_weapons-damage_$X_strbonus1}" value='1' checked/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus1' title="@{repeating_weapons-damage_$X_dexbonus1}" value='1'/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle" list="melee-weapons"></td>
                             <td><label><input type="checkbox" name="attr_specialist-damage" title="@{repeating_weapons-damage_$X_specialist-damage}" value="2"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_mastery-damage" title="@{repeating_weapons-damage_$X_mastery-damage}" value="3"/><span></span></label></td>
                             <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
@@ -2032,7 +2032,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus2' title="@{repeating_weapons2_$X_strbonus2}" value='1'/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus2' title="@{repeating_weapons2_$X_dexbonus2}" value='1' checked/><span></span></label></td>
-                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle">
+                            <td><input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle" list="ranged-weapons">
                             <td>
                                 <select name="attr_prof-level2" title="@{repeating_weapons2_$X_prof-level2}" class="sheet-table-dynamic">
                                     <option value="@{nonprof-penalty}">Nonproficient</option>
@@ -2126,7 +2126,7 @@
                         <tr class="sheet-centering">
                             <td><label><input type='checkbox' name='attr_strbonus3' title="@{repeating_ammo_$X_strbonus3}" value="1"/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_dexbonus3' title="@{repeating_ammo_$X_dexbonus3}" value="1"/><span></span></label></td>
-                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle"></td>
+                            <td><input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle" list="ranged-weapons"></td>
                             <td><label><input type='checkbox' name='attr_specialist-damage2' title="@{repeating_ammo_$X_specialist-damage2}" value='2'/><span></span></label></td>
                             <td><label><input type='checkbox' name='attr_mastery-damage2' title="@{repeating_ammo_$X_mastery-damage2}" value='3'/><span></span></label></td>
                             <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
@@ -2162,15 +2162,9 @@
             <input type="radio" name="attr_tab15" class="sheet-tab sheet-tab60" value="2"/><span class="sheet-tab sheet-tab60">S.P./D.S.</span><br><br>
 
             <h4><b>Backstab Multiplier:</b></h4>
-            <input type="text" name="attr_backstabmultiplier" title="@{backstabmultiplier}" class="tiny">&nbsp;&nbsp;
-            <h4><b>Please input a similar macro (see below) here:</b></h4>
-            <input type="text" name="attr_rogue-level-base" title="@{rogue-level-base}" class="sheet-display" value="30+(30*@{level-class1})">
-<!--            <datalist id="rogue-skill-macros">-->
-<!--                <option value="30+(30*@{level-class#})">Rogue</option>-->
-<!--                <option value="5+(15*@{level-class#})">Bard</option>-->
-<!--            </datalist>-->
-            <br>
-            <h4><b>Rogue: 30+(30*@{level-class#}) Bard: 5+(15*@{level-class#}) etc</b></h4>
+            <input type="text" name="attr_backstabmultiplier" title="@{backstabmultiplier}" class="sheet-tiny">&nbsp;&nbsp;
+            <h4><b>Please input or select a macro here:</b></h4>
+            <input type="text" name="attr_rogue-level-base" title="@{rogue-level-base}" class="sheet-display" list="rogue-skill-macros">
             <br>
             
             <div class="sheet-tab-content sheet-section-rogue-standard">
@@ -3267,13 +3261,7 @@
                 <h4><b>Weapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Weapon proficiency slots:</b></h4>
-                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" value="(2+floor(@{level-class1}/4))"/>
-<!--                <datalist id="weapprof-macros">-->
-<!--                    <option value="(4+floor(@{level-class#}/3))">Warrior</option>-->
-<!--                    <option value="(1+floor(@{level-class#}/6))">Wizard</option>-->
-<!--                    <option value="(2+floor(@{level-class#}/4))">Priest</option>-->
-<!--                    <option value="(2+floor(@{level-class#}/4))">Rogue</option>-->
-<!--                </datalist>-->
+                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" list="weapprof-macros"/>
                 <input type="text" name="attr_weapprofslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -3296,7 +3284,7 @@
                         </tr>
                     </thead>
                     <tr>
-                        <td><input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weaponprofname}" class="sheet-middle" placeholder="Name of Weapon Prof"></td>
+                        <td><input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weaponprofname}" class="sheet-middle" placeholder="Name of Weapon Prof" list="weapon-proficiencies"></td>
                         <td><input type="number" name="attr_weapprofnum" title="@{repeating_weaponprofs_$X_weapprofnum}" class="sheet-short" placeholder="Slots"></td>
                         <td><label><input type="checkbox" name="attr_expert" title="@{repeating_weaponprofs_$X_expert}" value="1"/><span></span></label></td>
                         <td><label><input type="checkbox" name="attr_specialist" title="@{repeating_weaponprofs_$X_specialist}" value="1"/><span></span></label></td>
@@ -3335,19 +3323,13 @@
                 </fieldset>
                 <br>
                 <h4><b>Proficiency notes</b></h4>
-                <textarea name="attr_profnotes1" title="@{profnotes1}" placeholder="You can optionally use these macros in place of your Weapon proficiency 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: (4+floor(@{level-class#}/3)) &#10;Wizard: (1+floor(@{level-class#}/6)) &#10;Priest: (2+floor(@{level-class#}/4)) &#10;Rogue: (2+floor(@{level-class#}/4))"></textarea>
+                <textarea name="attr_profnotes1" title="@{profnotes1}" placeholder=""></textarea>
             </div>
             <div class="sheet-col">
                 <h4><b>Nonweapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Nonweapon proficiency slots:</b></h4>
-                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" value="(4+floor(@{level-class1}/3)+@{intlang})"/>
-<!--                <datalist id="prof-macros">-->
-<!--                    <option value="(3+floor(@{level-class#}/3)+@{intlang})">Warrior</option>-->
-<!--                    <option value="(4+floor(@{level-class#}/3)+@{intlang})">Wizard</option>-->
-<!--                    <option value="(4+floor(@{level-class#}/3)+@{intlang})">Priest</option>-->
-<!--                    <option value="(3+floor(@{level-class#}/4)+@{intlang})">Rogue</option>-->
-<!--                </datalist>-->
+                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" list="prof-macros" />
                 <input type="text" name="attr_profslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -3366,9 +3348,9 @@
                         </tr>
                     </thead>
                     <tr>
-                        <td><input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf"></td>
+                        <td><input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf" list="nonweapon-proficiencies"></td>
                         <td><input type="number" name="attr_profslots" title="@{repeating_profs_$X_profslots}" class="sheet-short" placeholder="Slots"></td>
-                        <td><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext"></td>
+                        <td><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext" list="ability-scores"></td>
                         <td>&plusmn;</td>
                         <td><input type="text" name="attr_profmod" title="@{repeating_profs_$X_profmod}" value="0" class="sheet-short"></td>
                         <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="/em tries to use their proficiency in @{profname}, with a roll of [[1d20cs<1cf>20]]&le;[[(@{profstatnum})+(@{profmod})]]"></button></td>
@@ -3390,7 +3372,7 @@
                 </table>
                 </fieldset>
                 <h4><b>Proficiency notes</b></h4>
-                <textarea name="attr_profnotes2" title="@{profnotes2}" placeholder="You can optionally use these macros in place of your Nonweapon proficiency 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: (3+floor(@{level-class#}/3)+@{intlang}) &#10;Wizard: (4+floor(@{level-class#}/3)+@{intlang}) &#10;Priest: (4+floor(@{level-class#}/3)+@{intlang}) &#10;Rogue: (3+floor(@{level-class#}/4)+@{intlang})"></textarea>
+                <textarea name="attr_profnotes2" title="@{profnotes2}" placeholder=""></textarea>
             </div>
         </div>
         <hr>
@@ -12720,7 +12702,7 @@
     <input type="radio" name="attr_tab20" class="sheet-tab sheet-tab62" value="2"/><span class="sheet-tab sheet-tab62">S.P./D.S.</span><br><br>
     
 <div class="sheet-tab-content sheet-section-rogue-standard-hench">
-<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
 <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -12834,7 +12816,7 @@
     </tr></table>
     </div>
     <div class="sheet-tab-content sheet-section-rogue-spds-hench">
-    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
     <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -13114,7 +13096,7 @@
     <input type="radio" name="attr_tab21" class="sheet-tab sheet-tab64" value="2"/><span class="sheet-tab sheet-tab64">S.P./D.S.</span><br><br>
     
     <div class="sheet-tab-content sheet-section-rogue-standard-repeat">
-<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+<h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
 <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -13228,7 +13210,7 @@
     </tr></table>
     </div>
     <div class="sheet-tab-content sheet-section-rogue-spds-repeat">
-    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
+    <h4><b>Backstab Multiplier: X</b></h4><input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="sheet-tiny"><br><h4><b>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</b></h4><br>
     <table>
     <tr>
             <td class="sheet-default-header">Skill</td>
@@ -16629,7 +16611,7 @@
 <tr><td><h4><b>Special Attacks:</b></h4></td><td><input type="text" name="attr_monsterspecattacks" title="@{monsterspecattacks}"></td></tr>
 <tr><td><h4><b>Special Defenses:</b></h4></td><td><input type="text" name="attr_monsterspecdefenses" title="@{monsterspecdefenses}"></td></tr>
 <tr><td><h4><b>Magic Resistance:</b></h4></td><td><input type="text" name="attr_monstermagicresist" title="@{monstermagicresist}" class="short"><h4><b>%</b></h4><button type="roll" name="roll_monstermagicresist" title="%{monstermagicresist}" value="/gmroll [[1d100+(?{Modifier?|0})]]<[[@{monstermagicresist}]]">Roll</button></td></tr>
-<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{monstersize}" class="tiny"></td></tr>
+<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{monstersize}" class="sheet-tiny"></td></tr>
 <tr><td><h4><b>Morale:</b></h4></td><td><input type="text" name="attr_monstermorale" title="@{monstermorale}"></td></tr>
 <tr><td><h4><b>XP Value:</b></h4></td><td><input type="text" name="attr_monsterxp" title="@{monsterxp}"></td></tr>
 </table>
@@ -16715,7 +16697,7 @@
 <tr><td><h4><b>Special Attacks:</b></h4></td><td><input type="text" name="attr_monsterspecattacks" title="@{repeating_monstervariants_$X_monsterspecattacks}"></td></tr>
 <tr><td><h4><b>Special Defenses:</b></h4></td><td><input type="text" name="attr_monsterspecdefenses" title="@{repeating_monstervariants_$X_monsterspecdefenses}"></td></tr>
 <tr><td><h4><b>Magic Resistance:</b></h4></td><td><input type="text" name="attr_monstermagicresist" title="@{repeating_monstervariants_$X_monstermagicresist}" class="short"><h4><b>%</b></h4><button type="roll" name="roll_monstermagicresist" title="%{repeating_monstervariants_$X_monstermagicresist}" value="/gmroll [[1d100+(?{Modifier?|0})]]<[[@{monstermagicresist}]]">Roll</button></td></tr>
-<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{repeating_monstervariants_$X_monstersize}" class="tiny"></td></tr>
+<tr><td><h4><b>Size:</b></h4></td><td><input type="text" name="attr_monstersize" title="@{repeating_monstervariants_$X_monstersize}" class="sheet-tiny"></td></tr>
 <tr><td><h4><b>Morale:</b></h4></td><td><input type="text" name="attr_monstermorale" title="@{repeating_monstervariants_$X_monstermorale}"></td></tr>
 <tr><td><h4><b>XP Value:</b></h4></td><td><input type="text" name="attr_monsterxp" title="@{repeating_monstervariants_$X_monsterxp}"></td></tr>
 </table>
@@ -16765,6 +16747,7 @@
 </fieldset>
 </div>
 
+insert_datalists.html
 
 <rolltemplate class="sheet-rolltemplate-2Edefault">
     <div class="sheet-template-container">
diff --git a/AD&D 2E Revised/raw/datalists.html b/AD&D 2E Revised/raw/datalists.html
new file mode 100644
index 0000000000..3fec6d36db
--- /dev/null
+++ b/AD&D 2E Revised/raw/datalists.html	
@@ -0,0 +1,250 @@
+<!-- Data lists -->
+<datalist id="ability-scores">
+    <option value="@{Strength}"></option>
+    <option value="@{Dexterity}"></option>
+    <option value="@{Constitution}"></option>
+    <option value="@{Intelligence}"></option>
+    <option value="@{Wisdom}"></option>
+    <option value="@{Charisma}"></option>
+</datalist>
+<datalist id="rogue-skill-macros">
+    <option value="30+(30*@{level-class1})">Rogue</option>
+    <option value="5+(15*@{level-class1})">Bard</option>
+</datalist>
+<datalist id="weapprof-macros">
+    <option value="(4+floor(@{level-class1}/3))">Warrior</option>
+    <option value="(1+floor(@{level-class1}/6))">Wizard</option>
+    <option value="(2+floor(@{level-class1}/4))">Priest</option>
+    <option value="(2+floor(@{level-class1}/4))">Rogue</option>
+</datalist>
+<datalist id="weapprof-penalty">
+    <option value="-2">Warrior</option>
+    <option value="-5">Wizard</option>
+    <option value="-3">Priest</option>
+    <option value="-3">Rogue</option>
+</datalist>
+<datalist id="weapon-proficiencies">
+    <option value="Arquebus"></option>
+    <option value="Battle axe"></option>
+    <option value="Blowgun"></option>
+    <option value="Short bow"></option>
+    <option value="Long bow"></option>
+    <option value="Composite short bow"></option>
+    <option value="Composite long bow"></option>
+    <option value="Club"></option>
+    <option value="Hand crossbow"></option>
+    <option value="Light crossbow"></option>
+    <option value="Heavy crossbow"></option>
+    <option value="Dagger / Dirk"></option>
+    <option value="Dart"></option>
+    <option value="Footman’s flail"></option>
+    <option value="Footman’s mace"></option>
+    <option value="Footman’s pick"></option>
+    <option value="Hand / Throwing axe"></option>
+    <option value="Harpoon"></option>
+    <option value="Horseman’s flail"></option>
+    <option value="Horseman’s mace"></option>
+    <option value="Horseman’s pick"></option>
+    <option value="Javelin"></option>
+    <option value="Knife"></option>
+    <option value="Heavy horse lance"></option>
+    <option value="Light horse lance"></option>
+    <option value="Jousting lance"></option>
+    <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="Quarterstaff"></option>
+    <option value="Scourge"></option>
+    <option value="Sickle"></option>
+    <option value="Sling"></option>
+    <option value="Spear"></option>
+    <option value="Staff sling"></option>
+    <option value="Bastard sword"></option>
+    <option value="Broad sword"></option>
+    <option value="Khopesh"></option>
+    <option value="Long sword"></option>
+    <option value="Scimitar"></option>
+    <option value="Short sword"></option>
+    <option value="Two-handed sword"></option>
+    <option value="Trident"></option>
+    <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>
+    <option value="Animal Training"></option>
+    <option value="Artistic Ability"></option>
+    <option value="Blacksmithing"></option>
+    <option value="Brewing"></option>
+    <option value="Carpentry"></option>
+    <option value="Cobbling"></option>
+    <option value="Cooking"></option>
+    <option value="Dancing"></option>
+    <option value="Direction Sense"></option>
+    <option value="Etiquette"></option>
+    <option value="Fire-building"></option>
+    <option value="Fishing"></option>
+    <option value="Heraldry"></option>
+    <option value="Languages, Modern"></option>
+    <option value="Leatherworking"></option>
+    <option value="Mining"></option>
+    <option value="Pottery"></option>
+    <option value="Riding, Airborne"></option>
+    <option value="Riding, Land-based"></option>
+    <option value="Rope Use"></option>
+    <option value="Seamanship"></option>
+    <option value="Seamstress/Tailor"></option>
+    <option value="Singing"></option>
+    <option value="Stonemasonry"></option>
+    <option value="Swimming"></option>
+    <option value="Weather Sense"></option>
+    <option value="Weaving"></option>
+    
+    <option value="Ancient History">Priest/Rogue/Wizard</option>
+    <option value="Animal Lore">Warrior</option>
+    <option value="Appraising">Rogue</option>
+    <option value="Armorer">Warrior</option>
+    <option value="Astrology">Priest/Wizard</option>
+    <option value="Blind-fighting">Rogue/Warrior</option>
+    <option value="Bowyer/Fletcher">Warrior</option>
+    <option value="Charioteering">Warrior</option>
+    <option value="Disguise">Rogue</option>
+    <option value="Endurance">Warrior</option>
+    <option value="Engineering">Priest/Wizard</option>
+    <option value="Forgery">Rogue</option>
+    <option value="Gaming">Rogue/Warrior</option>
+    <option value="Gem Cutting">Rogue/Wizard</option>
+    <option value="Healing">Priest</option>
+    <option value="Herbalism">Priest/Wizard</option>
+    <option value="Hunting">Warrior</option>
+    <option value="Juggling">Rogue</option>
+    <option value="Jumping">Rogue</option>
+    <option value="Languages, Ancient">Priest/Wizard</option>
+    <option value="Local History">Priest/Rogue</option>
+    <option value="Mountaineering">Warrior</option>
+    <option value="Musical Instrument">Priest/Rogue</option>
+    <option value="Navigation">Priest/Warrior/Wizard</option>
+    <option value="Reading Lips">Rogue</option>
+    <option value="Reading/Writing">Priest/Wizard</option>
+    <option value="Religion">Priest/Wizard</option>
+    <option value="Running">Warrior</option>
+    <option value="Set Snares">Rogue/Warrior</option>
+    <option value="Spellcraft">Priest/Wizard</option>
+    <option value="Survival">Warrior</option>
+    <option value="Tightrope Walking">Rogue</option>
+    <option value="Tracking">Warrior</option>
+    <option value="Tumbling">Rogue</option>
+    <option value="Ventriloquism">Rogue</option>
+    <option value="Weaponsmithing">Warrior</option>
+</datalist>
+
+<datalist id="melee-weapons">
+    <option value="Battle axe"></option>
+    <option value="Club"></option>
+    <option value="Dagger"></option>
+    <option value="Dirk"></option>
+    <option value="Dart"></option>
+    <option value="Footman’s flail"></option>
+    <option value="Footman’s mace"></option>
+    <option value="Footman’s pick"></option>
+    <option value="Hand axe"></option>
+    <option value="Harpoon"></option>
+    <option value="Horseman’s flail"></option>
+    <option value="Horseman’s mace"></option>
+    <option value="Horseman’s pick"></option>
+    <option value="Javelin"></option>
+    <option value="Knife"></option>
+    <option value="Heavy horse lance"></option>
+    <option value="Light horse lance"></option>
+    <option value="Jousting lance"></option>
+    <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="Quarterstaff"></option>
+    <option value="Scourge"></option>
+    <option value="Sickle"></option>
+    <option value="Spear"></option>
+    <option value="Bastard sword (One-handed)"></option>
+    <option value="Bastard sword (Two-handed)"></option>
+    <option value="Broad sword"></option>
+    <option value="Khopesh"></option>
+    <option value="Long sword"></option>
+    <option value="Scimitar"></option>
+    <option value="Short sword"></option>
+    <option value="Two-handed sword"></option>
+    <option value="Trident"></option>
+    <option value="Warhammer"></option>
+    <option value="Whip"></option>
+</datalist>
+
+<datalist id="ranged-weapons">
+    <option value="Arquebus"></option>
+    <option value="Blowgun (Barbed Dart)"></option>
+    <option value="Blowgun (Needle)"></option>
+    <option value="Short bow (Flight arrow)"></option>
+    <option value="Long bow (Flight arrow)"></option>
+    <option value="Long bow (Sheaf arrow)"></option>
+    <option value="Composite short bow (Flight arrow)"></option>
+    <option value="Composite long bow (Flight arrow)"></option>
+    <option value="Composite long bow (Sheaf arrow)"></option>
+    <option value="Club"></option>
+    <option value="Hand crossbow"></option>
+    <option value="Light crossbow"></option>
+    <option value="Heavy crossbow"></option>
+    <option value="Dagger"></option>
+    <option value="Dirk"></option>
+    <option value="Dart"></option>
+    <option value="Hand axe"></option>
+    <option value="Harpoon"></option>
+    <option value="Javelin"></option>
+    <option value="Knife"></option>
+    <option value="Sling (Bullet)"></option>
+    <option value="Sling (Stone)"></option>
+    <option value="Spear"></option>
+    <option value="Staff sling (Bullet)"></option>
+    <option value="Staff sling (Stone)"></option>
+    <option value="Warhammer"></option>
+</datalist>
\ No newline at end of file