diff --git a/DnDNext/D&DNext.css b/DnDNext/D&DNext.css
index 6f4c030e00..19b69433ab 100644
--- a/DnDNext/D&DNext.css
+++ b/DnDNext/D&DNext.css
@@ -31,6 +31,7 @@
     width: calc(33% - 1px);
     margin-right: 1px;
 }
+
 .charsheet .sheet-4colrow .sheet-col {
     width: calc(23.5% - 4px);
     height: calc(100% - 1px);
@@ -42,9 +43,6 @@
     box-shadow: 0px 0px 0px 1px #000000 inset;
     font-family: "Times New Roman";
     color: #000000;
-    text-shadow: 1px 1px 3px #ffffff;
-    background: #000000;
-    background-image: url("http://freeseamlesstextures.com/images/38-vintage-paper-background-thb.jpg")
 }
 
 .charsheet input[type=number] {
@@ -53,23 +51,17 @@
     font-family: "Times New Roman";
     text-align: center;
     color: #000000;
-    text-shadow: 1px 1px 3px #ffffff;
-    background: #000000;
-    background-image: url("http://freeseamlesstextures.com/images/38-vintage-paper-background-thb.jpg")
 
 }
 
 .charsheet input[type=number].sheet-numtwo {
     display: inline-block;
     box-shadow: 0px 0px 0px 1px #000000 inset;
-    text-align: right;
+    text-align: center;
     font-size: 16px;
     font-weight: normal;
     color: #000000;
     margin-Left: 0px;
-    text-shadow: 1px 1px 3px #ffffff;
-    background: #000000;
-    background-image: url("http://freeseamlesstextures.com/images/38-vintage-paper-background-thb.jpg")
 }
 
 .charsheet select {
@@ -77,9 +69,6 @@
     box-shadow: 0px 0px 0px 1px #000000 inset;
     font-family: "Times New Roman";
     color: #000000;
-    text-shadow: 1px 1px 3px #ffffff;
-    background: #000000;
-    background-image: url("http://freeseamlesstextures.com/images/38-vintage-paper-background-thb.jpg")
 }
 
 .charsheet textarea {
@@ -90,15 +79,13 @@
     resize:none;
     font-family: "Times New Roman";
     color: #000000;
-    text-shadow: 1px 1px 3px #ffffff;
-    background: #000000;
-    background-image: url("http://freeseamlesstextures.com/images/38-vintage-paper-background-thb.jpg")
 }
 
 .charsheet button {
     display: inline-block;
-    box-shadow: 0px 0px 5px 1px #0066ff inset;
+    box-shadow: 0px 0px 1px 1px #000000 inset;
     font-family: "Times New Roman";
+    padding: 0px 0px;
 }
 
 .sheet-col strong.sheet-dee {
@@ -166,4 +153,3 @@ select.sheet-dtype {
     color: #ffffff;
 
 }
-
diff --git a/DnDNext/D&DNext.html b/DnDNext/D&DNext.html
index 4dd54fe1f1..bb8fe00b00 100644
--- a/DnDNext/D&DNext.html
+++ b/DnDNext/D&DNext.html
@@ -30,40 +30,40 @@
     </div>
 </div>
 <hr>
-<div class="sheet-4colrow">
-<div class="sheet-col" style="width: 40%;">
-        <table align="center">
+<div class="sheet-3colrow">
+<div class="sheet-col" style="width: 35%;">
+        <table  width="100%" align="left">
             <tbody>
                 <tr>
-                    <td><label>Current Hit Points</label></td>
-                    <td><input type="number" name="attr_HP" class="sheet-short" style="width: 75px;"/></td><td><label>MAX Hit Points</label></td>
-                    <td><input type="number" name="attr_HP_max" class="sheet-short" style="width: 75px;"/></td>
+                    <td><label>HP - Current</label></td>
+                    <td><input type="number" name="attr_HP" class="sheet-numtwo" style="width: 75px;"/></td><td><label>HP - Maximum</label></td>
+                    <td><input type="number" name="attr_HP_max" class="sheet-numtwo" style="width: 75px;"/></td>
                 </tr>
                 <tr>
-                    <td><label>Current Hit Dice</label></td>
-                    <td><input type="text" name="attr_HD" class="sheet-short" style="width: 75px;"></td><td><label>MAX Hit Dice</label></td>
-                    <td><input type="text" name="attr_HD_max" class="sheet-short" style="width: 75px;"></td>
+                    <td><label>HD - Current</label></td>
+                    <td><input type="text" name="attr_HD" class="sheet-short" style="width: 75px; text-align: center;"></td><td><label>HD - Maximum</label></td>
+                    <td><input type="text" name="attr_HD_max" class="sheet-short" style="width: 75px; text-align: center;"></td>
                 </tr>
                 <tr>
-                    <td><label>Armor Class</label></td>
-                    <td><input type="number" name="attr_AC" class="sheet-short" style="width: 75px;"></td><td><label>AC - No Armor</label></td>
-                    <td><input type="number" name="attr_ACNoArmor" class="sheet-short" style="width: 75px;"></td>
+                    <td><label><br>AC</label></td>
+                    <td><input type="number" name="attr_AC" class="sheet-numtwo" style="width: 75px;"></td><td><label>AC - No Armor</label></td>
+                    <td><input type="number" name="attr_ACNoArmor" class="sheet-numtwo" style="width: 75px;"></td>
                 </tr>
                 <tr>
                     <td><label><br>Speed</label></td>
-                    <td><input type="number" name="attr_Speed" class="sheet-short" style="width: 75px;"></td>
+                    <td><input type="number" name="attr_Speed" class="sheet-numtwo" style="width: 75px;"></td>
                     <td><label><br>Initiative</label></td>
-                    <td><input type="number" name="attr_Initiative" class="sheet-short" style="width: 75px;"></td>
+                    <td><input type="number" name="attr_Initiative" class="sheet-numtwo" style="width: 75px;"></td>
                 <tr>
                     <td><label><br>Vision</label></td>
                     <td><input type="text" name="attr_vision" class="sheet-short" style="width: 75px;"></td>
                     <td><label>Proficiency Bonus</label></td>
-                    <td><input type="number" name="attr_PB" value="floor((@{Level}+5)/4)" disabled="true" class="sheet-short" style="width: 75px;"></td>
+                    <td><input type="number" name="attr_PB" value="floor((@{Level}+5)/4)" disabled="true" class="sheet-numtwo" style="width: 75px;"></td>
                 </tr>
             </tbody>
         </table>
     </div>
-	<div class="sheet-col" style="width: 18%;">
+	<div class="sheet-col" style="width: 20%;">
         <table align="center">
             <tbody>
                 <tr>
@@ -114,24 +114,26 @@
         </table>
         <table  width="100%" align="right">
             <tbody>
-                <tr>
-                    <td style="text-align: left; width: 15%">Saving Throws</td>
-                        <td><textarea name="attr_savingthrows" style="height: 30px;"/></textarea></td>
+                <tr style="border: 2px solid #ffffff;">
+                    <td bgcolor="#000000" style="color: #ffffff; text-align: center; width: 15%;">Saving Throws</td>
+                        <td style="font-size: 11px; font-weight: normal;">Strength - <input type="checkbox" name="attr_pbstrsave" value="1" class="sheet-tiny"/> Dexterity - <input type="checkbox" name="attr_pbdexsave" value="1" class="sheet-tiny"/> Constitution - <input type="checkbox" name="attr_pbconsave" value="1" class="sheet-tiny"/><br>
+                        Intelligence - <input type="checkbox" name="attr_pbintsave" value="1" class="sheet-tiny"/> Wisdom - <input type="checkbox" name="attr_pbwissave" value="1" class="sheet-tiny"/> Charisma - <input type="checkbox" name="attr_pbchasave" value="1" class="sheet-tiny"/>
+                        </td>
                     </tr>
-                <tr>
-                    <td style="text-align: left;">Armor</td>
-                        <td><textarea name="attr_proarmor" style="height: 30px;"/></textarea></td>
+                <tr style="border: 2px solid #ffffff;">
+                    <td bgcolor="#000000" style="color: #ffffff; text-align: center;">Armor</td>
+                        <td><textarea name="attr_proarmor" style="height: 20px;"/></textarea></td>
                     </tr>
-                <tr>
-    	            <td style="text-align: left;">Weapons</td>
+                <tr style="border: 2px solid #ffffff;">
+    	            <td bgcolor="#000000" style="color: #ffffff;text-align: center;">Weapons</td>
                         <td><textarea name="attr_proweapons" style="height: 30px;"/></textarea></td>
                     </tr>
-                <tr>
-                    <td style="text-align: left;">Tools</td>
+                <tr style="border: 2px solid #ffffff;">
+                    <td bgcolor="#000000" style="color: #ffffff;text-align: center;">Tools</td>
                         <td><textarea name="attr_protools" style="height: 30px;"/></textarea></td>
                 </tr>
-                <tr>
-                    <td style="text-align: left;">Languages</td>
+                <tr style="border: 2px solid #ffffff;">
+                    <td bgcolor="#000000" style="color: #ffffff;text-align: center;">&nbsp;Languages&nbsp;</td>
                         <td><textarea name="attr_prolanguages" style="height: 30px"/></textarea></td>
                 </tr>
             </tbody>
@@ -151,6 +153,7 @@
                 </tr>
             </tbody>
         </table>
+
         <table width="100%" align="left">
             <tbody>
                 <tr>
@@ -169,13 +172,25 @@
                     <td><h4 style="text-align: center;">CLASS FEATURES & FEATS</h4></td>
                 </tr>
                 <tr>
-                    <td><textarea name="attr_classabilitiesandfeats" style="height: 248px;"></textarea></td>
+                    <td><textarea name="attr_classabilitiesandfeats" style="height: 250px;"></textarea></td>
                 </tr>
             </tbody>
          </table>
 	</div>
 </div>
 <hr/>
+<div class="sheet-3colrow">
+    <div class="sheet-col">
+        <h4 style="text-align: center;">IDEALS</h4><textarea name="attr_ideals" style="height: 200px;"></textarea>       
+    </div>
+    <div class="sheet-col">   
+        <h4 style="text-align: center;">BONDS</h4><textarea name="attr_bonds" style="height: 200px;"></textarea>       
+    </div>    
+    <div class="sheet-col">
+        <h4 style="text-align: center;">FLAWS</h4><textarea name="attr_flaws" style="height: 200px;"></textarea>
+    </div>
+</div>
+<hr/>
 <div>  
     <table width="100%" align="center">
             <tbody>
@@ -193,98 +208,96 @@
             <tbody>
                 <tr>
                     <td style="text-align: right;">Athletics&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-athletics" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-athletics" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-athletics" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_athletics" value="(@{pb-athletics}*@{PB})+@{StrMod}+@{ex-athletics}" class="sheet-short" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_athletics' value='Rolls an Athletics check\n/roll 1d20+@{athletics}+?{MiscMod|0}' class="sheet-short"></button></td>
+                    <td><button type='roll' name='roll_athletics' value='Athletics check. [[1d20+@{athletics}+?{MiscMod|0}]]' class="sheet-short"></button></td>
                 <tr>
                     <td style="text-align: right;">Acrobatics&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-acrobatics" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-acrobatics" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-acrobatics" value="5" class="sheet-tiny"/>Exp.</td></td>
                     <td><input type="number" name="attr_acrobatics" value="(@{pb-acrobatics}*@{PB})+@{DexMod}+@{ex-acrobatics}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_acrobatics' value='Rolls an Acrobatics check\n/roll 1d20+@{acrobatics}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_acrobatics' value='Acrobatics check. [[1d20+@{acrobatics}+?{MiscMod|0}]]'></button></td>
                 <tr>
                     <td style="text-align: right;">Sleight of Hand&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-sleightofhand" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-sleightofhand" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-sleightofhand" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_sleightofhand" value="(@{pb-sleightofhand}*@{PB})+@{DexMod}+@{ex-sleightofhand}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_sleightofhand' value='Rolls a Sleight of Hand check\n/roll 1d20+@{sleightofhand}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_sleightofhand' value='Sleight of Hand check. [[1d20+@{sleightofhand}+?{MiscMod|0}]]'></button></td>
                 </tr>
                 <tr>
                     <td style="text-align: right;">Stealth&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-stealth" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-stealth" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-stealth" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_stealth" value="(@{pb-stealth}*@{PB})+@{DexMod}+@{ex-stealth}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_stealth' value='Rolls a Stealth check\n/roll 1d20+@{stealth}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_stealth' value='Stealth check. [[1d20+@{stealth}+?{MiscMod|0}]]'></button></td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Arcana&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-arcana" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-arcana" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-arcana" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_arcana" value="(@{pb-arcana}*@{PB})+@{IntMod}+@{ex-arcana}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_arcana' value='Rolls an Arcana check\n/roll 1d20+@{arcana}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_arcana' value='Arcana check. [[1d20+@{arcana}+?{MiscMod|0}]]'></button></td>
                 </tr>
                 <tr>
         <td style="text-align: right;">History&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-history" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-history" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-history" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_history" value="(@{pb-history}*@{PB})+@{IntMod}+@{ex-history}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_history' value='Rolls a History check\n/roll 1d20+@{history}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_history' value='History check. [[1d20+@{history}+?{MiscMod|0}]]'></button></td>
                 </tr>
             </tbody>
         </table>
 	</div>
-    
     <div class="sheet-col">
-        
         <table align="center">
             <tbody>
                 <tr>
         <td style="text-align: right;">Nature&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-nature" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-nature" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-nature" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_nature" value="(@{pb-nature}*@{PB})+@{IntMod}+@{ex-nature}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_nature' value='Rolls a Nature check\n/roll 1d20+@{nature}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_nature' value='Nature check. [[1d20+@{nature}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Religion&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-religion" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-religion" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-religion" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_religion" value="(@{pb-religion}*@{PB})+@{IntMod}+@{ex-religion}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_religion' value='Rolls a Religion check\n/roll 1d20+@{religion}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_religion' value='Religion check. [[1d20+@{religion}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Search&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-search" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-search" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-search" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_search" value="(@{pb-search}*@{PB})+@{IntMod}+@{ex-search}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_search' value='Rolls a Search check\n/roll 1d20+@{search}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_search' value='Search check. [[1d20+@{search}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Animal Handling&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-animalhandling" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-animalhandling" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-animalhandling" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_animalhandling" value="(@{pb-animalhandling}*@{PB})+@{WisMod}+@{ex-animalhandling}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_animalhandling' value='Rolls an Animal Handling check\n/roll 1d20+@{animalhandling}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_animalhandling' value='Animal Handling check. [[1d20+@{animalhandling}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Insight&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-insight" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-insight" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-insight" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_insight" value="(@{pb-insight}*@{PB})+@{WisMod}+@{ex-insight}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_insight' value='Rolls an Insight check\n/roll 1d20+@{insight}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_insight' value='Insight check. [[1d20+@{insight}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Medicine&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-medicine" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-medicine" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-medicine" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_medicine" value="(@{pb-medicine}*@{PB})+@{WisMod}+@{ex-medicine}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_medicine' value='Rolls a Medicine check\n/roll 1d20+@{medicine}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_medicine' value='Medicine check. [[1d20+@{medicine}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
             </tbody>
@@ -295,50 +308,50 @@
             <tbody>
                 <tr>
         <td style="text-align: right;">Perception&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-perception" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-perception" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-perception" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_perception" value="(@{pb-perception}*@{PB})+@{WisMod}+@{ex-perception}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_perception' value='Rolls a Perception check\n/roll 1d20+@{perception}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_perception' value='Perception check. [[1d20+@{perception}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Survival&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-survival" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-survival" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-survival" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_survival" value="(@{pb-survival}*@{PB})+@{WisMod}+@{ex-survival}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_survival' value='Rolls a Survival check\n/roll 1d20+@{survival}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_survival' value='Survival check. [[1d20+@{survival}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Deception&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-deception" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-deception" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-deception" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_deception" value="(@{pb-deception}*@{PB})+@{ChaMod}+@{ex-deception}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_deception' value='Rolls a Deception check\n/roll 1d20+@{deception}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_deception' value='Deception check. [[1d20+@{deception}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Intimidation&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-intimidation" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-intimidation" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-intimidation" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_intimidation" value="(@{pb-intimidation}*@{PB})+@{ChaMod}+@{ex-intimidation}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_intimidation' value='Rolls an Intimidation check\n/roll 1d20+@{intimidation}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_intimidation' value='Intimidation check. [[d20+@{intimidation}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Performance&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-performance" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-performance" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-performance" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_performance" value="(@{pb-performance}*@{PB})+@{ChaMod}+@{ex-performance}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_performace' value='Rolls a Performance check\n/roll 1d20+@{performance}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_performace' value='Performance check. [[1d20+@{performance}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
                 <tr>
         <td style="text-align: right;">Persuasion&nbsp;</td>
-                    <td style="font-size: 10px;"><input type="checkbox" name="attr_pb-persuasion" value="1" class="sheet-tiny"/>Prof.
+                    <td style="font-size: 10px; font-weight: normal;"><input type="checkbox" name="attr_pb-persuasion" value="1" class="sheet-tiny"/>Prof.
                         <input type="checkbox" name="attr_ex-persuasion" value="5" class="sheet-tiny"/>Exp.</td>
                     <td><input type="number" name="attr_persuasion" value="(@{pb-persuasion}*@{PB})+@{ChaMod}+@{ex-persuasion}" style="width: 40px;" disabled="true"></td>
-                    <td><button type='roll' name='roll_persuasion' value='Rolls a Persuasion check\n/roll 1d20+@{persuasion}+?{MiscMod|0}'></button></td>
+                    <td><button type='roll' name='roll_persuasion' value='Persuasion check. [[1d20+@{persuasion}+?{MiscMod|0}]]'></button></td>
                     </td>
                 </tr>
             </tbody>
@@ -346,13 +359,22 @@
     </div>
 </div>
 <hr/>
-<div class="sheet-3colrow">
-        <table style="width: 100%;">
+<div class="sheet-1colrow">
+    <div>
+        <table style="width: 75%;" align="center">
             <tbody>
                 <tr>
-                    <td><button type='roll' name='roll_checkorsave' value='Attempts a ?{What type of save?} saving throw.\n/roll 1d20+?{Modifiers|0}' style="font-family: Times New Roman; font-size: 18px;"><b>Saving Throw</b></button></td>
-                    <td><button type='roll' name='roll_initiative' value='@{selected|token_name} rolls a \n/roll 1d20+@{selected|Initiative}&{tracker} for initiative!' style="font-family: Times New Roman; font-size: 18px;" title="Requires token to be selected."><b>Initiative Roll</b></button></td>
-                    <td><button type='roll' name='roll_shortrest' value='Rests, tending to their wounds and heals \n/roll ?{How Many HD (#d#?) are you using?|0} points of damage.' style="font-family: Times New Roman; font-size: 18px;"><b>Short Rest</b></button></td>
+                    <td><button type='roll' name='roll_strsave' value='/em Attempts a Strength saving throw. [[1d20+@{strsave}]]' style="width: 75px; font-family: Times New Roman; font-size: 12px;"> STR Save<input type="hidden" name="attr_strsave" value="(@{pbstrsave}*@{PB})+@{StrMod}" class="sheet-short" style="width: 1px;" disabled="true"></td></button></td>
+                    <td><button type='roll' name='roll_dexsave' value='/em Attempts a Dexterity saving throw. [[1d20+@{dexsave}]]' style="width: 75px; font-family: Times New Roman; font-size: 12px;"> DEX Save<input type="hidden" name="attr_dexsave" value="(@{pbdexsave}*@{PB})+@{DexMod}" class="sheet-short" style="width: 1px;" disabled="true"></td></button></td>
+                    <td><button type='roll' name='roll_consave' value='/em Attempts a Constitution saving throw. [[1d20+@{consave}]]' style="width: 75px; font-family: Times New Roman; font-size: 12px;"> CON Save<input type="hidden" name="attr_consave" value="(@{pbconsave}*@{PB})+@{ConMod}" class="sheet-short" style="width: 1px;" disabled="true"></td></button></td>
+                    <td><button type='roll' name='roll_shortrest' value='/em Rests for about an hour, tending to wounds, equipment and other needs. Healing [[?{How Many HD (#d#?) are you using?|0}]] points of damage.' style="width: 130px; font-family: Times New Roman; font-size: 14px;"> Take a Short Rest</button></td>
+                <tr>
+                    <td>&nbsp;</td>
+                </tr>
+                    <td><button type='roll' name='roll_wissave' value='/em Attempts a Wisdom saving throw. [[1d20+@{wissave}]]' style="width: 75px; font-family: Times New Roman; font-size: 12px;"> INT Save<input type="hidden" name="attr_intsave" value="(@{pbwissave}*@{PB})+@{IntMod}" class="sheet-short" style="width: 1px;" disabled="true"></td></button></td>
+                    <td><button type='roll' name='roll_intsave' value='/em Attempts a Intelligence saving throw. [[1d20+@{intsave}]]' style="width: 75px; font-family: Times New Roman; font-size: 12px;"> WIS Save<input type="hidden" name="attr_wissave" value="(@{pbintsave}*@{PB})+@{WisMod}" class="sheet-short" style="width: 1px;" disabled="true"></td></button></td>
+                    <td><button type='roll' name='roll_chasave' value='/em Attempts a Charisma saving throw. [[1d20+@{chasave}]]' style="width: 75px; font-family: Times New Roman; font-size: 12px;"> CHA Save<input type="hidden" name="attr_chasave" value="(@{pbchasave}*@{PB})+@{ChaMod}" class="sheet-short" style="width: 1px;" disabled="true"></td></button></td>
+                    <td><button type='roll' name='roll_initiative' value='/em @{selected|token_name} rolls a [[1d20+@{selected|Initiative}&{tracker}]] for initiative.' style="width: 130px; font-family: Times New Roman; font-size: 14px;" title="Requires the Characters Token to be selected."> Roll for Initiative</button></td>
                 </tr>
             </tbody>
         </table>
@@ -374,8 +396,8 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_weapon1"></td>
-                    <td><button type='roll' name='roll_weapon1' value='Attacks and rolls a \n/roll 1d20+@{attack1}+?{MiscMod|0}!'></button><input type="text" name="attr_attack1" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage1' value='Does \n/roll @{damage1}+?{MiscMod|0} points of damage!'></button><input type="text" name="attr_damage1" style="width: 100px;"></td>
+                    <td><button type='roll' name='roll_weapon1' value='/em Attacks with their @{weapon1}. [[1d20+@{attack1}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack1" style="width: 50px;"></td>
+                    <td><button type='roll' name='roll_damage1' value='/em does [[@{damage1}+?{MiscMod|0}]] points of damage with their @{weapon1}!'></button><input type="text" name="attr_damage1" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type1" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range1" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo1" style="width: 50px;"></td>
@@ -384,8 +406,8 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_weapon2"></td>
-                    <td><button type='roll' name='roll_weapon2' value='Attacks and rolls a \n/roll 1d20+@{attack2}+?{MiscMod|0}!'></button><input type="text" name="attr_attack2" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage2' value='Does \n/roll @{damage2}+?{MiscMod|0} points of damage!'></button><input type="text" name="attr_damage2" style="width: 100px;"></td>
+                    <td><button type='roll' name='roll_weapon2' value='/em Attacks with their @{weapon2}. [[1d20+@{attack2}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack2" style="width: 50px;"></td>
+                    <td><button type='roll' name='roll_damage2' value='/em does [[@{damage2}+?{MiscMod|0}]] points of damage with their @{weapon2}'></button><input type="text" name="attr_damage2" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type2" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range2" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo2" style="width: 50px;"></td>
@@ -394,8 +416,8 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_weapon3"></td>
-                    <td><button type='roll' name='roll_weapon3' value='Attacks and rolls a \n/roll 1d20+@{attack3}+?{MiscMod|0}!'></button><input type="text" name="attr_attack3" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage3' value='Does \n/roll @{damage3}+?{MiscMod|0} points of damage!'></button><input type="text" name="attr_damage3" style="width: 100px;"></td>
+                    <td><button type='roll' name='roll_weapon3' value='/em Attacks with their @{weapon3}. [[1d20+@{attack3}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack3" style="width: 50px;"></td>
+                    <td><button type='roll' name='roll_damage3' value='/em does [[@{damage3}+?{MiscMod|0}]] points of damage with their @{weapon3}'></button><input type="text" name="attr_damage3" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type3" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range3" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo3" style="width: 50px;"></td>
@@ -404,8 +426,8 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_weapon4"></td>
-                    <td><button type='roll' name='roll_weapon4' value='Attacks and rolls a \n/roll 1d20+@{attack4}+?{MiscMod|0}!'></button><input type="text" name="attr_attack4" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage4' value='Does \n/roll @{damage4}+?{MiscMod|0} points of damage!'></button><input type="text" name="attr_damage4" style="width: 100px;"></td>
+                    <td><button type='roll' name='roll_weapon4' value='/em Attacks with their @{weapon4}. [[1d20+@{attack4}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack4" style="width: 50px;"></td>
+                    <td><button type='roll' name='roll_damage4' value='/em does [[@{damage4}+?{MiscMod|0}]] points of damage with their @{weapon4}'></button><input type="text" name="attr_damage4" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type4" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range4" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo4" style="width: 50px;"></td>
@@ -419,7 +441,7 @@
                 <tr>
                     <td>
                         <fieldset class="repeating_weaponatk">
-                            <input type="text" name="attr_weaponname"><button type='roll' name='roll_weaponatk' value='Attacks and rolls a \n/roll 1d20+@{weaponatk}+?{MiscMod|0}!'></button><input type="text" name="attr_weaponatk" style="width: 50px;"><button type='roll' name='roll_weapondmg' value='Does \n/roll @{weapondmg}+?{MiscMod|0} points of damage!' stye="margin: 0px;"></button><input type="text" name="attr_weapondmg" style="width: 100px;"><input type="text" name="attr_weapontype" style="width: 50px;"><input type="text" name="attr_weaponrange" style="width: 75px;"><input type="text" name="attr_weaponammo" style="width: 50px;"><input type="text" name="attr_weaponproperties"><input type="text" name="attr_weaponweight" style="width: 50px;">
+                            <input type="text" name="attr_weapon5"><button type='roll' name='roll_weapon5' value='/em Attacks with their @{weapon5}. [[1d20+@{weaponatk}+?{MiscMod|0}]]!'></button><input type="text" name="attr_weaponatk" style="width: 50px;"><button type='roll' name='roll_weapondmg5' value='/em does [[@{damage5}+?{MiscMod|0}]] points of damage with their @{weapon5}!'></button><input type="text" name="attr_damage5" style="width: 100px;"><input type="text" name="attr_weapontype" style="width: 50px;"><input type="text" name="attr_weaponrange" style="width: 75px;"><input type="text" name="attr_weaponammo" style="width: 50px;"><input type="text" name="attr_weaponproperties"><input type="text" name="attr_weaponweight" style="width: 50px;">
                         </fieldset>
                     </td>
                 </tr>
@@ -463,7 +485,7 @@
 </div>
 <hr/>
 <div>
-<h4 style="text-align: center; ">SPELLCASTING</h4>    
+<h4 style="text-align: center; ">SPELLCASTING</h4>
 </div>
 <br>
 <div class="sheet-3colrow">
@@ -543,30 +565,30 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell1" style="width: 100px"></td>
-                    <td><button type='roll' name='roll_spell1' value='Attempts to hit with a spell rolling a \n/roll 1d20+@{spell1}+?{MiscMod|0}!'></button></td>
+                    <td><button type='roll' name='roll_spell1' value='/em casts @{aspell1}. [[1d20+@{spell1}+?{MiscMod|0}]]!'></button></td>
                     <td><input type="number" name="attr_spell1" style="width: 40px"></td>
-                    <td><button type='roll' name='roll_spell1' value='Does \n/roll @{spdmg1}+?{MiscMod|0} points of damage!'></button></td>
+                    <td><button type='roll' name='roll_spell1' value='/em does [[@{spdmg1}+?{MiscMod|0}]] points of damage with @{aspell1}!'></button></td>
                     <td><input type="text" name="attr_spdmg1" style="width: 50px"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell2" style="width: 100px"></td>
-                    <td><button type='roll' name='roll_spell2' value='Attempts to hit with a spell rolling a \n/roll 1d20+@{spell2}+?{MiscMod|0}!'></button></td>
+                    <td><button type='roll' name='roll_spell2' value='/em casts @{aspell2}. [[1d20+@{spell2}+?{MiscMod|0}]]!'></button></td>
                     <td><input type="number" name="attr_spell2" style="width: 40px"></td>
-                    <td><button type='roll' name='roll_spell2' value='Does \n/roll @{spdmg2}+?{MiscMod|0} points of damage!'></button></td>
+                    <td><button type='roll' name='roll_spell2' value='/em does [[@{spdmg2}+?{MiscMod|0}]] points of damage with @{aspell2}!'></button></td>
                     <td><input type="text" name="attr_spdmg2" style="width: 50px"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell3" style="width: 100px"></td>
-                    <td><button type='roll' name='roll_spell3' value='Attempts to hit with a spell rolling a \n/roll 1d20+@{spell3}+?{MiscMod|0}!'></button></td>
+                    <td><button type='roll' name='roll_spell3' value='/em casts @{aspell3}. [[1d20+@{spell3}+?{MiscMod|0}]]!'></button></td>
                     <td><input type="number" name="attr_spell3" style="width: 40px"></td>
-                    <td><button type='roll' name='roll_spell3' value='Does \n/roll @{spdmg3}+?{MiscMod|0} points of damage!'></button></td>
+                    <td><button type='roll' name='roll_spell3' value='/em does [[@{spdmg3}+?{MiscMod|0}]] points of damage with @{aspell3}!'></button></td>
                     <td><input type="text" name="attr_spdmg3" style="width: 50px"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell4" style="width: 100px"></td>
-                    <td><button type='roll' name='roll_spell4' value='Attempts to hit with a spell rolling a \n/roll 1d20+@{spell4}+?{MiscMod|0}!'></button></td>
+                    <td><button type='roll' name='roll_spell4' value='/em casts @{aspell4}. [[1d20+@{spell4}+?{MiscMod|0}]]!'></button></td>
                     <td><input type="number" name="attr_spell4" style="width: 40px"></td>
-                    <td><button type='roll' name='roll_spell4' value='Does \n/roll @{spdmg4}+?{MiscMod|0} of damage!'></button></td>
+                    <td><button type='roll' name='roll_spell4' value='/em does [[@{spdmg4}+?{MiscMod|0}]] points of damage with @{aspell4}!'></button></td>
                     <td><input type="text" name="attr_spdmg4" style="width: 50px"></td>
                 </tr>
             </tbody>
@@ -590,12 +612,12 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_hspell1" style="width: 100px"></td>
-                    <td><button type='roll' name='roll_hspelld1' value='/roll @{hspelld1}+?{MiscMod|0} hit points are healed!'></button></td>
+                    <td><button type='roll' name='roll_hspelld1' value='/em casts @{hspell1} and heals their subject for [[@{hspelld1}+?{MiscMod|0}]] Hit Points.'></button></td>
                     <td><input type="text" name="attr_hspelld1" style="width: 50px;"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_hspell2" style="width: 100px"></td>
-                    <td><button type='roll' name='roll_hspelld2' value='/roll @{hspelld2}+?{MiscMod|0} hit points are healed!'></button></td>
+                    <td><button type='roll' name='roll_hspelld2' value='/em casts @{hspell2} and heals their subject for [[@{hspelld2}+?{MiscMod|0}]] Hit Points.'></button></td>
                     <td><input type="text" name="attr_hspelld2" style="width: 50px;"></td>
                 </tr>
             </tbody>
@@ -673,15 +695,3 @@
         </table>
     </div>
 </div>
-<hr/>
-<div class="sheet-3colrow">
-    <div class="sheet-col">
-        <h4 style="text-align: center;">IDEALS</h4><textarea name="attr_ideals" style="height: 200px;"></textarea>       
-    </div>
-    <div class="sheet-col">   
-        <h4 style="text-align: center;">BONDS</h4><textarea name="attr_bonds" style="height: 200px;"></textarea>       
-    </div>    
-    <div class="sheet-col">
-    	<h4 style="text-align: center;">FLAWS</h4><textarea name="attr_flaws" style="height: 200px;"></textarea>
-	</div>
-</div>
diff --git a/DnDNext/dndnext.JPG b/DnDNext/dndnext.JPG
new file mode 100644
index 0000000000..ee50414aaa
Binary files /dev/null and b/DnDNext/dndnext.JPG differ
diff --git a/DnDNext/dndnext.jpg b/DnDNext/dndnext.jpg
index e12c2a37d1..ee50414aaa 100644
Binary files a/DnDNext/dndnext.jpg and b/DnDNext/dndnext.jpg differ