diff --git a/D&D_3-5/charsheet_3-5.html b/D&D_3-5/charsheet_3-5.html
index 81abb53a96..5283382afb 100644
--- a/D&D_3-5/charsheet_3-5.html
+++ b/D&D_3-5/charsheet_3-5.html
@@ -2,7 +2,7 @@
 <!-- by Diana P. -->
 <!-- based on Pathfinder sheets from Barry R., Sam, Brian, and Justin N. -->
 <!-- with lots of help from Toby-->
-<!-- Version 1.5.7 3/10/15 (Roll Templates)-->
+<!-- Version 1.5.8 3/13/15 (Roll Templates)-->
 <!-- Header / Character Description -->
 <div style="float: left">
 <table border="0">
@@ -193,16 +193,17 @@
                 <table>
                     <tr>
                         <td style="width: 38px;" class="sheet-statlabel">AC<br><div style="font-size: 0.65em;">Armor Class</div></td>
-						<td><input class="sheet-inputbox" type="text" name="attr_armorclass" title="armorclass" value="(10+@{armorclassbonus}+@{shieldbonus}+@{armorclassdexmod}+@{size}+@{armorclassnaturalarmor}+@{armorclassdeflectionmod}+@{armorclassmiscmod})" disabled="true" style="height: 24px; width: 40px;"><br><div style="font-size: 0.5em;">Total</div></td>
+						<td><input class="sheet-inputbox" type="text" name="attr_armorclass" title="armorclass" value="(10+@{armorclassbonus}+@{shieldbonus}+@{armorclassdexmod}+@{size}+@{armorclassdodgemod}+@{armorclassnaturalarmor}+@{armorclassdeflectionmod}+@{armorclassmiscmod})" disabled="true" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Total</div></td>
                         <td>=10+<br><br></td>
-                        <td><input class="sheet-inputbox" type="text"  name="attr_armorclassbonus" title="armorclassbonus (from AC items section below)"  value="@{acitembonus}" disabled="true" style="height: 24px; width: 35px;" value="0"><br><div style="font-size: 0.5em;">Armor Bonus</div></td>
-                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassshieldbonus" title="armorclassshieldbonus (from AC items section below)" value="@{shieldbonus}" disabled="true" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Shield</div></td>
-						<td>+<input class="sheet-inputbox" type="text" name="attr_armorclassdexmod" title="armorclassdexmod (either dex-mod or max dex from AC items section below; whichever is lower)" value="(ceil((@{dex-mod}-@{acitemdex})/1e10)*@{acitemdex} - floor((@{dex-mod}-@{acitemdex}-1)/1e10)*@{dex-mod})" disabled="true" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Dex Mod</div></td>
+                        <td><input class="sheet-inputbox" type="text"  name="attr_armorclassbonus" title="armorclassbonus (from AC items section below)"  value="@{acitembonus}" disabled="true" style="height: 24px; width: 28px;" value="0"><br><div style="font-size: 0.5em;">Armor Bonus</div></td>
+                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassshieldbonus" title="armorclassshieldbonus (from AC items section below)" value="@{shieldbonus}" disabled="true" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Shield</div></td>
+						<td>+<input class="sheet-inputbox" type="text" name="attr_armorclassdexmod" title="armorclassdexmod (either dex-mod or max dex from AC items section below; whichever is lower)" value="(ceil((@{dex-mod}-@{acitemdex})/1e10)*@{acitemdex} - floor((@{dex-mod}-@{acitemdex}-1)/1e10)*@{dex-mod})" disabled="true" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Dex Mod</div></td>
 							<!--Special Thanks to Aaron I. for the dex/maxdex calculation!-->
-                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclasssizemod" title="armorclasssizemod" value="@{size}" disabled="true" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Size Mod</div></td>
-                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassnaturalarmor" title="armorclassnaturalarmor" value="0" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Natural Armor</div></td>
-                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassdeflectionmod" title="armorclassdeflectionmod" value="0" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Deflection Mod</div></td>
-                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassmiscmod" title="armorclassmiscmod" value="0" style="height: 24px; width: 35px;"><br><div style="font-size: 0.5em;">Misc Mod</div></td>
+                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclasssizemod" title="armorclasssizemod" value="@{size}" disabled="true" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Size Mod</div></td>
+                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassdodgemod" title="armorclassdodgemod" value="0" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Dodge</div></td>
+                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassnaturalarmor" title="armorclassnaturalarmor" value="0" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Nat. Armor</div></td>
+                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassdeflectionmod" title="armorclassdeflectionmod" value="0" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Deflection</div></td>
+                        <td>+<input class="sheet-inputbox" type="text" name="attr_armorclassmiscmod" title="armorclassmiscmod" value="0" style="height: 24px; width: 28px;"><br><div style="font-size: 0.5em;">Misc Mod</div></td>
                     </tr>
                 </table>
             </td>
@@ -212,7 +213,7 @@
                 <table>
                     <tr>
                         <td style="width: 70px; height: 24px;" class="sheet-statlabel">TOUCH<br><div style="font-size: 0.65em;">Armor Class</div></td>
-						<td valign="top"><input class="sheet-inputbox" type="text" style="width: 45px;" name="attr_touchac" title="touchac" value="(10+@{armorclassdexmod}+@{size}+@{armorclassdeflectionmod}+@{armorclassmiscmod})" disabled="true" style="height: 24px; width: 40px;"> &nbsp; </td>
+						<td valign="top"><input class="sheet-inputbox" type="text" style="width: 45px;" name="attr_touchac" title="touchac" value="(10+@{armorclassdexmod}+@{size}+@{armorclassdodgemod}+@{armorclassdeflectionmod}+@{armorclassmiscmod})" disabled="true" style="height: 24px; width: 40px;"> &nbsp; </td>
                         <td style="width: 70px;" class="sheet-statlabel">FLAT-FOOTED<br><div style="font-size: 0.65em;">Armor Class</div></td>
 						<td valign="top"><input class="sheet-inputbox" type="text" style="width: 45px;" name="attr_flatac" title="flatac" value="(10+@{armorclassbonus}+@{shieldbonus}+@{size}+@{armorclassnaturalarmor}+@{armorclassdeflectionmod}+@{armorclassmiscmod})" disabled="true" style="height: 24px; width: 50px;"></td>
                         <td valign="top"> &nbsp; &nbsp; <input class="sheet-inputbox" type="text" name="attr_damagereduction" title="damagereduction" style="height: 24px; width: 80px;"><br><div style="font-size: 0.65em;">Damage Reduction</div></td>
@@ -1561,7 +1562,7 @@ fourth attack hits AC[[1d20+(@{bab4})[bab4] +@{weapon1stat}[Ability] +@{size}[si
 							<input type="text" style="width: 25px;" name="attr_casterlevel" title="casterlevel" value="1" class="sheet-table-row-small">/
 							<input type="text" style="width: 25px;" name="attr_casterlevel2" title="casterlevel2" value="0" class="sheet-table-row-small">
 						</td>
-						<td class="sheet-table-header3" style="width: 90%;">Spells/Day:<br>
+						<td class="sheet-table-header3" colspan="2" style="width: 90%;">Spells/Day:<br>
 							&nbsp; &nbsp; &nbsp; &nbsp; 0:<input type="text" name="attr_spells0" title="spells0" value="0" class="sheet-table-row-small">
 							&nbsp; &nbsp; 1st:<input type="text" name="attr_spells1" title="spells1" value="0" class="sheet-table-row-small">
 							&nbsp; &nbsp; 2nd:<input type="text" name="attr_spells2" title="spells2" value="0" class="sheet-table-row-small">
@@ -1586,7 +1587,7 @@ fourth attack hits AC[[1d20+(@{bab4})[bab4] +@{weapon1stat}[Ability] +@{size}[si
 								<option type="text" style="width: 45px;" value="@{cha-mod}">Cha</option>
 							</select>
 						</td>
-						<td class="sheet-table-header3" style="width: 90%;">Spell DC's<br>
+						<td class="sheet-table-header3" colspan="2" style="width: 90%;">Spell DC's<br>
 							&nbsp; &nbsp; &nbsp; &nbsp; 0:<input type="text" name="attr_spelldc0" title="spelldc0" value="(10+0+@{spellcastingstat})" disabled="true" class="sheet-table-row-small">
 							&nbsp; &nbsp; 1st:<input type="text" name="attr_spelldc1" title="spelldc1" value="(10+1+@{spellcastingstat})" disabled="true" class="sheet-table-row-small">
 							&nbsp; &nbsp; 2nd:<input type="text" name="attr_spelldc2" title="spelldc2" value="(10+2+@{spellcastingstat})" disabled="true" class="sheet-table-row-small">
@@ -1604,7 +1605,7 @@ fourth attack hits AC[[1d20+(@{bab4})[bab4] +@{weapon1stat}[Ability] +@{size}[si
 						<td class="sheet-table-header3" style="width: 10%; border: 1px solid black;">Spell Pen:<br>
 							<input type="text" style="width: 25px;" name="attr_spellpen" title="spellpen" value="0" class="sheet-table-row-small">
 						</td>
-						<td class="sheet-table-header3" style="width: 90%;">Spell Focus:<br>
+						<td class="sheet-table-header3" style="width: 75%;">Spell Focus:<br>
 							Abjuration:<input type="text" name="attr_sf-abjuration" title="sf-abjuration" value="0" class="sheet-table-row-small">
 							&nbsp; &nbsp; &nbsp; Conjuration:<input type="text" name="attr_sf-conjuration" title="sf-conjuration" value="0" class="sheet-table-row-small">
 							&nbsp; &nbsp; &nbsp; Divination:<input type="text" name="attr_sf-divination" title="sf-divination" value="0" class="sheet-table-row-small">
@@ -1613,7 +1614,9 @@ fourth attack hits AC[[1d20+(@{bab4})[bab4] +@{weapon1stat}[Ability] +@{size}[si
 							&nbsp; &nbsp; &nbsp; Illusion:<input type="text" name="attr_sf-illusion" title="sf-illusion" value="0" class="sheet-table-row-small">
 							&nbsp; &nbsp; &nbsp; Necromancy:<input type="text" name="attr_sf-necromancy" title="sf-necromancy" value="0" class="sheet-table-row-small">
 							&nbsp; &nbsp; &nbsp; Transmutation:<input type="text" name="attr_sf-transmutation" title="sf-transmutation" value="0" class="sheet-table-row-small">
-							
+						</td>
+						<td class="sheet-table-header3" style="width: 10%; border: 1px solid black;"><br>Power Points<br>
+							<div><input type="text" name="attr_powerpoints" title="powerpoints" style="width: 30px; text-align: right;">/<input type="text" name="attr_powerpoints_max" title="powerpoints|max" style="width: 30px;"></div>
 						</td>
 					</tr>
 				</table>