diff --git a/Generation/genCharR20sheet.html b/Generation/genCharR20sheet.html
index 43cf83a4a0..7a7c9371b2 100644
--- a/Generation/genCharR20sheet.html
+++ b/Generation/genCharR20sheet.html
@@ -67,9 +67,9 @@
     </div>
     <div>
         <b>Age</b>
-            <input type="number" name="attr_Age" value="@{attr_Age}" title="Character Age" style='width:  50px;' max=500 min=0 />
+            <input type="number" name="attr_Age" value="@{attr_Age}" title="Character Age" style='width:  55px;' max=500 min=0 />
         <b>Manna Training</b>    
-            <input type="number" name="attr_Char_Manna_Training" value=0 style='width:  50px;' max=100 min=0/>
+            <input type="number" name="attr_Char_Manna_Training" value=0 style='width:  55px;' max=100 min=0/>
         <b>Difficulty</b>
             <input name="attr_Difficulty" value="@{attr_Difficulty}" title="Character Difficulty" readonly="readonly" />
     </div>
@@ -81,24 +81,28 @@
             <div style='display: inline'>
                 <button type='action' name='act_add_constitution' style="padding: 0; font-family: 'Pictos'">{</button>
                 <button type='action' name='act_minus_constitution' style="padding: 0; font-family: 'Pictos'">}</button>
+                <button type="roll" value="/roll 1d6 + @{char_constitution}" name="roll_constitution"></button>
             </div>
             <br>
             <b>Discipline:</b><input name="attr_char_discipline" value="@{attr_char_discipline}" title="discipline" readonly="readonly" max="10" min="0" />
             <div style='display: inline'>
                 <button type='action' name='act_add_discipline' style="padding: 0; font-family: 'Pictos'">{</button>
                 <button type='action' name='act_minus_discipline' style="padding: 0; font-family: 'Pictos'">}</button>
+                <button type="roll" value="/roll 1d6 + @{char_discipline}" name="roll_discipline"></button>
             </div>
             <br>
             <b>Resistance:</b><input name="attr_char_resistance" value="@{attr_char_resistance}" title="resistance" readonly="readonly" max="10" min="0" />
             <div style='display: inline'>
                 <button type='action' name='act_add_resistance' style="padding: 0; font-family: 'Pictos'">{</button>
                 <button type='action' name='act_minus_resistance' style="padding: 0; font-family: 'Pictos'">}</button>
+                <button type="roll" value="/roll 1d6 + @{char_resistance}" name="roll_resistance"></button>  
             </div>
             <br>
             <b>Intelligence:</b><input name="attr_char_intelligence" value="@{attr_char_intelligence}" title="intelligence" readonly="readonly" max="10" min="0" />
             <div style='display: inline'>
                 <button type='action' name='act_add_intelligence' style="padding: 0; font-family: 'Pictos'">{</button>
                 <button type='action' name='act_minus_intelligence' style="padding: 0; font-family: 'Pictos'">}</button>
+                <button type="roll" value="/roll 1d6 + @{char_intelligence}" name="roll_intelligence"></button>
             </div>
             <br>
             <br>
@@ -188,18 +192,19 @@
     </div>
     <br>
     <label style='text-align:  center'>VITALITY & STATUS</label>
-    <span>Life-Force:</span><input type="number" name="attr_Char_Life_Force" value="@{attr_Char_Life_Force}" title="Life-Force"  />
-    <span>Spirit:</span><input type="number" name="attr_Char_Spirit_Force" value="200" title="Spirit" style='width:  50px;' max=500 min=0 />
-    <span>Soul:</span><input type="number" name="attr_Char_Soul_Force" value="300" title="Soul" style='width:  50px;' max=1000 min=0 />
-    <span>Manna:</span><input type="number" name="attr_Char_Manna" value="@{attr_Char_Manna}" title="Manna" />
+    <span>Life-Force:</span><input type="number" name="attr_Char_Life_Force" value="@{attr_Char_Life_Force}" style='width:  55px;' title="Life-Force"  />
+    <span>Spirit:</span><input type="number" name="attr_Char_Spirit_Force" value="200" title="Spirit" style='width:  55px;' max=500 min=0 />
+    <span>Soul:</span><input type="number" name="attr_Char_Soul_Force" value="300" title="Soul" style='width:  55px;' max=1000 min=0 />
+    <span>Manna:</span><input type="number" name="attr_Char_Manna" value="@{attr_Char_Manna}" title="Manna" style='width:  55px;' />
     <div class='sheet-demon' style='display: inline-block'>
-        <span>Demonic Essence:</span><input type="number" name="attr_Char_Demon" value="@{attr_Char_Demon}" title="Demonic Essence" />
+        <span>Demonic Essence:</span><input type="number" name="attr_Char_Demon" value="@{attr_Char_Demon}" title="Demonic Essence" style='width:  55px;'/>
     </div>
-    <span>Disruption:</span><input type="number" name="attr_Disruption" value="@{attr_Disruption}" title="Disruption Meter"  />
-    <span>Pain:</span><input type="number" name="attr_Pain" value="@{attr_Pain}" title="Pain Meter" />
+    <span>Disruption:</span><input type="number" name="attr_Disruption" value="@{attr_Disruption}" title="Disruption Meter"  style='width:  55px;'/>
+    <span>Pain:</span><input type="number" name="attr_Pain" value="@{attr_Pain}" title="Pain Meter" style='width:  55px;'/>
     <input type='hidden' name="attr_Capacity" value="@{attr_Capacity}" title="Mental Capacity" readonly="readonly"  />
     <br>
     <span>TTT:</span><input name="attr_Char_TTT" value="@{attr_Char_TTT}" title="Turn-to-Turn Cost (TTT)" readonly="readonly" />
+    <span>(Additional TTT):</span><input type='number' value='0'/>
     <br>
     <label>Conditions:
         <input type='radio' name='attr_airborn' value='1'><span>Airborn</span>
@@ -240,14 +245,14 @@
         <div class='col'>
             <label>Weapon Arts</label>
             <br>
+            <b>Style:</b><input name="attr_weapon_style" value="@{attr_weapon_style}" title="Current Style" readonly="readonly"/>
+            <br>
             <b>Acc:</b><input name="attr_weapon_acc" value="@{attr_weapon_acc}" title="Total Accuracy" readonly="readonly"/>
             <br>
             <b>Eva:</b><input name="attr_weapon_eva" value="@{attr_weapon_eva}" title="Total Evasion" readonly="readonly"/>
             <br>
             <b>GG:</b><input name="attr_weapon_gg" value="@{attr_weapon_gg}" title="Total Guard Gauge" readonly="readonly"/>
             <br>
-            <b>Style:</b><input name="attr_weapon_style" value="@{attr_weapon_style}" title="Current Style" readonly="readonly"/>
-            <br>
             <b>Comp:</b><input name="attr_style-types" value="@{attr_style-types}" title="Style Compatibility" readonly="readonly" />
             <br>
             <br>
@@ -270,12 +275,12 @@
             <br>
             <span name="attr_armor-warning"></span>
             <label>Combat Arts</label>
+            <b>Style:</b><input name="attr_combat_style" value="@{attr_combat_style}" title="Current Style" readonly="readonly"/>
+            <b>Scale:</b><input name="attr_combat_scaling" value="@{attr_combat_scaling}" title= "Scaling (P/N)" readonly="readonly"/>
             <b>Base:</b><input name="attr_combat_base" value="@{attr_combat_base}" title="Base Damage" readonly="readonly"/>
             <b>Acc:</b><input name="attr_combat_acc" value="@{attr_combat_acc}" title="Total Accuracy" readonly="readonly"/>
             <b>Eva:</b><input name="attr_combat_eva" value="@{attr_combat_eva}" title="Total Evasion" readonly="readonly"/>
             <b>GG:</b><input name="attr_combat_gg" value="@{attr_combat_gg}" title="Total Guard Gauge" readonly="readonly"/>
-            <b>Name:</b><input name="attr_combat_style" value="@{attr_combat_style}" title="Current Style" readonly="readonly"/>
-            <b>Scale:</b><input name="attr_combat_scaling" value="@{attr_combat_scaling}" title= "Scaling (P/N)" readonly="readonly"/>
         </div>
         <div class='col'>
             <label>Catalysts</label>
@@ -461,7 +466,7 @@
             <option>Demonic</option>
         </select>
         <input type='text' name='attr_passive-requirement' title='Requirement' placeholder="Requirement"/>
-        <textarea name="attr_passive-text" placeholder="description"></textarea>
+        <textarea name="attr_passive-text" placeholder="description" style='width: 95%'></textarea>
     </fieldset>
 </div>
 
@@ -470,7 +475,7 @@
         <input type='text' name='attr_inventory-name' title='Name' placeholder="Name"/>
         <input type='text' name='attr_inventory-quantity' title='Quantity of Item' placeholder="Quantity"/>
         <input type='text' name='attr_inventory-mental-mass' title='Mental Weight' placeholder="Mental Mass"/>
-        <textarea name="attr_inventory-text" placeholder="description"></textarea>
+        <textarea name="attr_inventory-text" placeholder="description" style='width: 95%'></textarea>
     </fieldset>
 </div>
 
@@ -503,7 +508,7 @@
                 <br>
                 <b>Acc:</b><input type='text' name='attr_weapon-acc' value='' title="Accuracy" placeholder="Accuracy Rating" />
                 <br>
-                <b>Demonic:</b><select name='attr_armor-weapon'>
+                <b>Demonic:</b><select name='attr_armor-weapon' value='NO'>
                 <option value="true">YES</option>
                 <option value="false">NO</option>
                 </select>
@@ -545,7 +550,7 @@
             <br>
             <b>Stress:</b><input type='text' name='attr_armor-stress' value='' title="Stress Tolerance" placeholder="Stress"/>
             <br>
-            <b>Demonic:</b><select name='attr_armor-demon'>
+            <b>Demonic:</b><select name='attr_armor-demon' value='NO'>
                 <option value="true">YES</option>
                 <option value="false">NO</option>
             </select>
@@ -578,6 +583,7 @@
                         </button>
                     
                         <br>
+                        <b>Lv: </b>
                         <select name="attr_module-level">
                             <option value='1'>1</option>
                             <option value='2'>2</option>
@@ -587,6 +593,8 @@
                             <option value='6'>6</option>
                         </select>
                         <br>
+                        <br>
+                        <b>Mod: </b>
                         <div class="sheet-assault" >
                         <select name='attr_module-form' />
                             <option value='N'>None</option>
@@ -738,10 +746,10 @@
 </div>
 
 <div class='sheet-spells'>
-    <div style='justify-content: center;'>
+    <div style='text-align: center; margin-left: auto; margin-right: auto;'>
         <br>
         <label>Spell Techniques</label>
-        <table border="1">
+        <table border="1" style='width: 95%'>
             <tr>
                 <td>
                     <span>Speed Cast</span><input type='checkbox' name='attr_spell-speed' title="" />
@@ -837,6 +845,7 @@
             <option value='Godden Magic'>Godden Magic</option>
         </select>
         <b>Branch:</b><input type='text' name='attr_spells-branch' title='School Branch' placeholder="School Branch"/>
+        <br>
         <b>Mastery:</b><select name='attr_spells-mastery' value='N/A'/>
             <option value='N/A'>N/A</option>
             <option>Novice</option>
@@ -851,12 +860,51 @@
             <option value='Cataclysmic'>Cataclysmic</option>
         </select>
         <b>Cost:</b><input type='text' name='attr_spells-cost' title='Spell Cost' placeholder="Spell Cost"/>
+        <br>
         <b>Cast-Time:</b><input type='text' name='attr_spells-cast-time' title="Cast Time" placeholder="Cast Time"/>
-        <textarea name="attr_inventory-text" placeholder="description"></textarea>
+        <textarea name="attr_inventory-text" placeholder="description" style='width: 95%'></textarea>
     </fieldset>
 </div>
 
 <div class='sheet-energytechniques'>
+    <br>
+    <label>Defaults:</label>
+    <div class='2colrow'>
+        <div class='col'>
+            <b>Mental</b>
+            <ul>
+            <li>Cognitive Telekinesis (Req: 5)</li>
+                <ul>
+                    <li>Base: 0</li>
+                    <li>Power Cap: 2</li>
+                    <li>Cost 3 (TTT)</li>
+                </ul>
+            </ul>
+        </div>
+        <div class='col'>
+        <b>Body (Scaling: 20%/25%)</b>
+        <ul>
+            <li>Light Form (Req: 5)</li>
+            <ul>
+                <li>Base: 8</li>
+                <li>Cost: 10</li>
+            </ul>
+            <li>Heavy Form (Req: 10)</li>
+            <ul>
+                <li>Base: 40</li>
+                <li>Cost: 35</li>
+                <li>Small AOE</li>
+            </ul>
+            <li>Immense Form (Req: 15)</li>
+            <ul>
+                <li>Base: 80</li>
+                <li>Cost: 65</li>
+                <li>Moderate AOE</li>
+            </ul>
+        </ul>
+        </div>
+    </div>
+    <br>
     <fieldset class="repeating_energytech"> 
         <b>Name:</b><input type='text' name='attr_etech-name' title='Name' placeholder="Name"/>
         <b>Req:</b><select name='attr_etech-requirement' title='Requirement'/>
@@ -888,8 +936,10 @@
             <option>2</option>
             <option>3</option>
         </select>
+        <br>
         <b>Cost:</b><input type='text' name='attr_etech-cost' title='Cost' placeholder="Cost"/>
-        <textarea name="attr_etech-text" placeholder="description"></textarea>
+        <br>
+        <textarea name="attr_etech-text" placeholder="description" style='width: 95%'></textarea>
     </fieldset>
 </div>
 
@@ -961,9 +1011,9 @@
             <lable for="Parry">Parry</lable>
         </div>
         <br>
-        <b>Base:</b><input type='number' name='attr_meleetech-base' value='' title='Base Damage Bonus' placeholder="Base" max='50' min='0'/>
-        <b>Cost/Cooldown:</b><input type='text' name='attr_meleetech-cost' value='' title='Cost' placeholder="Cost: (Durability/Cooldown)"/>
-        <textarea name="attr_meleetech-text" placeholder="description"></textarea>
+        <b>Base:</b><input type='number' name='attr_meleetech-base' value='' title='Base Damage Bonus' placeholder="Base" max='50' min='0' style='width: 55px'/>
+        <b>Cost/Cooldown:</b><input type='text' name='attr_meleetech-cost' value='' title='Cost' placeholder="Numbers ONLY"/>
+        <textarea name="attr_meleetech-text" placeholder="description" style='width: 95%'></textarea>
     </fieldset>
 </div>
 
@@ -979,7 +1029,7 @@
             <option value='Celestial'>Celestial</option>
         </select>
         <input type='text' name='attr_training-req' value='' title='Requirement' placeholder="Requirement"/>
-        <textarea name="attr_training-text" placeholder="STILL IN DEVELOPEMENT"></textarea>
+        <textarea name="attr_training-text" placeholder="STILL IN DEVELOPEMENT" style='width: 95%'></textarea>
     </fieldset>    
 </div>
     
@@ -1296,11 +1346,12 @@ on('clicked:weaponBlock', () => {
 });
 on('clicked:gather', () => {
     getAttrs(["economy","Char_Manna","Char_Manna_Training","Char_Level"], value => {
-        var max = parseInt(value.Char_Manna_Training) + 100 + parseInt(value.Char_Level);
+        var max = (100 + parseInt(value.Char_Manna_Training) + parseInt(value.Char_Level));
+        console.log((parseInt(value.Manna) + 30));
         if(value.economy >= 70)
         {
             setAttrs({
-                Char_Manna:     ((parseInt(value.Manna) + 30) <= max) ? value.Char_Manna + 30 : max,
+                Char_Manna:     ((value.Char_Manna + 30) <= max) ? value.Char_Manna + 30 : max,
                 economy:        value.economy - 30
             })
         }
@@ -1738,8 +1789,7 @@ on("clicked:equip-armor", ()=> {
             return
             idArray.forEach(id => {
                 i++;
-                Mods[`mod${i}`] = [`Module Type: ${v[`repeating_armor_${id}_module-form`]}.   Cooldown:   ${v[`repeating_armor_${id}_module-cooldown`]}.\n
-                    Cost:   ${v[`repeating_armor_${id}_module-cost`]}.    TTT:    ${v[`repeating_armor_${id}_module-turn-to-turn`]}.\n
+                Mods[`mod${i}`] = [`Cost:   ${v[`repeating_armor_${id}_module-cost`]}. \n
                     Effect:     ${v[`repeating_armor_${id}_module-effect`]}.`];
                 Mods['armor-totalttt'] += parseInt(v[`repeating_armor_${id}_module-turn-to-turn`]);
                 Mods[`modmax${i}`] = v[`repeating_armor_${id}_module-cooldown`];
@@ -2014,7 +2064,7 @@ Vitalize=function()
             vital.blockedHits = 0;
             vital.guardWarningC =  "";
             vital.guardWarningW = "";
-            vital.Char_Manna = value.Char_Manna_Training + 100 + value.Char_Level;
+            vital.Char_Manna = 100 + parseInt(value.Char_Manna_Training) + parseInt(value.Char_Level);
             vital.Char_Life_Force = 100 + value.Char_Level + (value.char_constitution * 10);
             vital.Disruption = value.Char_Level + dis + (value.char_constitution + value.char_resistance) * 5;
             vital.Pain = value.Char_Level + (value.char_constitution + value.char_discipline) * 10;
@@ -2238,19 +2288,19 @@ Defensive_Module=function(New, Mlevel, Atype, Con)
                             Module.TTT = 2;
                             Module.CoolD = 0;
                             Module.Cost = 30;
-                            Module.effect = `Counter Attack: Base = ${parseInt(Con)*4} `;
+                            Module.effect = `Counter Attack: Base=${parseInt(Con)*4} `;
                             break;
                         case 4:
                             Module.TTT = 4;
                             Module.CoolD = 0;
                             Module.Cost = 45;
-                            Module.effect = `Counter Attack: Base = ${parseInt(Con)*6} `;
+                            Module.effect = `Counter Attack: Base=${parseInt(Con)*6} `;
                             break;
                         case 6:
                             Module.TTT = 6;
                             Module.CoolD = 0;
                             Module.Cost = 60;
-                            Module.effect = `Counter Attack: Base = ${parseInt(Con)*8} `;
+                            Module.effect = `Counter Attack: Base=${parseInt(Con)*8} `;
                             break;
                     }
                     Module.warn = "";
@@ -2666,8 +2716,8 @@ Adjust_Race=function(Race)
             Base.Age = 20;
             break;
         case "Adept" :
-            Base.Con = 3;
-            Base.Dis = 2;
+            Base.Con = 2;
+            Base.Dis = 3;
             Base.Res = 0;
             Base.Int = 1;
             Base.CA = 15;