diff --git a/AD&D_1E/1ESheet.css b/AD&D_1E/1ESheet.css
index 43a2a24022..c526a259da 100644
--- a/AD&D_1E/1ESheet.css
+++ b/AD&D_1E/1ESheet.css
@@ -1,25 +1,18 @@
-.wrapper {overflow: hidden; width:700px; border:1px solid black; border-collapse:collapse;}
-.wrapper.col3 .col {float:left; width:32%; margin-right: 2%; position:relative;}
-.wrapper.col3 .col.wide {float:left;width:66%;margin-right:2%;} 
-.wrapper.col3 .col.last {margin-right: 0;}
+.sheet-col label {display:block;width:100%;position:relative;height:1.8em;}
+.sheet-col label input {display:inline-block;top:0px;right:3px;position:absolute;height:100%;margin:auto 0;}
+.sheet-col label span.sheet-small {font-size:50%;}
+.sheet-col input {width:60%;}
+.sheet-thief .sheet-col input {width:20%;}
+.sheet-header {font-weight: bold;margin-top:7px;}
+.sheet-col.sheet-header{margin-top:0;}
+
+.sheet-6colrow {display:block;}
+.sheet-6colrow .sheet-col {vertical-align:top;display:inline-block;width:calc(16.67% - 30px);margin-right:30px;}
+.sheet-6colrow .sheet-col.sheet-span2 {width:calc(33.33% - 60px);float:none;}
+.sheet-6colrow .sheet-col.sheet-span3 {width:calc(50% - 90px);float:none;}
+.sheet-6colrow .sheet-col.sheet-span4 {width:calc(66.67% - 120px);float:none;}
+.sheet-6colrow .sheet-col.sheet-span5 {width:calc(83.33% - 180px);float:none;}
+.sheet-6colrow :last-child {margin-right: 0;}
 
 
-.wrapper label {display:block;width:100%;position:relative;margin:5px 0;}
-.wrapper input {display:inline-block;width:60%;position: absolute;right:0;margin:2px 0;top:0;}
-.header {font-weight: bold;}
-
-.wrapper.col6 .col {float:left; width:15%;margin-right:2%;}
-.wrapper.col6 .col.span2 {width:32%;}
-.wrapper.col6 .col.span3 {width:49%;}
-.wrapper.col6 .col.span4 {width:66%;}
-.wrapper.col6 .col.span5 {width:83%;}
-.wrapper.col6 .col.last {margin-right: 0;}
-
-label.small {font-size:70%;}
-
-table { border:1px solid black; border-collapse: collapse; width:700px;}
-table tr th,
-table tr td { border:1px solid black; border-collapse: collapse;}
-table input {width:100%;}
-
-.wrapper.thief input {width:20%;}
\ No newline at end of file
+table {width:100%;}
diff --git a/AD&D_1E/1ESheet.html b/AD&D_1E/1ESheet.html
index 6e6aa34c64..4a26a3d805 100644
--- a/AD&D_1E/1ESheet.html
+++ b/AD&D_1E/1ESheet.html
@@ -1,72 +1,70 @@
-<link rel="stylesheet" href="1ESheet.css" />
-
-<div class="header">Personal Attributes:</div>
-<div class="wrapper col3">
-    <div class="col">
+<div class="sheet-header">Personal Attributes:</div>
+<div class="sheet-3colrow">
+    <div class="sheet-col">
         <label>Name:<input type="text" name="attr_character_name" /></label>
-        <label>Class:<input type="text" name="attr_class" /></label>
-        <label>Alignment:<input type="text" name="attr_alignment" /></label>
-        <label>Race:<input type="text" name="attr_race" /></label>
-        <label>Multi-Class:<input type="text" name="attr_second_class" /></label>
+        <label>Class:<input type="text" name="attr_Class" /></label>
+        <label>Alignment:<input type="text" name="attr_Alignment" /></label>
+        <label>Race:<input type="text" name="attr_Race" /></label>
+        <label>Multi-Class:<input type="text" name="attr_SecondClass" /></label>
     </div>
-    <div class="col">
-        <label>XP:<input type="text" name="attr_xp" /></label>
-        <label>HP:<input type="text" name="attr_hit_points" /></label>
-        <label>AC:<input type="text" name="attr_armor_class" /></label>
-        <label>Level:<input type="text" name="attr_level" /></label>
-        <label>Multi-Class:<input type="text" name="attr_third_class" /></label>
+    <div class="sheet-col">
+        <label>XP:<input type="number" name="attr_XP"/></label>
+        <label>HP:<input type="number" name="attr_HitPoints"/></label>
+        <label>AC:<input type="number" name="attr_ArmorClass" /></label>
+        <label>Level:<input type="text" name="attr_Level" /></label>
+        <label>Multi-Class:<input type="text" name="attr_ThirdClass" /></label>
     </div>
-    <div class="col last">
-        <label>Age:<input type="text" name="attr_age" /></label>
-        <label>Height:<input type="text" name="attr_height" /></label>
-        <label>Weight:<input type="text" name="attr_weight" /></label>
-        <label>Sex:<input type="text" name="attr_sex" /></label>
-        <label>Movement:<input type="text" name="attr_movement" /></label>
+    <div class="sheet-col">
+        <label>Age:<input type="number" name="attr_Age"/></label>
+        <label>Height:<input type="text" name="attr_Height" /></label>
+        <label>Weight:<input type="text" name="attr_Weight" /></label>
+        <label>Sex:<input type="text" name="attr_Sex" /></label>
+        <label>Movement:<input type="text" name="attr_Movement" /></label>
     </div>
 </div>
 
-<div class="header">Personal Attributes:</div>
-<div class="wrapper col6">
-    <div class="col"><label>Str:<input type="text" name="attr_strength" /></label></div>
-    <div class="col"><label class="small">To Hit:<input type="text" name="attr_melee_bonus" /></label></div>
-    <div class="col"><label class="small">Dmg:<input type="text" name="attr_dmg_bonus" /></label></div>
-    <div class="col"><label class="small">Enc:<input type="text" name="attr_encumbrance_bonus" /></label></div>
-    <div class="col"><label class="small">Open<br />Doors:<input type="text" name="attr_minor_strength_feat" /></label></div>
-    <div class="col last"><label class="small">Bend<br />Bars:<input type="text" name="attr_major_strength_feat" /></label></div>
+<div class="sheet-header">Personal Attributes:</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col"><label>Str:<input type="number" name="attr_Strength" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">To Hit:</span><input type="text" name="attr_MeleeBonus" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Dmg:</span><input type="text" name="attr_DmgBonus" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Enc:</span><input type="text" name="attr_EncumbranceBonus" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Open<br />Doors:</span><input type="text" name="attr_MinorStrengthFeat" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Bend<br />Bars:</span><input type="text" name="attr_MajorStrengthFeat" /></label></div>
 </div>
-<div class="wrapper col6">
-    <div class="col"><label>Int:<input type="text" name="attr_intelligence" /></label></div>
-    <div class="col"><label class="small">Add.<br/>Lang:<input type="text" name="attr_bonus_languages" /></label></div>
-    <div class="col span last">&nbsp;</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col"><label>Int:<input type="number" name="attr_Intelligence" /></label></div>
+    <div class="sheet-col"><label><span class="small">Add.<br/>Lang:<input type="text" name="attr_BonusLanguages" /></label></div>
+    <div class="sheet-col sheet-span4">&nbsp;</div>
 </div>
-<div class="wrapper col6">
-    <div class="col"><label>Wis:<input type="text" name="attr_wisdom" /></label></div>
-    <div class="col"><label class="small">Mental<br/>Save:<input type="text" name="attr_mental_save_bonus" /></label></div>
-    <div class="col span4 last">&nbsp;</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col"><label>Wis:<input type="number" name="attr_Wisdom" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Mental<br/>Save:</span><input type="text" name="attr_MentalSaveBonus" /></label></div>
+    <div class="sheet-col sheet-span4">&nbsp;</div>
 </div>
-<div class="wrapper col6">
-    <div class="col"><label>Dex:<input type="text" name="attr_dexterity" /></label></div>
-    <div class="col"><label class="small">Surprise:<input type="text" name="attr_surprise_bonus" /></label></div>
-    <div class="col"><label class="small">Missile<br/>Hit:<input type="text" name="attr_ranged_bonus" /></label></div>
-    <div class="col"><label class="small">AC:<input type="text" name="attr_armor_bonus" /></label></div>
-    <div class="col span2 last">&nbsp;</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col"><label>Dex:<input type="number" name="attr_dexterity" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Surprise:</span><input type="text" name="attr_SurpriseBonus" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">Missile<br/>Hit:</span><input type="text" name="attr_RangedBonus" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">AC:</span><input type="text" name="attr_ArmorBonus" /></label></div>
+    <div class="sheet-col sheet-span2">&nbsp;</div>
 </div>
-<div class="wrapper col6">
-    <div class="col"><label>Con:<input type="text" name="attr_constitution" /></label></div>
-    <div class="col"><label class="small">HP:<input type="text" name="attr_hit_point_bonus" /></label></div>
-    <div class="col"><label class="small">System<br/>Shock:<input type="text" name="attr_system_shock" /></label></div>
-    <div class="col"><label class="small">Res.<br/>Survive:<input type="text" name="attr_resurrection" /></label></div>
-    <div class="col span2 last">&nbsp;</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col"><label>Con:<input type="number" name="attr_constitution" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">HP<br/>Bonus:</span><input type="text" name="attr_HitPointBonus" /></label></div>
+    <div class="sheet-col"><label><span class="sheet-small">System<br/>Shock:</span><input type="text" name="attr_SystemShock" /></label></div>
+    <div class="sheet-col"><label><span class="small">Res.<br/>Survive:</span><input type="text" name="attr_ResurrectionSurvival" /></label></div>
+    <div class="sheet-col sheet-span2">&nbsp;</div>
 </div>
-<div class="wrapper col6">
-    <div class="col"><label>Cha:<input type="text" name="attr_charisma" /></label></div>
-    <div class="col"><label class="small">Max<br />Hench.:<input type="text" name="attr_maximum_henchmen" /></label></div>
-    <div class="col"><label class="small">Loyalty:<input type="text" name="attr_loyalty_bonus" /></label></div>
-    <div class="col"><label class="small">React:<input type="text" name="attr_reaction_bonus" /></label></div>
-    <div class="col span2 last">&nbsp;</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col"><label>Cha:<input type="number" name="attr_Charisma" /></label></div>
+    <div class="sheet-col"><label><span class="small">Max<br />Hench.:</span><input type="text" name="attr_MaximumHenchmen" /></label></div>
+    <div class="sheet-col"><label><span class="small">Loyalty:</span><input type="text" name="attr_LoyaltyBonus" /></label></div>
+    <div class="sheet-col"><label><span class="small">React:</span><input type="text" name="attr_ReactionBonus" /></label></div>
+    <div class="sheet-col sheet-span2">&nbsp;</div>
 </div>
 
-<div class="header">Saves</div>
+<div class="sheet-header">Saves</div>
 <table class="saves">
 <tr>
     <th>Rods, Staves, and Wands</th>
@@ -76,35 +74,35 @@
     <th>Spells</th>
 </tr>
 <tr>
-    <td><input type="text" name="attr_save_rods_staves_wands" /> <button type="roll" value="/roll 1d20>@{save_rods_staves_wands" name="roll_rods_staves_wands_save">Roll</button></td>
-    <td><input type="text" name="attr_save_breath_weapons" /> <button type="roll" value="/roll 1d20>@{save_breath_weapons" name="roll_breath_weapon_save">Roll</button></td>
-    <td><input type="text" name="attr_save_paralysis_poison_death" /> <button type="roll" value="/roll 1d20>@{save_paralysis_poison_death" name="roll_paralysis_poison_death_save">Roll</button></td>
-    <td><input type="text" name="attr_save_petrification_polymorph" /> <button type="roll" value="/roll 1d20>@{save_petrification_polymorph" name="roll_petrification_polymorph_save">Roll</button></td>
-    <td><input type="text" name="attr_save_spells" /> <button type="roll" value="/roll 1d20>@{save_spell" name="roll_spell_save">Roll</button></td>
+    <td><input type="number" name="attr_SaveRodsStavesWands" /> <button type="roll" value="/roll 1d20&gt;@{SaveRodsStavesWands}" name="roll_SaveRodsStavesWands">Roll</button></td>
+    <td><input type="number" name="attr_SaveBreathWeapons" /> <button type="roll" value="/roll 1d20&gt;@{SaveBreathWeapons}" name="roll_SaveBreathWeapons">Roll</button></td>
+    <td><input type="number" name="attr_SaveParalysisPoisonDeath" /> <button type="roll" value="/roll 1d20&gt;@{SaveParalysisPoisonDeath}" name="roll_SaveParalysisPoisonDeath">Roll</button></td>
+    <td><input type="number" name="attr_SavePetrificationPolymorph" /> <button type="roll" value="/roll 1d20&gt;@{SavePetrificationPolymorph}" name="roll_SavePetrificationPolymorph">Roll</button></td>
+    <td><input type="number" name="attr_SaveSpells" /> <button type="roll" value="/roll 1d20&gt;@{SaveSpells}" name="roll_SaveSpells">Roll</button></td>
 </tr>
 </table>
 
-<div class="header">Weapons</div>
-<table class="weapons">
-<tr>
-    <th>Weapon</th>
-    <th>Damage vs S-M</th>
-    <th>Damage vs L</th>
-    <th>Rate of Fire</th>
-    <th>Range</th>
-    <th>Encumbrance</th>
-</tr>
-<tr class="repeating_weapon">
-    <td><input type="text" name="attr_weapon_name" /></td>
-    <td><input type="text" name="attr_dmg_s" /></td>
-    <td><input type="text" name="attr_dmg_l" /></td>
-    <td><input type="text" name="attr_rof" /></td>
-    <td><input type="text" name="attr_range" /></td>
-    <td><input type="text" name="attr_enc" /></td>
-</tr>
-</table>
-<div class="header">To Hit Armor Class:</div>
-<table class="to-hit">
+<div class="sheet-header">Weapons</div>
+<div class="sheet-6colrow">
+    <div class="sheet-col sheet-header">Weapon</div>
+    <div class="sheet-col sheet-header">Damage vs S-M</div>
+    <div class="sheet-col sheet-header">Damage vs L</div>
+    <div class="sheet-col sheet-header">Rate of Fire</div>
+    <div class="sheet-col sheet-header">Range</div>
+    <div class="sheet-col sheet-header">Encumbrance</div>
+</div>
+<fieldset class="repeating_weapon">
+<div class="sheet-6colrow">
+    <div class="sheet-col"><input type="text" name="attr_WeaponName" /></div>
+    <div class="sheet-col"><input type="text" name="attr_DamageSmallMedium" /></div>
+    <div class="sheet-col"><input type="text" name="attr_DamageLarge" /></div>
+    <div class="sheet-col"><input type="text" name="attr_RateOfFire" /></div>
+    <div class="sheet-col"><input type="text" name="attr_Range" /></div>
+    <div class="sheet-col"><input type="text" name="attr_Encumbrance" /></div>
+</div>
+</fieldset>
+<div class="sheet-header">To Hit Armor Class:</div>
+<table>
 <tr>
     <th>-10</th>
     <th>-9</th>
@@ -129,43 +127,43 @@
     <th>10</th>
 </tr>
 <tr>
-    <td><input type="text" name="attr_thacneg10" /></td>
-    <td><input type="text" name="attr_thacneg9" /></td>
-    <td><input type="text" name="attr_thacneg8" /></td>
-    <td><input type="text" name="attr_thacneg7" /></td>
-    <td><input type="text" name="attr_thacneg6" /></td>
-    <td><input type="text" name="attr_thacneg5" /></td>
-    <td><input type="text" name="attr_thacneg4" /></td>
-    <td><input type="text" name="attr_thacneg3" /></td>
-    <td><input type="text" name="attr_thacneg2" /></td>
-    <td><input type="text" name="attr_thacneg1" /></td>
-    <td><input type="text" name="attr_thac0" /></td>
-    <td><input type="text" name="attr_thac1" /></td>
-    <td><input type="text" name="attr_thac2" /></td>
-    <td><input type="text" name="attr_thac3" /></td>
-    <td><input type="text" name="attr_thac4" /></td>
-    <td><input type="text" name="attr_thac5" /></td>
-    <td><input type="text" name="attr_thac6" /></td>
-    <td><input type="text" name="attr_thac7" /></td>
-    <td><input type="text" name="attr_thac8" /></td>
-    <td><input type="text" name="attr_thac9" /></td>
-    <td><input type="text" name="attr_thac10" /></td>
+    <td><input type="number" name="attr_THAC-10" /></td>
+    <td><input type="number" name="attr_THAC-9" /></td>
+    <td><input type="number" name="attr_THAC-8" /></td>
+    <td><input type="number" name="attr_THAC-7" /></td>
+    <td><input type="number" name="attr_THAC-6" /></td>
+    <td><input type="number" name="attr_THAC-5" /></td>
+    <td><input type="number" name="attr_THAC-4" /></td>
+    <td><input type="number" name="attr_THAC-3" /></td>
+    <td><input type="number" name="attr_THAC-2" /></td>
+    <td><input type="number" name="attr_THAC-1" /></td>
+    <td><input type="number" name="attr_THAC0" /></td>
+    <td><input type="number" name="attr_THAC1" /></td>
+    <td><input type="number" name="attr_THAC2" /></td>
+    <td><input type="number" name="attr_THAC3" /></td>
+    <td><input type="number" name="attr_THAC4" /></td>
+    <td><input type="number" name="attr_THAC5" /></td>
+    <td><input type="number" name="attr_THAC6" /></td>
+    <td><input type="number" name="attr_THAC7" /></td>
+    <td><input type="number" name="attr_THAC8" /></td>
+    <td><input type="number" name="attr_THAC9" /></td>
+    <td><input type="number" name="attr_THAC10" /></td>
 </tr>
 </table>
-<div class="header">Thief Skills:</div>
-<div class="wrapper col3 thief">
-    <div class="col">
-        <label>Climb Walls: <input type="text" name="attr_climb_walls" /></label>
-        <label>Hide in Shadows: <input type="text" name="attr_hide_in_shadows" /></label>
-        <label>Pick Pockets: <input type="text" name="attr_pick_pockets" /></label>
+<div class="sheet-header">Thief Skills:</div>
+<div class="sheet-3colrow sheet-thief">
+    <div class="sheet-col">
+        <label>Climb Walls: <input type="number" name="attr_ClimbWalls" /></label>
+        <label>Hide in Shadows: <input type="number" name="attr_HideInShadows" /></label>
+        <label>Pick Pockets: <input type="number" name="attr_PickPockets" /></label>
     </div>
-    <div class="col">
-        <label>Find Traps: <input type="text" name="attr_find_traps" /></label>
-        <label>Move Quietly: <input type="text" name="attr_move_quietly" /></label>
-        <label>Read Languages: <input type="text" name="attr_read_languages" /></label>
+    <div class="sheet-col">
+        <label>Find Traps: <input type="number" name="attr_FindTraps" /></label>
+        <label>Move Quietly: <input type="number" name="attr_MoveQuietly" /></label>
+        <label>Read Languages: <input type="number" name="attr_ReadLanguages" /></label>
     </div>
-    <div class="col last">
-        <label>Hear Noise: <input type="text" name="attr_climb_walls" /></label>
-        <label>Open Locks: <input type="text" name="attr_open_locks" /></label>
+    <div class="sheet-col">
+        <label>Hear Noise: <input type="number" name="attr_HearNoise" /></label>
+        <label>Open Locks: <input type="number" name="attr_OpenLocks" /></label>
     </div>
 </div>
\ No newline at end of file
diff --git a/AD&D_1E/1ESheet.png b/AD&D_1E/1ESheet.png
new file mode 100644
index 0000000000..37de2ed926
Binary files /dev/null and b/AD&D_1E/1ESheet.png differ
diff --git a/AD&D_1E/sheet.json b/AD&D_1E/sheet.json
index 51b7bb834f..b6c9ea39bd 100644
--- a/AD&D_1E/sheet.json
+++ b/AD&D_1E/sheet.json
@@ -4,5 +4,5 @@
     "authors": "Adam Ness",
     "roll20userid": "5287",
     "preview": "1ESheet.png",
-    "instructions": ""
+    "instructions": "This sheet includes all of the basic stats from an AD&D 1st Edition sheet.  It is also compatible with other OSR style systems such as OSRIC. It includes roll buttons for Saving Throws."
 }