diff --git a/L5R/L5Rsheet.htm b/L5R/L5Rsheet.htm
index 35f37e0a1d..24e17aaf64 100644
--- a/L5R/L5Rsheet.htm
+++ b/L5R/L5Rsheet.htm
@@ -4,7 +4,6 @@
         <label>
             <span>Clan:</span>
             <select name="attr_Clan">
-                <option value="Crab"></option>
                 <option value="Crab">Crab</option>
                 <option value="Crane">Crane</option>
                 <option value="Dragon">Dragon</option>
@@ -14,7 +13,7 @@
                 <option value="Scorpion">Scorpion</option>
                 <option value="Spider">Spider</option>
                 <option value="Unicorn">Unicorn</option>
-                <option value="Crab">Ronin</option>
+                <option value="Ronin">Ronin</option>
                 <option value="Misc">Misc</option>
             </select>
             </label>
@@ -33,7 +32,7 @@
         </tr>
         <tr>
             <td><div><label style=display:inline><span>Insight</span></label></td>
-            <td><input type="number" disabled="true" name="attr_Insight" value="(((@{Air} + @{Water} + @{Fire} + @{Earth} + @{Void}) * 10 ) + (@{rank_acting} + @{rank_artisan} + @{rank_calligraphy} + @{rank_courtier} + @{rank_divination} + @{rank_etiquette} + @{rank_games} + @{rank_investigation} + @{rank_lore} + @{rank_Lore2} + @{rank_Lore3} + @{rank_Medicine} + @{rank_Meditation} + @{rank_Perform} + @{rank_Sincerity} + @{rank_Spellcraft} + @{rank_Tea_Ceremony} + @{rank_Athletics} + @{rank_Battle} + @{rank_Defense} + @{rank_Horsemanship} + @{rank_Hunting} + @{rank_Iaijutsu} + @{rank_Jiujiutsu} + @{rank_Chain_Weapons}  + @{rank_Heavy_Weapons} + @{rank_Kenjutsu} + @{rank_Knives} + @{rank_Kyujutsu} + @{rank_Ninjutsu_Ranged} + @{rank_Spears} + @{rank_Staves} + @{rank_WarFan} + @{rank_AnimalHandling} + @{rank_Commerce} + @{rank_Craft} + @{rank_Engineering} + @{rank_Sailing} + @{rank_Forgery} + @{rank_Intimidation} + @{rank_SleightofHand} + @{rank_Stealth} + @{rank_Temptation}))"/></div></td>
+            <td><input type="number" disabled="true" name="attr_Insight" value="(((@{Air} + @{Water} + @{Fire} + @{Earth} + @{Void}) * 10 ) + (@{rank_acting} + @{rank_artisan} + @{rank_calligraphy} + @{rank_courtier} + @{rank_divination} + @{rank_etiquette} + @{rank_games} + @{rank_investigation} + @{rank_lore} + @{rank_Lore2} + @{rank_Lore3} + @{rank_Medicine} + @{rank_Meditation} + @{rank_Perform} + @{rank_Sincerity} + @{rank_Spellcraft} + @{rank_Tea_Ceremony} + @{rank_Athletics} + @{rank_Battle} + @{rank_Defense} + @{rank_Horsemanship} + @{rank_Hunting} + @{rank_Iaijutsu} + @{rank_Jiujutsu} + @{rank_Chain_Weapons}  + @{rank_Heavy_Weapons} + @{rank_Kenjutsu} + @{rank_Knives} + @{rank_Kyujutsu} + @{rank_Ninjutsu} + @{rank_Polearms} + @{rank_Spears} + @{rank_Staves} + @{rank_WarFan} + @{rank_AnimalHandling} + @{rank_Commerce} + @{rank_Craft} + @{rank_Engineering} + @{rank_Sailing} + @{rank_Forgery} + @{rank_Intimidation} + @{rank_SleightofHand} + @{rank_Stealth} + @{rank_Temptation}))"/></div></td>
         </tr>            
         </table>
     </div>
@@ -62,17 +61,17 @@
             </div>
             <div class="attribute">
                 <input type="number"  value="((@{Reflexes} + @{Awareness}) - abs(@{Reflexes} - @{Awareness})) / 2" disabled="true" name="attr_Air"/>
-                <button type='roll' name='roll_Air' value='/roll [[@{Air}]]d10!! Air!'></button><br/>
+                <button type='roll' name='roll_Air' value='/em @{name} rolls Air! \n\n/roll [[@{Air}]]d10!!'></button><br/>
             </div>
             <div class="attribute">
                 <p></label><span>Reflexes</span></p>
                 <input type="number"  value='2' name="attr_Reflexes" />
-                <button type='roll' name='roll_Reflexes' value='@{name} rolls [[Reflexes @{Reflexes}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Reflexes' value='/em @{name} rolls Reflexes! \n\n/roll [[@{Reflexes}d10!!]]'></button><br/>
             </div>
             <div class="attribute">
                 <p></label><span>Awareness</span></p>
                 <input type="number"  value='2' name="attr_Awareness" />
-                <button type='roll' name='roll_Awareness' value='@{name} rolls Awareness [[@{Awareness}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Awareness' value='/em @{name} rolls Awareness! \n\n/roll [[@{Awareness}d10!!]]'></button><br/>
             </div>
             <p></p>
         </div>
@@ -85,17 +84,17 @@
             </div>
              <div class="attribute">
                 <input type="number"  value="((@{Stamina} + @{Willpower}) - abs(@{Stamina} - @{Willpower}))/ 2" disabled="true" name="attr_Earth"/>
-                <button type='roll' name='roll_Earth' value='/roll [[@{Earth}]]d10!! Earth!'></button><br/>
+                <button type='roll' name='roll_Earth' value='/em @{name} rolls Earth! \n\n/roll [[@{Earth}]]d10!! Earth!'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Stamina</span></p>
                 <input type="number"  value='2' name="attr_Stamina" />
-                <button type='roll' name='roll_Stamina' value='@{name} rolls Stamina [[@{Stamina}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Stamina' value='/em @{name} rolls Stamina! \n\n/roll [[@{Stamina}d10!!]]'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Willpower</span></p>
                 <input type="number"  value='2' name="attr_Willpower" />
-                <button type='roll' name='roll_Willpower' value='@{name} rolls Willpower [[@{Willpower}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Willpower' value='/em @{name} rolls Willpower! \n\n/roll [[@{Willpower}d10!!]]'></button><br/>
             </div>
             <p></p>
         </div>
@@ -107,17 +106,17 @@
             </div>
              <div class="attribute">
                <input type="number"  value='((@{Agility} + @{Intelligence}) - abs(@{Agility} - @{Intelligence})) / 2' disabled="true" name="attr_Fire"/>
-                <button type='roll' name='roll_Fire' value='/roll [[@{Fire}]]d10!! Fire!'></button><br/>
+                <button type='roll' name='roll_Fire' value='/em @{name} rolls Fire! \n\n/roll [[@{Fire}]]d10!! Fire!'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Agility</span></p>
                 <input type="number"  value='2' name="attr_Agility" />
-                <button type='roll' name='roll_Agility' value='@{name} rolls Agility [[@{Agility}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Agility' value='/em @{name} rolls Agility! \n\n/roll [[@{Agility}d10!!]]'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Intelligence</span></p>
                 <input type="number"  value='2' name="attr_Intelligence" />
-                <button type='roll' name='roll_Intelligence' value='@{name} rolls Intelligence [[@{Intelligence}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Intelligence' value='/em @{name} rolls Intelligence! \n\n/roll [[@{Intelligence}d10!!]]'></button><br/>
             </div>
             <p></p>
         </div>
@@ -129,17 +128,17 @@
             </div>
              <div class="attribute">
                 <input type="number"  value='((@{Strength} + @{Perception}) - abs(@{Strength} - @{Perception})) / 2' disabled='true' name="attr_Water" />
-                <button type='roll' name='roll_Water' value='/roll [[@{Water}]]d10!! Water!'></button><br/>
+                <button type='roll' name='roll_Water' value='/em @{name} rolls Water! \n\n/roll [[@{Water}]]d10!! Water!'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Strength</span></p>
                 <input type="number"  value='2' name="attr_Strength" />
-                <button type='roll' name='roll_Strength' value='@{name} rolls Strength [[@{Strength}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Strength' value='/em @{name} rolls Strength! \n\n/roll [[@{Strength}d10!!]]'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Perception</span></p>
                 <input type="number"  value='2' name="attr_Perception" />
-                <button type='roll' name='roll_Perception' value='@{name} rolls Perception [[@{Perception}d10!!]]'></button><br/>
+                <button type='roll' name='roll_Perception' value='/em @{name} rolls Perception! \n\n/roll [[@{Perception}d10!!]]'></button><br/>
             </div>
             <p></p>
         </div>
@@ -150,8 +149,8 @@
                  <h3 class="attribute">Void</h3>
                  </div>
              <div class="attribute">
-                <input type="number"  value='2' name="attr_Void" />
-                <button type='roll' name='roll_Void' value='/roll [[@{Void}]]d10!! Void!'></button><br/>
+                <input type="number" value='2' name="attr_Void" />
+                <button type='roll' name='roll_Void' value='/em @{name} rolls Void! \n\n/roll [[@{Void}]]d10!!'></button><br/>
             </div>
             <div class="attribute">
                 <p></ladel><span>Void Spent</span></p>
@@ -171,7 +170,7 @@
      <div class="sheet-3colrow">
          
          <div class="sheet-col">
-            <div><label><span>Sex: </span><input  type="text" class="narrow" style=display:inline name="attr_Sex" /></label></div>
+            <div><label><span>Sex:</span><input  type="text" class="narrow" style=display:inline name="attr_Sex" /></label></div>
              <div><label><span>Age: </span> <input type="text" class="narrow" style=display:inline name="attr_Age" /></label></div>
              <div><label><span>Height: </span> <input type="text" class="narrow" style=display:inline name="attr_Height" /></label></div>
              <div><label><span>Weight: </span> <input type="text" class="narrow" style=display:inline name="attr_Weight" /></label></div>
@@ -182,11 +181,10 @@
          </div>
          
          
-         <div class="sheet-col">
+                  <div class="sheet-col">
             <h3 class="ability">Honor     <input type="number" name="attr_HonorRank" /></h3>
                 <div class="dots">
-                    <input type="checkbox" name="attr_Honor_max" value="1" /><span></span>
-                    <input type="radio" name="attr_Honor" value="0" checked="checked" />
+                    <input type="checkbox" name="attr_Honor_max" value="0" /><span></span>
                     <input type="radio" name="attr_Honor" value="1" /><span></span>
                     <input type="radio" name="attr_Honor" value="2" /><span></span>
                     <input type="radio" name="attr_Honor" value="3" /><span></span>
@@ -201,8 +199,7 @@
             
             <h3 class="ability">Glory     <input type="number" name="attr_GloryRank" /></h3>
                 <div class="dots">
-                    <input type="checkbox" name="attr_Glory_max" value="1" /><span></span>
-                    <input type="radio" name="attr_Glory" value="0" checked="checked" />
+                    <input type="checkbox" name="attr_Glory_max" value="0" /><span></span>
                     <input type="radio" name="attr_Glory" value="1" /><span></span>
                     <input type="radio" name="attr_Glory" value="2" /><span></span>
                     <input type="radio" name="attr_Glory" value="3" /><span></span>
@@ -217,8 +214,7 @@
             
             <h3 class="ability">Status     <input type="number" name="attr_StatusRank" /></h3>
                 <div class="dots">
-                    <input type="checkbox" name="attr_Status_max" value="1" /><span></span>
-                    <input type="radio" name="attr_Status" value="0" checked="checked" />
+                    <input type="checkbox" name="attr_Status_max" value="0" /><span></span>
                     <input type="radio" name="attr_Status" value="1" /><span></span>
                     <input type="radio" name="attr_Status" value="2" /><span></span>
                     <input type="radio" name="attr_Status" value="3" /><span></span>
@@ -233,8 +229,7 @@
                 
                 <h3 class="ability">Taint     <input type="number" name="attr_TaintRank" /></h3>
                 <div class="dots">
-                    <input type="checkbox" name="attr_Taint_max" value="1" /><span></span>
-                    <input type="radio" name="attr_Taint" value="0" checked="checked" />
+                    <input type="checkbox" name="attr_Taint_max" value="0" /><span></span>
                     <input type="radio" name="attr_Taint" value="1" /><span></span>
                     <input type="radio" name="attr_Taint" value="2" /><span></span>
                     <input type="radio" name="attr_Taint" value="3" /><span></span>
@@ -248,8 +243,18 @@
                 </div>
         </div>
         <div class="sheet-col">
+             <h3>Wounds</h3>  
+               
              <table style='border-collapse: collapse; border-spacing: 0;'>
-             <h3>Wounds  <input type="number" name="attr_Wounds" value="0"/></h3>       
+             <tr><td>Wounds</td><td>Lethality</td></tr>
+             <tr>
+             <td><input type="number" name="attr_Wounds" value="0"/></td>
+             <td><select name="attr_Lethality">
+                 <option value="2">Earth x2</option>
+                 <option value="3">Earth x3</option>
+                 <option value="4">Earth x4</option>
+                 <option value="5">Earth x5</option>
+             </select></td></tr>
                  <tr>
                     <td style='font-weight: bold;'>Wound Level</td>
                      <td style='font-weight: bold;'>Total</td>
@@ -260,31 +265,31 @@
                  </tr>
                  <tr>
                      <td style='font-weight: bold;'>Nicked (+3)</td>
-                      <td><input type="number" name="attr_Nicked" value="@{Earth}*7" disabled="true"/></td></td>
+                      <td><input type="number" name="attr_Nicked" value="@{Earth}*5 + @{Earth} * @{Lethality}" disabled="true"/></td></td>
                   </tr>
                  <tr>
                       <td style='font-weight: bold;'>Grazed (+5)</td>
-                     <td><input type="number" name="attr_Grazed" value="@{Earth}*9" disabled="true"/></td>
+                     <td><input type="number" name="attr_Grazed" value="@{Earth}*5 + @{Earth} * 2 * @{Lethality}" disabled="true"/></td>
                 </tr>
                  <tr>
                     <td style='font-weight: bold;'>Hurt (+10)</td>
-                    <td><input type="number" name="attr_Hurt" value="@{Earth}*11" disabled="true"/></td>
+                    <td><input type="number" name="attr_Hurt" value="@{Earth}*5 + @{Earth} * 3 * @{Lethality}" disabled="true"/></td>
                 </tr>
                 <tr>
                      <td style='font-weight: bold;'>Injured (+15)</td>
-                    <td><input type="number" name="attr_Injured" value="@{Earth}*13" disabled="true"/></td>
+                    <td><input type="number" name="attr_Injured" value="@{Earth}*5 + @{Earth} * 4 * @{Lethality}" disabled="true"/></td>
                 </tr>
                 <tr>
                      <td style='font-weight: bold;'>Crippled (+20)</td>
-                    <td><input type="number" name="attr_Crippled" value="@{Earth}*15" disabled="true"/></td>
+                    <td><input type="number" name="attr_Crippled" value="@{Earth}*5 + @{Earth} * 5 * @{Lethality}" disabled="true"/></td>
                    </tr>
                  <tr>
                     <td style='font-weight: bold;'>Down (+40)</td>
-                     <td><input type="number" name="attr_Down" value="@{Earth}*17" disabled="true"/></td>
+                     <td><input type="number" name="attr_Down" value="@{Earth}*5 + @{Earth} * 6 * @{Lethality}" disabled="true"/></td>
                  </tr>
                  <tr>
                      <td style='font-weight: bold;'>Out</td>
-                     <td><input type="number" name="attr_Out" value="@{Earth}*19" disabled="true"/></td>
+                     <td><input type="number" name="attr_Out" value="@{Earth}*5 + @{Earth} * 7 * @{Lethality}" disabled="true"/></td>
                  </tr>
              </table>
          </div>
@@ -303,9 +308,9 @@
                     <th></th>
                 </tr>
                 <tr>
-                    <td>RankRefl</td>
+                    <td>Unmodified</td>
                     <td><input type="number" disabled="true" name="attr_BaseInitiative" value="(@{Reflexes}+@{Rank})" />
-                <button type='roll' name='roll_Initiative' value='@{name} rolls Initiative [[(@{BaseInitiative})d10k@{reflexes}!!]]'></button><br/></td>
+                <button type='roll' name='roll_Initiative' value='/em @{Name} rolls Initiative! \n\n/roll [[@{BaseInitiative}]]d10k[[@{Reflexes}]]!!'></button><br/></td>
                     <td>Base TN</td>
                     <td><input type="number" disabled="true" name="attr_BaseTN" value="(((@{Reflexes}) * 5) + 5)"/></td>
                     <td>Quality</td>
@@ -321,8 +326,8 @@
                 </tr>
                 <tr>
                     <td>Initiative</td>
-                    <td><input type="number" name="attr_Initiative"/>
-                        <button type='roll' name='roll_Initiative' value='@{name} rolls Initiative [[(@{BaseInitiative})d10k@{reflexes}!! + @{InitiativeMod}]]'></button>
+                    <td>
+                        <button type='roll' name='roll_Initiative'value='/em @{Name} rolls Initiative! \n\n/roll [[@{BaseInitiative}]]d10k[[@{Reflexes}]]!! + @{InitiativeMod}'></button>
                     </td>
                     <td>Current TN</td>
                     <td><input type="number" disabled="true" name="attr_CurrentTN" value="(@{BaseTN}+@{ArmorBonus})"/></td>
@@ -356,7 +361,6 @@
 
 
 <div class="tab-content skills-tab">
-        <fieldset>
             <h1><span>High Skills</span></h1>
             U = Untrained Roll | T = Trained Roll | E = Emphasis Roll
             <p></p>
@@ -374,17 +378,17 @@
             <td style="font-weight:bold">Sub-Type</td>
         </tr>
         <tr>
-            <td>Acting</td> 
-            <td><input type="number" name="attr_rank_acting" value="0"></td>
-            <td>Awareness</td>
-            <input type="hidden" name="attr_roll_acting" value="@{rank_acting}+@{Awareness}" disabled>
-            <input type="hidden" name="attr_keep_acting" value="@{Awareness}" disabled>
+            <td>Acting</td>
+            <td><input type="number" name="attr_rank_acting" value="0"/></td>
+            <td>Awareness
+            <input type="hidden" name="attr_roll_acting" value="@{rank_acting}+@{Awareness}">
+            <input type="hidden" name="attr_keep_acting" value="@{Awareness}"></td>
             <td><input type="number" name="attr_roll_bonus_acting" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_acting" value="0"></td>
             <td><input type="text" name="attr_acting_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_acting}+@{roll_bonus_acting}]]d10k[[@{keep_acting}+@{keep_bonus_acting}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_acting}+@{roll_bonus_acting}]]d10k[[@{keep_acting}+@{keep_bonus_acting}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_acting}+@{roll_bonus_acting}]]d10k[[@{keep_acting}+@{keep_bonus_acting}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Acting roll! \n\n/roll [[@{roll_acting}+@{roll_bonus_acting}]]d10k[[@{keep_acting}+@{keep_bonus_acting}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Acting roll! \n\n/roll [[@{roll_acting}+@{roll_bonus_acting}]]d10k[[@{keep_acting}+@{keep_bonus_acting}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Acting roll with Emphasis! \n\n/roll [[@{roll_acting}+@{roll_bonus_acting}]]d10k[[@{keep_acting}+@{keep_bonus_acting}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Artisan</td> 
@@ -395,9 +399,9 @@
             <td><input type="number" name="attr_roll_bonus_artisan" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_artisan" value="0"></td>
             <td><input type="text" name="attr_artisan_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_artisan}+@{roll_bonus_artisan}]]d10k[[@{keep_Artisan}+@{keep_bonus_artisan}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_artisan}+@{roll_bonus_artisan}]]d10k[[@{keep_Artisan}+@{keep_bonus_artisan}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_artisan}+@{roll_bonus_artisan}]]d10k[[@{keep_Artisan}+@{keep_bonus_artisan}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Artisan roll! \n\n/roll [[@{roll_artisan}+@{roll_bonus_artisan}]]d10k[[@{keep_Artisan}+@{keep_bonus_artisan}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Artisan roll! \n\n/roll [[@{roll_artisan}+@{roll_bonus_artisan}]]d10k[[@{keep_Artisan}+@{keep_bonus_artisan}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Artisan roll with Emphasis! \n\n/roll [[@{roll_artisan}+@{roll_bonus_artisan}]]d10k[[@{keep_Artisan}+@{keep_bonus_artisan}]]!!r1"></button></td>
             <td><input type="text" class="regular"  name="attr_artisan_type" value=""></td>
         </tr>
         <tr>
@@ -409,9 +413,9 @@
             <td><input type="number" name="attr_roll_bonus_calligraphy" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_calligraphy" value="0"></td>
             <td><input type="text" name="attr_calligraphy_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_calligraphy}+@{roll_bonus_calligraphy}]]d10k[[@{keep_Calligraphy}+@{keep_bonus_calligraphy}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_calligraphy}+@{roll_bonus_calligraphy}]]d10k[[@{keep_Calligraphy}+@{keep_bonus_calligraphy}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_calligraphy}+@{roll_bonus_calligraphy}]]d10k[[@{keep_Calligraphy}+@{keep_bonus_calligraphy}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Calligraphy roll! \n\n/roll [[@{roll_calligraphy}+@{roll_bonus_calligraphy}]]d10k[[@{keep_Calligraphy}+@{keep_bonus_calligraphy}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Calligraphy roll! \n\n/roll [[@{roll_calligraphy}+@{roll_bonus_calligraphy}]]d10k[[@{keep_Calligraphy}+@{keep_bonus_calligraphy}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Calligraphy roll with Emphasis! \n\n/roll [[@{roll_calligraphy}+@{roll_bonus_calligraphy}]]d10k[[@{keep_Calligraphy}+@{keep_bonus_calligraphy}]]!!r1"></button></td>
         </tr>  
         <tr>
             <td>Courtier</td> 
@@ -422,9 +426,9 @@
             <td><input type="number" name="attr_roll_bonus_courtier" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_courtier" value="0"></td>
             <td><input type="text" name="attr_courtier_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_courtier}+@{roll_bonus_courtier}]]d10k[[@{keep_Courtier}+@{keep_bonus_courtier}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_courtier}+@{roll_bonus_courtier}]]d10k[[@{keep_Courtier}+@{keep_bonus_courtier}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_courtier}+@{roll_bonus_courtier}]]d10k[[@{keep_Courtier}+@{keep_bonus_courtier}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Courtier roll! \n\n/roll [[@{roll_courtier}+@{roll_bonus_courtier}]]d10k[[@{keep_Courtier}+@{keep_bonus_courtier}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Courtier roll! \n\n/roll [[@{roll_courtier}+@{roll_bonus_courtier}]]d10k[[@{keep_Courtier}+@{keep_bonus_courtier}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Courtier roll with Emphasis! \n\n/roll [[@{roll_courtier}+@{roll_bonus_courtier}]]d10k[[@{keep_Courtier}+@{keep_bonus_courtier}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Divination</td> 
@@ -435,9 +439,9 @@
             <td><input type="number" name="attr_roll_bonus_divination" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_divination" value="0"></td>
             <td><input type="text" name="attr_divination_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_divination}+@{roll_bonus_divination}]]d10k[[@{keep_Divination}+@{keep_bonus_divination}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_divination}+@{roll_bonus_divination}]]d10k[[@{keep_Divination}+@{keep_bonus_divination}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_divination}+@{roll_bonus_divination}]]d10k[[@{keep_Divination}+@{keep_bonus_divination}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Divination roll! \n\n/roll [[@{roll_divination}+@{roll_bonus_divination}]]d10k[[@{keep_Divination}+@{keep_bonus_divination}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Divination roll! \n\n/roll [[@{roll_divination}+@{roll_bonus_divination}]]d10k[[@{keep_Divination}+@{keep_bonus_divination}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Divination roll with Emphasis! \n\n/roll [[@{roll_divination}+@{roll_bonus_divination}]]d10k[[@{keep_Divination}+@{keep_bonus_divination}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Etiquette</td> 
@@ -448,9 +452,9 @@
             <td><input type="number" name="attr_roll_bonus_etiquette" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_etiquette" value="0"></td>
             <td><input type="text" name="attr_etiquette_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_etiquette}+@{roll_bonus_etiquette}]]d10k[[@{keep_Etiquette}+@{keep_bonus_etiquette}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_etiquette}+@{roll_bonus_etiquette}]]d10k[[@{keep_Etiquette}+@{keep_bonus_etiquette}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_etiquette}+@{roll_bonus_etiquette}]]d10k[[@{keep_Etiquette}+@{keep_bonus_etiquette}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Etiquette roll! \n\n/roll [[@{roll_etiquette}+@{roll_bonus_etiquette}]]d10k[[@{keep_Etiquette}+@{keep_bonus_etiquette}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Trained Etiquette roll! \n\n/roll [[@{roll_etiquette}+@{roll_bonus_etiquette}]]d10k[[@{keep_Etiquette}+@{keep_bonus_etiquette}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Etiquette roll with Emphasis! \n\n/roll [[@{roll_etiquette}+@{roll_bonus_etiquette}]]d10k[[@{keep_Etiquette}+@{keep_bonus_etiquette}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Games</td> 
@@ -461,9 +465,9 @@
             <td><input type="number" name="attr_roll_bonus_games" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_games" value="0"></td>
             <td><input type="text" name="attr_games_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_games}+@{roll_bonus_games}]]d10k[[@{keep_Games}+@{keep_bonus_games}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_games}+@{roll_bonus_games}]]d10k[[@{keep_Games}+@{keep_bonus_games}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_games}+@{roll_bonus_games}]]d10k[[@{keep_Games}+@{keep_bonus_games}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Games roll! \n\n/roll [[@{roll_games}+@{roll_bonus_games}]]d10k[[@{keep_Games}+@{keep_bonus_games}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Games roll! \n\n/roll [[@{roll_games}+@{roll_bonus_games}]]d10k[[@{keep_Games}+@{keep_bonus_games}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Games roll with Emphasis! \n\n/roll [[@{roll_games}+@{roll_bonus_games}]]d10k[[@{keep_Games}+@{keep_bonus_games}]]!!r1"></button></td>
             <td><input type="text" class="regular"  name="attr_games_type" value=""></td>
 
         </tr>  
@@ -476,9 +480,9 @@
             <td><input type="number" name="attr_roll_bonus_investigation" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_investigation" value="0"></td>
             <td><input type="text" name="attr_investigation_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_investigation}+@{roll_bonus_investigation}]]d10k[[@{keep_Investigation}+@{keep_bonus_investigation}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_investigation}+@{roll_bonus_investigation}]]d10k[[@{keep_Investigation}+@{keep_bonus_investigation}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_investigation}+@{roll_bonus_investigation}]]d10k[[@{keep_Investigation}+@{keep_bonus_investigation}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Investigation roll! \n\n/roll [[@{roll_investigation}+@{roll_bonus_investigation}]]d10k[[@{keep_Investigation}+@{keep_bonus_investigation}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Trained Investigation roll! \n\n/roll [[@{roll_investigation}+@{roll_bonus_investigation}]]d10k[[@{keep_Investigation}+@{keep_bonus_investigation}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Investigation roll with Emphasis! \n\n/roll [[@{roll_investigation}+@{roll_bonus_investigation}]]d10k[[@{keep_Investigation}+@{keep_bonus_investigation}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Lore</td> 
@@ -489,9 +493,9 @@
             <td><input type="number" name="attr_roll_bonus_lore" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_lore" value="0"></td>
             <td><input type="text" name="attr_lore_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_lore}+@{roll_bonus_lore}]]d10k[[@{keep_Lore}+@{keep_bonus_lore}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_lore}+@{roll_bonus_lore}]]d10k[[@{keep_Lore}+@{keep_bonus_lore}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_lore}+@{roll_bonus_lore}]]d10k[[@{keep_Lore}+@{keep_bonus_lore}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Lore roll! \n\n/roll [[@{roll_lore}+@{roll_bonus_lore}]]d10k[[@{keep_Lore}+@{keep_bonus_lore}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Lore roll! \n\n/roll [[@{roll_lore}+@{roll_bonus_lore}]]d10k[[@{keep_Lore}+@{keep_bonus_lore}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Lore roll with Emphasis! \n\n/roll [[@{roll_lore}+@{roll_bonus_lore}]]d10k[[@{keep_Lore}+@{keep_bonus_lore}]]!!r1"></button></td>
             <td><input type="text" class="regular"  name="attr_lore_type" value=""></td>
         </tr>   
         <tr>
@@ -503,9 +507,9 @@
             <td><input type="number" name="attr_roll_bonus_Lore2" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Lore2" value="0"></td>
             <td><input type="text" name="attr_Lore2_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Lore2}+@{roll_bonus_Lore2}]]d10k[[@{keep_Lore2}+@{keep_bonus_Lore2}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Lore2}+@{roll_bonus_Lore2}]]d10k[[@{keep_Lore2}+@{keep_bonus_Lore2}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Lore2}+@{roll_bonus_Lore2}]]d10k[[@{keep_Lore2}+@{keep_bonus_Lore2}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Lore roll! \n\n/roll [[@{roll_Lore2}+@{roll_bonus_Lore2}]]d10k[[@{keep_Lore2}+@{keep_bonus_Lore2}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Lore roll! \n\n/roll [[@{roll_Lore2}+@{roll_bonus_Lore2}]]d10k[[@{keep_Lore2}+@{keep_bonus_Lore2}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Lore roll with Emphasis! \n\n/roll [[@{roll_Lore2}+@{roll_bonus_Lore2}]]d10k[[@{keep_Lore2}+@{keep_bonus_Lore2}]]!!r1"></button></td>
             <td><input type="text" class="regular"  name="attr_Lore2_type" value=""></td>
         </tr>  
         <tr>
@@ -517,9 +521,9 @@
             <td><input type="number" name="attr_roll_bonus_Lore3" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Lore3" value="0"></td>
             <td><input type="text" name="attr_Lore3_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Lore3}+@{roll_bonus_Lore3}]]d10k[[@{keep_Lore3}+@{keep_bonus_Lore3}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Lore3}+@{roll_bonus_Lore3}]]d10k[[@{keep_Lore3}+@{keep_bonus_Lore3}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Lore3}+@{roll_bonus_Lore3}]]d10k[[@{keep_Lore3}+@{keep_bonus_Lore3}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Lore roll! \n\n/roll [[@{roll_Lore3}+@{roll_bonus_Lore3}]]d10k[[@{keep_Lore3}+@{keep_bonus_Lore3}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Lore roll! \n\n/roll [[@{roll_Lore3}+@{roll_bonus_Lore3}]]d10k[[@{keep_Lore3}+@{keep_bonus_Lore3}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Lore roll with Emphasis! \n\n/roll [[@{roll_Lore3}+@{roll_bonus_Lore3}]]d10k[[@{keep_Lore3}+@{keep_bonus_Lore3}]]!!r1"></button></td>
             <td><input type="text" class="regular"  name="attr_Lore3_type" value=""></td>
         </tr>
         <tr>
@@ -531,9 +535,9 @@
             <td><input type="number" name="attr_roll_bonus_Medicine" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Medicine" value="0"></td>
             <td><input type="text" name="attr_Medicine_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Medicine}+@{roll_bonus_Medicine}]]d10k[[@{keep_Medicine}+@{keep_bonus_Medicine}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Medicine}+@{roll_bonus_Medicine}]]d10k[[@{keep_Medicine}+@{keep_bonus_Medicine}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Medicine}+@{roll_bonus_Medicine}]]d10k[[@{keep_Medicine}+@{keep_bonus_Medicine}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Medicine roll! \n\n/roll [[@{roll_Medicine}+@{roll_bonus_Medicine}]]d10k[[@{keep_Medicine}+@{keep_bonus_Medicine}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Medicine roll! \n\n/roll [[@{roll_Medicine}+@{roll_bonus_Medicine}]]d10k[[@{keep_Medicine}+@{keep_bonus_Medicine}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Medicine roll with Emphasis! \n\n/roll [[@{roll_Medicine}+@{roll_bonus_Medicine}]]d10k[[@{keep_Medicine}+@{keep_bonus_Medicine}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Meditation</td> 
@@ -544,9 +548,9 @@
             <td><input type="number" name="attr_roll_bonus_Meditation" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Meditation" value="0"></td>
             <td><input type="text" name="attr_Meditation_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Meditation}+@{roll_bonus_Meditation}]]d10k[[@{keep_Meditation}+@{keep_bonus_Meditation}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Meditation}+@{roll_bonus_Meditation}]]d10k[[@{keep_Meditation}+@{keep_bonus_Meditation}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Meditation}+@{roll_bonus_Meditation}]]d10k[[@{keep_Meditation}+@{keep_bonus_Meditation}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Meditation roll! \n\n/roll [[@{roll_Meditation}+@{roll_bonus_Meditation}]]d10k[[@{keep_Meditation}+@{keep_bonus_Meditation}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Meditation roll! \n\n/roll [[@{roll_Meditation}+@{roll_bonus_Meditation}]]d10k[[@{keep_Meditation}+@{keep_bonus_Meditation}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Meditation roll with Emphasis! \n\n/roll [[@{roll_Meditation}+@{roll_bonus_Meditation}]]d10k[[@{keep_Meditation}+@{keep_bonus_Meditation}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Perform</td> 
@@ -557,9 +561,9 @@
             <td><input type="number" name="attr_roll_bonus_Perform" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Perform" value="0"></td>
             <td><input type="text" name="attr_Perform_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Perform}+@{roll_bonus_Perform}]]d10k[[@{keep_Perform}+@{keep_bonus_Perform}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Perform}+@{roll_bonus_Perform}]]d10k[[@{keep_Perform}+@{keep_bonus_Perform}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Perform}+@{roll_bonus_Perform}]]d10k[[@{keep_Perform}+@{keep_bonus_Perform}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Perform roll! \n\n/roll [[@{roll_Perform}+@{roll_bonus_Perform}]]d10k[[@{keep_Perform}+@{keep_bonus_Perform}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Perform roll! \n\n/roll [[@{roll_Perform}+@{roll_bonus_Perform}]]d10k[[@{keep_Perform}+@{keep_bonus_Perform}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Perform roll with Emphasis! \n\n/roll [[@{roll_Perform}+@{roll_bonus_Perform}]]d10k[[@{keep_Perform}+@{keep_bonus_Perform}]]!!r1"></button></td>
             <td><input type="text" class="regular"  name="attr_Perform_type" value=""></td>
         </tr>
         <tr>
@@ -571,9 +575,9 @@
             <td><input type="number" name="attr_roll_bonus_Sincerity" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Sincerity" value="0"></td>
             <td><input type="text" name="attr_Sincerity_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Sincerity}+@{roll_bonus_Sincerity}]]d10k[[@{keep_Sincerity}+@{keep_bonus_Sincerity}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Sincerity}+@{roll_bonus_Sincerity}]]d10k[[@{keep_Sincerity}+@{keep_bonus_Sincerity}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Sincerity}+@{roll_bonus_Sincerity}]]d10k[[@{keep_Sincerity}+@{keep_bonus_Sincerity}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Sincerity roll! \n\n/roll [[@{roll_Sincerity}+@{roll_bonus_Sincerity}]]d10k[[@{keep_Sincerity}+@{keep_bonus_Sincerity}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Sincerity roll! \n\n/roll [[@{roll_Sincerity}+@{roll_bonus_Sincerity}]]d10k[[@{keep_Sincerity}+@{keep_bonus_Sincerity}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Sincerity roll with Emphasis! \n\n/roll [[@{roll_Sincerity}+@{roll_bonus_Sincerity}]]d10k[[@{keep_Sincerity}+@{keep_bonus_Sincerity}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Spellcraft</td> 
@@ -584,9 +588,9 @@
             <td><input type="number" name="attr_roll_bonus_Spellcraft" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Spellcraft" value="0"></td>
             <td><input type="text" name="attr_Spellcraft_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Spellcraft}+@{roll_bonus_Spellcraft}]]d10k[[@{keep_Spellcraft}+@{keep_bonus_Spellcraft}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Spellcraft}+@{roll_bonus_Spellcraft}]]d10k[[@{keep_Spellcraft}+@{keep_bonus_Spellcraft}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Spellcraft}+@{roll_bonus_Spellcraft}]]d10k[[@{keep_Spellcraft}+@{keep_bonus_Spellcraft}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Spellcraft roll! \n\n/roll [[@{roll_Spellcraft}+@{roll_bonus_Spellcraft}]]d10k[[@{keep_Spellcraft}+@{keep_bonus_Spellcraft}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Spellcraft roll! \n\n/roll [[@{roll_Spellcraft}+@{roll_bonus_Spellcraft}]]d10k[[@{keep_Spellcraft}+@{keep_bonus_Spellcraft}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Spellcraft roll with Emphasis! \n\n/roll [[@{roll_Spellcraft}+@{roll_bonus_Spellcraft}]]d10k[[@{keep_Spellcraft}+@{keep_bonus_Spellcraft}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Tea Ceremony</td> 
@@ -597,13 +601,12 @@
             <td><input type="number" name="attr_roll_bonus_Tea_Ceremony" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Tea_Ceremony" value="0"></td>
             <td><input type="text" name="attr_Tea_Ceremony_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Tea_Ceremony}+@{roll_bonus_Tea_Ceremony}]]d10k[[@{keep_Tea_Ceremony}+@{keep_bonus_Tea_Ceremony}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Tea_Ceremony}+@{roll_bonus_Tea_Ceremony}]]d10k[[@{keep_Tea_Ceremony}+@{keep_bonus_Tea_Ceremony}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Tea_Ceremony}+@{roll_bonus_Tea_Ceremony}]]d10k[[@{keep_Tea_Ceremony}+@{keep_bonus_Tea_Ceremony}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Tea Ceremony roll! \n\n/roll [[@{roll_Tea_Ceremony}+@{roll_bonus_Tea_Ceremony}]]d10k[[@{keep_Tea_Ceremony}+@{keep_bonus_Tea_Ceremony}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Tea Ceremony roll! \n\n/roll [[@{roll_Tea_Ceremony}+@{roll_bonus_Tea_Ceremony}]]d10k[[@{keep_Tea_Ceremony}+@{keep_bonus_Tea_Ceremony}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Tea Ceremony roll with Emphasis! \n\n/roll [[@{roll_Tea_Ceremony}+@{roll_bonus_Tea_Ceremony}]]d10k[[@{keep_Tea_Ceremony}+@{keep_bonus_Tea_Ceremony}]]!!r1"></button></td>
         </tr>  
     <tr>
-    </tr></table></fieldset>
-     <fieldset>
+    </tr></table>
             <h1><span>Bugei Skills</span></h1>
             <table style="border-collapse:collapse;border-spacing:0">
         <tr>
@@ -627,9 +630,9 @@
             <td><input type="number" name="attr_roll_bonus_Athletics" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Athletics" value="0"></td>
             <td><input type="text" name="attr_Athletics_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Athletics}+@{roll_bonus_Athletics}]]d10k[[@{keep_Athletics}+@{keep_bonus_Athletics}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Athletics}+@{roll_bonus_Athletics}]]d10k[[@{keep_Athletics}+@{keep_bonus_Athletics}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Athletics}+@{roll_bonus_Athletics}]]d10k[[@{keep_Athletics}+@{keep_bonus_Athletics}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Athletics roll! \n\n/roll [[@{roll_Athletics}+@{roll_bonus_Athletics}]]d10k[[@{keep_Athletics}+@{keep_bonus_Athletics}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Trained Athletics roll! \n\n/roll [[@{roll_Athletics}+@{roll_bonus_Athletics}]]d10k[[@{keep_Athletics}+@{keep_bonus_Athletics}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Athletics roll with Emphasis! \n\n/roll [[@{roll_Athletics}+@{roll_bonus_Athletics}]]d10k[[@{keep_Athletics}+@{keep_bonus_Athletics}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Battle</td> 
@@ -640,9 +643,9 @@
             <td><input type="number" name="attr_roll_bonus_Battle" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Battle" value="0"></td>
             <td><input type="text" name="attr_Battle_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Battle}+@{roll_bonus_Battle}]]d10k[[@{keep_Battle}+@{keep_bonus_Battle}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Battle}+@{roll_bonus_Battle}]]d10k[[@{keep_Battle}+@{keep_bonus_Battle}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Battle}+@{roll_bonus_Battle}]]d10k[[@{keep_Battle}+@{keep_bonus_Battle}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Battle roll! \n\n/roll [[@{roll_Battle}+@{roll_bonus_Battle}]]d10k[[@{keep_Battle}+@{keep_bonus_Battle}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Battle roll! \n\n/roll [[@{roll_Battle}+@{roll_bonus_Battle}]]d10k[[@{keep_Battle}+@{keep_bonus_Battle}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Battle roll with Emphasis! \n\n/roll [[@{roll_Battle}+@{roll_bonus_Battle}]]d10k[[@{keep_Battle}+@{keep_bonus_Battle}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Defense</td> 
@@ -653,9 +656,9 @@
             <td><input type="number" name="attr_roll_bonus_Defense" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Defense" value="0"></td>
             <td><input type="text" name="attr_Defense_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Defense}+@{roll_bonus_Defense}]]d10k[[@{keep_Defense}+@{keep_bonus_Defense}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Defense}+@{roll_bonus_Defense}]]d10k[[@{keep_Defense}+@{keep_bonus_Defense}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Defense}+@{roll_bonus_Defense}]]d10k[[@{keep_Defense}+@{keep_bonus_Defense}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Defense roll! \n\n/roll [[@{roll_Defense}+@{roll_bonus_Defense}]]d10k[[@{keep_Defense}+@{keep_bonus_Defense}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Defense roll! \n\n/roll [[@{roll_Defense}+@{roll_bonus_Defense}]]d10k[[@{keep_Defense}+@{keep_bonus_Defense}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Defense roll with Emphasis! \n\n/roll [[@{roll_Defense}+@{roll_bonus_Defense}]]d10k[[@{keep_Defense}+@{keep_bonus_Defense}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Horsemanship</td> 
@@ -666,9 +669,9 @@
             <td><input type="number" name="attr_roll_bonus_Horsemanship" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Horsemanship" value="0"></td>
             <td><input type="text" name="attr_Horsemanship_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Horsemanship}+@{roll_bonus_Horsemanship}]]d10k[[@{keep_Horsemanship}+@{keep_bonus_Horsemanship}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Horsemanship}+@{roll_bonus_Horsemanship}]]d10k[[@{keep_Horsemanship}+@{keep_bonus_Horsemanship}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Horsemanship}+@{roll_bonus_Horsemanship}]]d10k[[@{keep_Horsemanship}+@{keep_bonus_Horsemanship}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Horsemanship roll! \n\n/roll [[@{roll_Horsemanship}+@{roll_bonus_Horsemanship}]]d10k[[@{keep_Horsemanship}+@{keep_bonus_Horsemanship}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Horsemanship roll! \n\n/roll [[@{roll_Horsemanship}+@{roll_bonus_Horsemanship}]]d10k[[@{keep_Horsemanship}+@{keep_bonus_Horsemanship}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Horsemanship roll with Emphasis! \n\n/roll [[@{roll_Horsemanship}+@{roll_bonus_Horsemanship}]]d10k[[@{keep_Horsemanship}+@{keep_bonus_Horsemanship}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Hunting</td> 
@@ -679,9 +682,9 @@
             <td><input type="number" name="attr_roll_bonus_Hunting" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Hunting" value="0"></td>
             <td><input type="text" name="attr_Hunting_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Hunting}+@{roll_bonus_Hunting}]]d10k[[@{keep_Hunting}+@{keep_bonus_Hunting}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Hunting}+@{roll_bonus_Hunting}]]d10k[[@{keep_Hunting}+@{keep_bonus_Hunting}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Hunting}+@{roll_bonus_Hunting}]]d10k[[@{keep_Hunting}+@{keep_bonus_Hunting}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Hunting roll! \n\n/roll [[@{roll_Hunting}+@{roll_bonus_Hunting}]]d10k[[@{keep_Hunting}+@{keep_bonus_Hunting}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Hunting roll! \n\n/roll [[@{roll_Hunting}+@{roll_bonus_Hunting}]]d10k[[@{keep_Hunting}+@{keep_bonus_Hunting}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Hunting roll with Emphasis! \n\n/roll [[@{roll_Hunting}+@{roll_bonus_Hunting}]]d10k[[@{keep_Hunting}+@{keep_bonus_Hunting}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Iaijutsu</td> 
@@ -692,23 +695,23 @@
             <td><input type="number" name="attr_roll_bonus_Iaijutsu" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Iaijutsu" value="0"></td>
             <td><input type="text" name="attr_Iaijutsu_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Iaijutsu}+@{roll_bonus_Iaijutsu}]]d10k[[@{keep_Iaijutsu}+@{keep_bonus_Iaijutsu}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Iaijutsu}+@{roll_bonus_Iaijutsu}]]d10k[[@{keep_Iaijutsu}+@{keep_bonus_Iaijutsu}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Iaijutsu}+@{roll_bonus_Iaijutsu}]]d10k[[@{keep_Iaijutsu}+@{keep_bonus_Iaijutsu}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Iaijutsu roll! \n\n/roll [[@{roll_Iaijutsu}+@{roll_bonus_Iaijutsu}]]d10k[[@{keep_Iaijutsu}+@{keep_bonus_Iaijutsu}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Trained Iaijutsu roll! \n\n/roll [[@{roll_Iaijutsu}+@{roll_bonus_Iaijutsu}]]d10k[[@{keep_Iaijutsu}+@{keep_bonus_Iaijutsu}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Iaijutsu roll with Emphasis! \n\n/roll [[@{roll_Iaijutsu}+@{roll_bonus_Iaijutsu}]]d10k[[@{keep_Iaijutsu}+@{keep_bonus_Iaijutsu}]]!!r1"></button></td>
         </tr>
         <tr>
-            <td>Jiujiutsu</td> 
-            <td><input type="number" name="attr_rank_Jiujiutsu" value="0"></td>
+            <td>Jiujutsu</td> 
+            <td><input type="number" name="attr_rank_Jiujutsu" value="0"></td>
             <td>Agility</td>
-            <input type="hidden" name="attr_roll_Jiujiutsu" value="@{rank_Jiujiutsu}+@{Agility}" disabled>
-            <input type="hidden" name="attr_keep_Jiujiutsu" value="@{Agility}" disabled>
-            <td><input type="number" name="attr_roll_bonus_Jiujiutsu" value="0"></td>
-            <td><input type="number" name="attr_keep_bonus_Jiujiutsu" value="0"></td>
-            <td><input type="text" name="attr_Jiujiutsu_Emphases" value=""></td>
-            <td><button type="roll" name="Jiujitsu_Untrained_roll" value="/roll [[@{roll_Jiujiutsu}+@{roll_bonus_Jiujiutsu}]]d10k[[@{keep_Jiujiutsu}+@{keep_bonus_Jiujiutsu}]]"></button></td>
-            <td><button type="roll" name="Jiujitsu_Trained_roll" value="/roll [[@{roll_Jiujiutsu}+@{roll_bonus_Jiujiutsu}]]d10k[[@{keep_Jiujiutsu}+@{keep_bonus_Jiujiutsu}]]!!"></button></td>
-            <td><button type="roll" name="Jiujitsu_Emphasis_roll" value="/roll [[@{roll_Jiujiutsu}+@{roll_bonus_Jiujiutsu}]]d10k[[@{keep_Jiujiutsu}+@{keep_bonus_Jiujiutsu}]]!!&lt;1"></button></td>
-        </tr>
+            <input type="hidden" name="attr_roll_Jiujutsu" value="@{rank_Jiujutsu}+@{Agility}" disabled>
+            <input type="hidden" name="attr_keep_Jiujutsu" value="@{Agility}" disabled>
+            <td><input type="number" name="attr_roll_bonus_Jiujutsu" value="0"></td>
+            <td><input type="number" name="attr_keep_bonus_Jiujutsu" value="0"></td>
+            <td><input type="text" name="attr_Jiujutsu_Emphases" value=""></td>
+           <td><button type="roll" name="Jiujutsu_Untrained_roll" value="/em @{Name} makes an Untrained Jiujutsu roll! \n\n/roll [[@{roll_Jiujutsu}+@{roll_bonus_Jiujutsu}]]d10k[[@{keep_Jiujutsu}+@{keep_bonus_Jiujutsu}]]"></button></td>
+            <td><button type="roll" name="Jiujitsu_Trained_roll" value="/em @{Name} makes a Trained Jiujutsu roll! \n\n/roll [[@{roll_Jiujutsu}+@{roll_bonus_Jiujutsu}]]d10k[[@{keep_Jiujutsu}+@{keep_bonus_Jiujutsu}]]!!"></button></td>
+            <td><button type="roll" name="Jiujitsu_Emphasis_roll" value="/em @{Name} makes a Jiujutsu roll with Emphasis! \n\n/roll [[@{roll_Jiujutsu}+@{roll_bonus_Jiujutsu}]]d10k[[@{keep_Jiujutsu}+@{keep_bonus_Jiujutsu}]]!!r1"></button></td>
+         </tr>
         <tr>
             <td>Chain Weapons</td> 
             <td><input type="number" name="attr_rank_Chain_Weapons" value="0"></td>
@@ -718,9 +721,9 @@
             <td><input type="number" name="attr_roll_bonus_Chain_Weapons" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Chain_Weapons" value="0"></td>
             <td><input type="text" name="attr_Chain_Weapons_Emphases" value=""></td>
-            <td><button type="roll" name="Chain_Weapons_Untrained_roll" value="/roll [[@{roll_Chain_Weapons}+@{roll_bonus_Chain_Weapons}]]d10k[[@{keep_Chain_Weapons}+@{keep_bonus_Chain_Weapons}]]"></button></td>
-            <td><button type="roll" name="Chain_Weapons_Trained_roll" value="/roll [[@{roll_Chain_Weapons}+@{roll_bonus_Chain_Weapons}]]d10k[[@{keep_Chain_Weapons}+@{keep_bonus_Chain_Weapons}]]!!"></button></td>
-            <td><button type="roll" name="Chain_Weapons_Emphasis_roll" value="/roll [[@{roll_Chain_Weapons}+@{roll_bonus_Chain_Weapons}]]d10k[[@{keep_Chain_Weapons}+@{keep_bonus_Chain_Weapons}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Chain_Weapons_Untrained_roll" value="/em @{Name} makes an Untrained Chain Weapons roll! \n\n/roll [[@{roll_Chain_Weapons}+@{roll_bonus_Chain_Weapons}]]d10k[[@{keep_Chain_Weapons}+@{keep_bonus_Chain_Weapons}]]"></button></td>
+            <td><button type="roll" name="Chain_Weapons_Trained_roll" value="/em @{Name} makes a Trained Chain Weapons roll! \n\n/roll [[@{roll_Chain_Weapons}+@{roll_bonus_Chain_Weapons}]]d10k[[@{keep_Chain_Weapons}+@{keep_bonus_Chain_Weapons}]]!!"></button></td>
+            <td><button type="roll" name="Chain_Weapons_Emphasis_roll" value="/em @{Name} makes a Chain Weapons roll with Emphasis! \n\n/roll [[@{roll_Chain_Weapons}+@{roll_bonus_Chain_Weapons}]]d10k[[@{keep_Chain_Weapons}+@{keep_bonus_Chain_Weapons}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Heavy Weapons</td> 
@@ -731,22 +734,22 @@
             <td><input type="number" name="attr_roll_bonus_Heavy_Weapons" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Heavy_Weapons" value="0"></td>
             <td><input type="text" name="attr_Heavy_Weapons_Emphases" value=""></td>
-            <td><button type="roll" name="Heavy_Weapons_Untrained_roll" value="/roll [[@{roll_Heavy_Weapons}+@{roll_bonus_Heavy_Weapons}]]d10k[[@{keep_Heavy_Weapons}+@{keep_bonus_Heavy_Weapons}]]"></button></td>
-            <td><button type="roll" name="Heavy_Weapons_Trained_roll" value="/roll [[@{roll_Heavy_Weapons}+@{roll_bonus_Heavy_Weapons}]]d10k[[@{keep_Heavy_Weapons}+@{keep_bonus_Heavy_Weapons}]]!!"></button></td>
-            <td><button type="roll" name="Heavy_Weapons_Emphasis_roll" value="/roll [[@{roll_Heavy_Weapons}+@{roll_bonus_Heavy_Weapons}]]d10k[[@{keep_Heavy_Weapons}+@{keep_bonus_Heavy_Weapons}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Heavy_Weapons_Untrained_roll" value="/em @{Name} makes an Untrained Heavy Weapons roll! \n\n/roll [[@{roll_Heavy_Weapons}+@{roll_bonus_Heavy_Weapons}]]d10k[[@{keep_Heavy_Weapons}+@{keep_bonus_Heavy_Weapons}]]"></button></td>
+            <td><button type="roll" name="Heavy_Weapons_Trained_roll" value="/em @{Name} makes a Trained Heavy Weapons roll! \n\n/roll [[@{roll_Heavy_Weapons}+@{roll_bonus_Heavy_Weapons}]]d10k[[@{keep_Heavy_Weapons}+@{keep_bonus_Heavy_Weapons}]]!!"></button></td>
+            <td><button type="roll" name="Heavy_Weapons_Emphasis_roll" value="/em @{Name} makes a Heavy Weapons roll with Emphasis! \n\n/roll [[@{roll_Heavy_Weapons}+@{roll_bonus_Heavy_Weapons}]]d10k[[@{keep_Heavy_Weapons}+@{keep_bonus_Heavy_Weapons}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Kenjutsu</td> 
             <td><input type="number" name="attr_rank_Kenjutsu" value="0"></td>
             <td>Agility</td>
-            <input type="hidden" name="attr_roll_Kenjutsu" value="@{rank_Kenjutsu}+@{Agility}" disabled>
-            <input type="hidden" name="attr_keep_Kenjutsu" value="@{Agility}" disabled>
+            <input type="hidden" name="attr_roll_Kenjutsu" value="@{rank_Kenjutsu}+@{Agility}">
+            <input type="hidden" name="attr_keep_Kenjutsu" value="@{Agility}">
             <td><input type="number" name="attr_roll_bonus_Kenjutsu" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Kenjutsu" value="0"></td>
             <td><input type="text" name="attr_Kenjutsu_Emphases" value=""></td>
-            <td><button type="roll" name="Kenjutsu_Untrained_roll" value="/roll [[@{roll_Kenjutsu}+@{roll_bonus_Kenjutsu}]]d10k[[@{keep_Kenjutsu}+@{keep_bonus_Kenjutsu}]]"></button></td>
-            <td><button type="roll" name="Kenjutsu_Trained_roll" value="/roll [[@{roll_Kenjutsu}+@{roll_bonus_Kenjutsu}]]d10k[[@{keep_Kenjutsu}+@{keep_bonus_Kenjutsu}]]!!"></button></td>
-            <td><button type="roll" name="Kenjutsu_Emphasis_roll" value="/roll [[@{roll_Kenjutsu}+@{roll_bonus_Kenjutsu}]]d10k[[@{keep_Kenjutsu}+@{keep_bonus_Kenjutsu}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Kenjutsu_Untrained_roll" value="/em @{Name} makes an Untrained Kenjutsu roll! \n\n/roll [[@{roll_Kenjutsu}+@{roll_bonus_Kenjutsu}]]d10k[[@{keep_Kenjutsu}+@{keep_bonus_Kenjutsu}]]"></button></td>
+            <td><button type="roll" name="Kenjutsu_Trained_roll" value="/em @{Name} makes a Trained Kenjutsu roll! \n\n/roll [[@{roll_Kenjutsu}+@{roll_bonus_Kenjutsu}]]d10k[[@{keep_Kenjutsu}+@{keep_bonus_Kenjutsu}]]!!"></button></td>
+            <td><button type="roll" name="Kenjutsu_Emphasis_roll" value="/em @{Name} makes a Kenjutsu roll with Emphasis! \n\n/roll [[@{roll_Kenjutsu}+@{roll_bonus_Kenjutsu}]]d10k[[@{keep_Kenjutsu}+@{keep_bonus_Kenjutsu}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Knives</td> 
@@ -757,9 +760,9 @@
             <td><input type="number" name="attr_roll_bonus_Knives" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Knives" value="0"></td>
             <td><input type="text" name="attr_Knives_Emphases" value=""></td>
-            <td><button type="roll" name="Knives_Untrained_roll" value="/roll [[@{roll_Knives}+@{roll_bonus_Knives}]]d10k[[@{keep_Knives}+@{keep_bonus_Knives}]]"></button></td>
-            <td><button type="roll" name="Knives_Trained_roll" value="/roll [[@{roll_Knives}+@{roll_bonus_Knives}]]d10k[[@{keep_Knives}+@{keep_bonus_Knives}]]!!"></button></td>
-            <td><button type="roll" name="Knives_Emphasis_roll" value="/roll [[@{roll_Knives}+@{roll_bonus_Knives}]]d10k[[@{keep_Knives}+@{keep_bonus_Knives}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Knives_Untrained_roll" value="/em @{Name} makes an Untrained Knives roll! \n\n/roll [[@{roll_Knives}+@{roll_bonus_Knives}]]d10k[[@{keep_Knives}+@{keep_bonus_Knives}]]"></button></td>
+            <td><button type="roll" name="Knives_Trained_roll" value="/em @{Name} makes a Trained Knives roll! \n\n/roll [[@{roll_Knives}+@{roll_bonus_Knives}]]d10k[[@{keep_Knives}+@{keep_bonus_Knives}]]!!"></button></td>
+            <td><button type="roll" name="Knives_Emphasis_roll" value="/em @{Name} makes a Knives roll with Emphasis! \n\n/roll [[@{roll_Knives}+@{roll_bonus_Knives}]]d10k[[@{keep_Knives}+@{keep_bonus_Knives}]]!!&r1"></button></td>
         </tr>
         <tr>
             <td>Kyujutsu</td> 
@@ -770,35 +773,39 @@
             <td><input type="number" name="attr_roll_bonus_Kyujutsu" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Kyujutsu" value="0"></td>
             <td><input type="text" name="attr_Kyujutsu_Emphases" value=""></td>
-            <td><button type="roll" name="Kyujutsu_Untrained_roll" value="/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]"></button></td>
-            <td><button type="roll" name="Kyujutsu_Trained_roll" value="/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]!!"></button></td>
-            <td><button type="roll" name="Kyujutsu_Emphasis_roll" value="/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Kyujutsu_Untrained_roll" value="/em @{Name} makes an Untrained Kyujutsu roll! \n\n/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]"></button></td>
+            <td><button type="roll" name="Kyujutsu_Trained_roll" value="/em @{Name} makes a Trained Kyujutsu roll! \n\n/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]!!"></button></td>
+            <td><button type="roll" name="Kyujutsu_Emphasis_roll" value="/em @{Name} makes a Kyujutsu roll with Emphasis! \n\n/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]!!r1"></button></td>
         </tr>
         <tr>
-            <td>Ninjutsu Ranged</td> 
-            <td><input type="number" name="attr_rank_Ninjutsu_Ranged" value="0"></td>
-            <td>Reflexes</td>
-            <input type="hidden" name="attr_roll_Ninjutsu_Ranged" value="@{rank_Ninjutsu_Ranged}+@{Reflexes}" disabled>
-            <input type="hidden" name="attr_keep_Ninjutsu_Ranged" value="@{Reflexes}" disabled>
-            <td><input type="number" name="attr_roll_bonus_Ninjutsu_Ranged" value="0"></td>
-            <td><input type="number" name="attr_keep_bonus_Ninjutsu_Ranged" value="0"></td>
-            <td><input type="text" name="attr_Ninjutsu_Ranged_Emphases" value=""></td>
-            <td><button type="roll" name="Ninjutsu_Ranged_Untrained_roll" value="/roll [[@{roll_Ninjutsu_Ranged}+@{roll_bonus_Ninjutsu_Ranged}]]d10k[[@{keep_Ninjutsu_Ranged}+@{keep_bonus_Ninjutsu_Ranged}]]"></button></td>
-            <td><button type="roll" name="Ninjutsu_Ranged_Trained_roll" value="/roll [[@{roll_Ninjutsu_Ranged}+@{roll_bonus_Ninjutsu_Ranged}]]d10k[[@{keep_Ninjutsu_Ranged}+@{keep_bonus_Ninjutsu_Ranged}]]!!"></button></td>
-            <td><button type="roll" name="Ninjutsu_Ranged_Emphasis_roll" value="/roll [[@{roll_Ninjutsu_Ranged}+@{roll_bonus_Ninjutsu_Ranged}]]d10k[[@{keep_Ninjutsu_Ranged}+@{keep_bonus_Ninjutsu_Ranged}]]!!&lt;1"></button></td>
+            <td>Ninjutsu</td> 
+            <td><input type="number" name="attr_rank_Ninjutsu" value="0"></td>
+            <td>
+            <select name="attr_ninjutsu_stat" class="sheet-skillselect">
+            <option value="@{Agility}">Agility</option>
+            <option value="@{Reflexes}">Reflexes</option>
+            </select>
+            <input type="hidden" name="attr_roll_Ninjutsu" value="@{rank_Ninjutsu}+@{ninjutsu_stat}">
+            <input type="hidden" name="attr_keep_Ninjutsu" value="@{ninjutsu_stat}">
+            <td><input type="number" name="attr_roll_bonus_Ninjutsu" value="0"></td>
+            <td><input type="number" name="attr_keep_bonus_Ninjutsu" value="0"></td>
+            <td><input type="text" name="attr_Ninjutsu_Emphases" value=""></td>
+            <td><button type="roll" name="Ninjutsu_Untrained_roll" value="/em @{Name} makes an Untrained Ninjutsu roll! \n\n/roll [[@{roll_Ninjutsu}+@{roll_bonus_Ninjutsu}]]d10k[[@{keep_Ninjutsu}+@{keep_bonus_Ninjutsu}]]"></button></td>
+            <td><button type="roll" name="Ninjutsu_Trained_roll" value="/em @{Name} makes a Trained Ninjutsu roll! \n\n/roll [[@{roll_Ninjutsu}+@{roll_bonus_Ninjutsu}]]d10k[[@{keep_Ninjutsu}+@{keep_bonus_Ninjutsu}]]!!"></button></td>
+            <td><button type="roll" name="Ninjutsu_Emphasis_roll" value="/em @{Name} makes a Ninjutsu roll with Emphasis! \n\n/roll [[@{roll_Ninjutsu}+@{roll_bonus_Ninjutsu}]]d10k[[@{keep_Ninjutsu}+@{keep_bonus_Ninjutsu}]]!!r1"></button></td>
         </tr>
         <tr>
-            <td>Ninjutsu Melee</td> 
-            <td><input type="number" name="attr_rank_Ninjutsu_Melee" value="0"></td>
+            <td>Polearms</td> 
+            <td><input type="number" name="attr_rank_Polearms" value="0"></td>
             <td>Agility</td>
-            <input type="hidden" name="attr_roll_Ninjutsu_Melee" value="@{rank_Ninjutsu_Melee}+@{Agility}" disabled>
-            <input type="hidden" name="attr_keep_Ninjutsu_Melee" value="@{Agility}" disabled>
-            <td><input type="number" name="attr_roll_bonus_Ninjutsu_Melee" value="0"></td>
-            <td><input type="number" name="attr_keep_bonus_Ninjutsu_Melee" value="0"></td>
-            <td><input type="text" name="attr_Ninjutsu_Melee_Emphases" value=""></td>
-            <td><button type="roll" name="Ninjutsu_Melee_Untrained_roll" value="/roll [[@{roll_Ninjutsu_Melee}+@{roll_bonus_Ninjutsu_Melee}]]d10k[[@{keep_Ninjutsu_Melee}+@{keep_bonus_Ninjutsu_Melee}]]"></button></td>
-            <td><button type="roll" name="Ninjutsu_Melee_Trained_roll" value="/roll [[@{roll_Ninjutsu_Melee}+@{roll_bonus_Ninjutsu_Melee}]]d10k[[@{keep_Ninjutsu_Melee}+@{keep_bonus_Ninjutsu_Melee}]]!!"></button></td>
-            <td><button type="roll" name="Ninjutsu_Melee_Emphasis_roll" value="/roll [[@{roll_Ninjutsu_Melee}+@{roll_bonus_Ninjutsu_Melee}]]d10k[[@{keep_Ninjutsu_Melee}+@{keep_bonus_Ninjutsu_Melee}]]!!&lt;1"></button></td>
+            <input type="hidden" name="attr_roll_Polearms" value="@{rank_Polearms}+@{Agility}" disabled>
+            <input type="hidden" name="attr_keep_Polearms" value="@{Agility}" disabled>
+            <td><input type="number" name="attr_roll_bonus_Polearms" value="0"></td>
+            <td><input type="number" name="attr_keep_bonus_Polearms" value="0"></td>
+            <td><input type="text" name="attr_Polearms_Emphases" value=""></td>
+            <td><button type="roll" name="Polearms_Untrained_roll" value="/em @{Name} makes an Untrained Polearms roll! \n\n/roll [[@{roll_Polearms}+@{roll_bonus_Polearms}]]d10k[[@{keep_Polearms}+@{keep_bonus_Polearms}]]"></button></td>
+            <td><button type="roll" name="Polearms_Trained_roll" value="/em @{Name} makes a Trained Polearms roll! \n\n/roll [[@{roll_Polearms}+@{roll_bonus_Polearms}]]d10k[[@{keep_Polearms}+@{keep_bonus_Polearms}]]!!"></button></td>
+            <td><button type="roll" name="Polearms_Emphasis_roll" value="/em @{Name} makes a Polearms roll with Emphasis! \n\n/roll [[@{roll_Polearms}+@{roll_bonus_Polearms}]]d10k[[@{keep_Polearms}+@{keep_bonus_Polearms}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Spears</td> 
@@ -809,9 +816,9 @@
             <td><input type="number" name="attr_roll_bonus_Spears" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Spears" value="0"></td>
             <td><input type="text" name="attr_Spears_Emphases" value=""></td>
-            <td><button type="roll" name="Spears_Untrained_roll" value="/roll [[@{roll_Spears}+@{roll_bonus_Spears}]]d10k[[@{keep_Spears}+@{keep_bonus_Spears}]]"></button></td>
-            <td><button type="roll" name="Spears_Trained_roll" value="/roll [[@{roll_Spears}+@{roll_bonus_Spears}]]d10k[[@{keep_Spears}+@{keep_bonus_Spears}]]!!"></button></td>
-            <td><button type="roll" name="Spears_Emphasis_roll" value="/roll [[@{roll_Spears}+@{roll_bonus_Spears}]]d10k[[@{keep_Spears}+@{keep_bonus_Spears}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Spears_Untrained_roll" value="/em @{Name} makes an Untrained Spears roll! \n\n/roll [[@{roll_Spears}+@{roll_bonus_Spears}]]d10k[[@{keep_Spears}+@{keep_bonus_Spears}]]"></button></td>
+            <td><button type="roll" name="Spears_Trained_roll" value="/em @{Name} makes a Trained Spears roll! \n\n/roll [[@{roll_Spears}+@{roll_bonus_Spears}]]d10k[[@{keep_Spears}+@{keep_bonus_Spears}]]!!"></button></td>
+            <td><button type="roll" name="Spears_Emphasis_roll" value="/em @{Name} makes a Spears roll with Emphasis! \n\n/roll [[@{roll_Spears}+@{roll_bonus_Spears}]]d10k[[@{keep_Spears}+@{keep_bonus_Spears}]]!!r1"></button></td>
         </tr>
         <tr>
             <td>Staves</td> 
@@ -822,12 +829,12 @@
             <td><input type="number" name="attr_roll_bonus_Staves" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Staves" value="0"></td>
             <td><input type="text" name="attr_Staves_Emphases" value=""></td>
-            <td><button type="roll" name="Staves_Untrained_roll" value="/roll [[@{roll_Staves}+@{roll_bonus_Staves}]]d10k[[@{keep_Staves}+@{keep_bonus_Staves}]]"></button></td>
-            <td><button type="roll" name="Staves_Trained_roll" value="/roll [[@{roll_Staves}+@{roll_bonus_Staves}]]d10k[[@{keep_Staves}+@{keep_bonus_Staves}]]!!"></button></td>
-            <td><button type="roll" name="Staves_Emphasis_roll" value="/roll [[@{roll_Staves}+@{roll_bonus_Staves}]]d10k[[@{keep_Staves}+@{keep_bonus_Staves}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="Staves_Untrained_roll" value="/em @{Name} makes an Untrained Staves roll! \n\n/roll [[@{roll_Staves}+@{roll_bonus_Staves}]]d10k[[@{keep_Staves}+@{keep_bonus_Staves}]]"></button></td>
+            <td><button type="roll" name="Staves_Trained_roll" value="/em @{Name} makes a Trained Staves roll! \n\n/roll [[@{roll_Staves}+@{roll_bonus_Staves}]]d10k[[@{keep_Staves}+@{keep_bonus_Staves}]]!!"></button></td>
+            <td><button type="roll" name="Staves_Emphasis_roll" value="/em @{Name} makes a Staves roll with Emphasis! \n\n/roll [[@{roll_Staves}+@{roll_bonus_Staves}]]d10k[[@{keep_Staves}+@{keep_bonus_Staves}]]!!r1"></button></td>
         </tr>
         <tr>
-            <td>WarFan</td> 
+            <td>War Fan</td> 
             <td><input type="number" name="attr_rank_WarFan" value="0"></td>
             <td>Agility</td>
             <input type="hidden" name="attr_roll_WarFan" value="@{rank_WarFan}+@{Agility}" disabled>
@@ -835,13 +842,11 @@
             <td><input type="number" name="attr_roll_bonus_WarFan" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_WarFan" value="0"></td>
             <td><input type="text" name="attr_WarFan_Emphases" value=""></td>
-            <td><button type="roll" name="WarFan_Untrained_roll" value="/roll [[@{roll_WarFan}+@{roll_bonus_WarFan}]]d10k[[@{keep_WarFan}+@{keep_bonus_WarFan}]]"></button></td>
-            <td><button type="roll" name="WarFan_Trained_roll" value="/roll [[@{roll_WarFan}+@{roll_bonus_WarFan}]]d10k[[@{keep_WarFan}+@{keep_bonus_WarFan}]]!!"></button></td>
-            <td><button type="roll" name="WarFan_Emphasis_roll" value="/roll [[@{roll_WarFan}+@{roll_bonus_WarFan}]]d10k[[@{keep_WarFan}+@{keep_bonus_WarFan}]]!!&lt;1"></button></td>
+            <td><button type="roll" name="WarFan_Untrained_roll" value="/em @{Name} makes an Untrained War Fan roll! \n\n/roll [[@{roll_WarFan}+@{roll_bonus_WarFan}]]d10k[[@{keep_WarFan}+@{keep_bonus_WarFan}]]"></button></td>
+            <td><button type="roll" name="WarFan_Trained_roll" value="/em @{Name} makes a Trained War Fan roll! \n\n/roll [[@{roll_WarFan}+@{roll_bonus_WarFan}]]d10k[[@{keep_WarFan}+@{keep_bonus_WarFan}]]!!"></button></td>
+            <td><button type="roll" name="WarFan_Emphasis_roll" value="/em @{Name} makes a War Fan roll with Emphasis! \n\n/roll [[@{roll_WarFan}+@{roll_bonus_WarFan}]]d10k[[@{keep_WarFan}+@{keep_bonus_WarFan}]]!!r1"></button></td>
         </tr>
     </table>    
-    </fieldset>
-     <fieldset>
             <h1><span>Merchant Skills</span></h1>
             <table style="border-collapse:collapse;border-spacing:0">
         <tr>
@@ -865,9 +870,9 @@
             <td><input type="number" name="attr_roll_bonus_AnimalHandling" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_AnimalHandling" value="0"></td>
             <td><input type="text" name="attr_AnimalHandling_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_AnimalHandling}+@{roll_bonus_AnimalHandling}]]d10k[[@{keep_AnimalHandling}+@{keep_bonus_AnimalHandling}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_AnimalHandling}+@{roll_bonus_AnimalHandling}]]d10k[[@{keep_AnimalHandling}+@{keep_bonus_AnimalHandling}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_AnimalHandling}+@{roll_bonus_AnimalHandling}]]d10k[[@{keep_AnimalHandling}+@{keep_bonus_AnimalHandling}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Animal Handling roll! \n\n/roll [[@{roll_AnimalHandling}+@{roll_bonus_AnimalHandling}]]d10k[[@{keep_AnimalHandling}+@{keep_bonus_AnimalHandling}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Animal Handling roll! \n\n/roll [[@{roll_AnimalHandling}+@{roll_bonus_AnimalHandling}]]d10k[[@{keep_AnimalHandling}+@{keep_bonus_AnimalHandling}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Animal Handling roll with Emphasis! \n\n/roll [[@{roll_AnimalHandling}+@{roll_bonus_AnimalHandling}]]d10k[[@{keep_AnimalHandling}+@{keep_bonus_AnimalHandling}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Commerce</td> 
@@ -878,9 +883,9 @@
             <td><input type="number" name="attr_roll_bonus_Commerce" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Commerce" value="0"></td>
             <td><input type="text" name="attr_Commerce_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Commerce}+@{roll_bonus_Commerce}]]d10k[[@{keep_Commerce}+@{keep_bonus_Commerce}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Commerce}+@{roll_bonus_Commerce}]]d10k[[@{keep_Commerce}+@{keep_bonus_Commerce}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Commerce}+@{roll_bonus_Commerce}]]d10k[[@{keep_Commerce}+@{keep_bonus_Commerce}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Commerce roll! \n\n/roll [[@{roll_Commerce}+@{roll_bonus_Commerce}]]d10k[[@{keep_Commerce}+@{keep_bonus_Commerce}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Commerce roll! \n\n/roll [[@{roll_Commerce}+@{roll_bonus_Commerce}]]d10k[[@{keep_Commerce}+@{keep_bonus_Commerce}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Commerce roll with Emphasis! \n\n/roll [[@{roll_Commerce}+@{roll_bonus_Commerce}]]d10k[[@{keep_Commerce}+@{keep_bonus_Commerce}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Craft</td> 
@@ -891,9 +896,9 @@
             <td><input type="number" name="attr_roll_bonus_Craft" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Craft" value="0"></td>
             <td><input type="text" name="attr_Craft_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Craft}+@{roll_bonus_Craft}]]d10k[[@{keep_Craft}+@{keep_bonus_Craft}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Craft}+@{roll_bonus_Craft}]]d10k[[@{keep_Craft}+@{keep_bonus_Craft}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Craft}+@{roll_bonus_Craft}]]d10k[[@{keep_Craft}+@{keep_bonus_Craft}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Craft roll! \n\n/roll [[@{roll_Craft}+@{roll_bonus_Craft}]]d10k[[@{keep_Craft}+@{keep_bonus_Craft}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Craft roll! \n\n/roll [[@{roll_Craft}+@{roll_bonus_Craft}]]d10k[[@{keep_Craft}+@{keep_bonus_Craft}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Craft roll  with Emphasis! \n\n/roll [[@{roll_Craft}+@{roll_bonus_Craft}]]d10k[[@{keep_Craft}+@{keep_bonus_Craft}]]!!r1"></button></td>
             <td><input type="text" class="regular" name="attr_Craft_type" value=""></td>
     </tr>
     <tr>
@@ -905,38 +910,23 @@
             <td><input type="number" name="attr_roll_bonus_Engineering" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Engineering" value="0"></td>
             <td><input type="text" name="attr_Engineering_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Engineering}+@{roll_bonus_Engineering}]]d10k[[@{keep_Engineering}+@{keep_bonus_Engineering}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Engineering}+@{roll_bonus_Engineering}]]d10k[[@{keep_Engineering}+@{keep_bonus_Engineering}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Engineering}+@{roll_bonus_Engineering}]]d10k[[@{keep_Engineering}+@{keep_bonus_Engineering}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Engineering roll! \n\n/roll [[@{roll_Engineering}+@{roll_bonus_Engineering}]]d10k[[@{keep_Engineering}+@{keep_bonus_Engineering}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Engineering roll! \n\n/roll [[@{roll_Engineering}+@{roll_bonus_Engineering}]]d10k[[@{keep_Engineering}+@{keep_bonus_Engineering}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Engineering roll with Emphasis! \n\n/roll [[@{roll_Engineering}+@{roll_bonus_Engineering}]]d10k[[@{keep_Engineering}+@{keep_bonus_Engineering}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Sailing</td> 
             <td><input type="number" name="attr_rank_Sailing" value="0"></td>
-            <td>Agility</td>
-            <input type="hidden" name="attr_roll_Sailing" value="@{rank_Sailing}+@{Agility}" disabled>
-            <input type="hidden" name="attr_keep_Sailing" value="@{Agility}" disabled>
+            <td><select class="sheet-skillselect"name="attr_sailing_stat"><option value="@{Agility}">Agility</option><option value="@{Intelligence}">Intelligence</option></select><input type="hidden" name="attr_roll_Sailing" value="@{rank_Sailing}+@{sailing_stat}">
+            <input type="hidden" name="attr_keep_Sailing" value="@{sailing_stat}"></td>
             <td><input type="number" name="attr_roll_bonus_Sailing" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Sailing" value="0"></td>
             <td><input type="text" name="attr_Sailing_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Sailing}+@{roll_bonus_Sailing}]]d10k[[@{keep_Sailing}+@{keep_bonus_Sailing}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Sailing}+@{roll_bonus_Sailing}]]d10k[[@{keep_Sailing}+@{keep_bonus_Sailing}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Sailing}+@{roll_bonus_Sailing}]]d10k[[@{keep_Sailing}+@{keep_bonus_Sailing}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Sailing roll! \n\n/roll [[@{roll_Sailing}+@{roll_bonus_Sailing}]]d10k[[@{keep_Sailing}+@{keep_bonus_Sailing}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Sailing roll! \n\n/roll [[@{roll_Sailing}+@{roll_bonus_Sailing}]]d10k[[@{keep_Sailing}+@{keep_bonus_Sailing}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Sailing roll with Emphasis! \n\n/roll [[@{roll_Sailing}+@{roll_bonus_Sailing}]]d10k[[@{keep_Sailing}+@{keep_bonus_Sailing}]]!!r1"></button></td>
     </tr>
-    <tr>
-            <td>Sailing</td> 
-            <td><input type="number" name="attr_rank_Sailing2" value="0"></td>
-            <td>Intelligence</td>
-            <input type="hidden" name="attr_roll_Sailing2" value="@{rank_Sailing2}+@{Intelligence}" disabled>
-            <input type="hidden" name="attr_keep_Sailing2" value="@{Intelligence}" disabled>
-            <td><input type="number" name="attr_roll_bonus_Sailing" value="0"></td>
-            <td><input type="number" name="attr_keep_bonus_Sailing" value="0"></td>
-            <td><input type="text" name="attr_Sailing_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Sailing2}+@{roll_bonus_Sailing2}]]d10k[[@{keep_Sailing2}+@{keep_bonus_Sailing2}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Sailing2}+@{roll_bonus_Sailing2}]]d10k[[@{keep_Sailing2}+@{keep_bonus_Sailing2}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Sailing2}+@{roll_bonus_Sailing2}]]d10k[[@{keep_Sailing2}+@{keep_bonus_Sailing2}]]!!&lt;1"></button></td>
-    </tr>
-    </table></fieldset>
-    <fieldset>
+    </table>
             <h1><span>Low Skills</span></h1>
             <table style="border-collapse:collapse;border-spacing:0">
         <tr>
@@ -960,9 +950,9 @@
             <td><input type="number" name="attr_roll_bonus_Forgery" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Forgery" value="0"></td>
             <td><input type="text" name="attr_Forgery_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Forgery}+@{roll_bonus_Forgery}]]d10k[[@{keep_Forgery}+@{keep_bonus_Forgery}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Forgery}+@{roll_bonus_Forgery}]]d10k[[@{keep_Forgery}+@{keep_bonus_Forgery}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Forgery}+@{roll_bonus_Forgery}]]d10k[[@{keep_Forgery}+@{keep_bonus_Forgery}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Forgery roll! \n\n/roll [[@{roll_Forgery}+@{roll_bonus_Forgery}]]d10k[[@{keep_Forgery}+@{keep_bonus_Forgery}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Forgery roll! \n\n/roll [[@{roll_Forgery}+@{roll_bonus_Forgery}]]d10k[[@{keep_Forgery}+@{keep_bonus_Forgery}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Forgery roll with Emphasis! \n\n/roll [[@{roll_Forgery}+@{roll_bonus_Forgery}]]d10k[[@{keep_Forgery}+@{keep_bonus_Forgery}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Intimidation</td> 
@@ -973,9 +963,9 @@
             <td><input type="number" name="attr_roll_bonus_Intimidation" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Intimidation" value="0"></td>
             <td><input type="text" name="attr_Intimidation_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Intimidation}+@{roll_bonus_Intimidation}]]d10k[[@{keep_Intimidation}+@{keep_bonus_Intimidation}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Intimidation}+@{roll_bonus_Intimidation}]]d10k[[@{keep_Intimidation}+@{keep_bonus_Intimidation}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Intimidation}+@{roll_bonus_Intimidation}]]d10k[[@{keep_Intimidation}+@{keep_bonus_Intimidation}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Intimidation roll! \n\n/roll [[@{roll_Intimidation}+@{roll_bonus_Intimidation}]]d10k[[@{keep_Intimidation}+@{keep_bonus_Intimidation}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Intimidation roll! \n\n/roll [[@{roll_Intimidation}+@{roll_bonus_Intimidation}]]d10k[[@{keep_Intimidation}+@{keep_bonus_Intimidation}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Intimidation roll with Emphasis! \n\n/roll [[@{roll_Intimidation}+@{roll_bonus_Intimidation}]]d10k[[@{keep_Intimidation}+@{keep_bonus_Intimidation}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Sleight of Hand</td> 
@@ -986,9 +976,9 @@
             <td><input type="number" name="attr_roll_bonus_SleightofHand" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_SleightofHand" value="0"></td>
             <td><input type="text" name="attr_SleightofHand_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_SleightofHand}+@{roll_bonus_SleightofHand}]]d10k[[@{keep_SleightofHand}+@{keep_bonus_SleightofHand}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_SleightofHand}+@{roll_bonus_SleightofHand}]]d10k[[@{keep_SleightofHand}+@{keep_bonus_SleightofHand}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_SleightofHand}+@{roll_bonus_SleightofHand}]]d10k[[@{keep_SleightofHand}+@{keep_bonus_SleightofHand}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Sleight of Hand roll! \n\n/roll [[@{roll_SleightofHand}+@{roll_bonus_SleightofHand}]]d10k[[@{keep_SleightofHand}+@{keep_bonus_SleightofHand}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Sleight of Hand roll! \n\n/roll [[@{roll_SleightofHand}+@{roll_bonus_SleightofHand}]]d10k[[@{keep_SleightofHand}+@{keep_bonus_SleightofHand}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Sleight of Hand roll with Emphasis! \n\n/roll [[@{roll_SleightofHand}+@{roll_bonus_SleightofHand}]]d10k[[@{keep_SleightofHand}+@{keep_bonus_SleightofHand}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Stealth</td> 
@@ -999,9 +989,9 @@
             <td><input type="number" name="attr_roll_bonus_Stealth" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Stealth" value="0"></td>
             <td><input type="text" name="attr_Stealth_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Stealth}+@{roll_bonus_Stealth}]]d10k[[@{keep_Stealth}+@{keep_bonus_Stealth}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Stealth}+@{roll_bonus_Stealth}]]d10k[[@{keep_Stealth}+@{keep_bonus_Stealth}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Stealth}+@{roll_bonus_Stealth}]]d10k[[@{keep_Stealth}+@{keep_bonus_Stealth}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes an Untrained Stealth roll! \n\n/roll [[@{roll_Stealth}+@{roll_bonus_Stealth}]]d10k[[@{keep_Stealth}+@{keep_bonus_Stealth}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Stealth roll! \n\n/roll [[@{roll_Stealth}+@{roll_bonus_Stealth}]]d10k[[@{keep_Stealth}+@{keep_bonus_Stealth}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Stealth roll with Emphasis! \n\n/roll [[@{roll_Stealth}+@{roll_bonus_Stealth}]]d10k[[@{keep_Stealth}+@{keep_bonus_Stealth}]]!!r1"></button></td>
     </tr>
     <tr>
             <td>Temptation</td> 
@@ -1012,11 +1002,11 @@
             <td><input type="number" name="attr_roll_bonus_Temptation" value="0"></td>
             <td><input type="number" name="attr_keep_bonus_Temptation" value="0"></td>
             <td><input type="text" name="attr_Temptation_Emphases" value=""></td>
-            <td><button type="roll" value="/roll [[@{roll_Temptation}+@{roll_bonus_Temptation}]]d10k[[@{keep_Temptation}+@{keep_bonus_Temptation}]]"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Temptation}+@{roll_bonus_Temptation}]]d10k[[@{keep_Temptation}+@{keep_bonus_Temptation}]]!!"></button></td>
-            <td><button type="roll" value="/roll [[@{roll_Temptation}+@{roll_bonus_Temptation}]]d10k[[@{keep_Temptation}+@{keep_bonus_Temptation}]]!!&lt;1"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Untrained Temptation roll! \n\n/roll [[@{roll_Temptation}+@{roll_bonus_Temptation}]]d10k[[@{keep_Temptation}+@{keep_bonus_Temptation}]]"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Trained Temptation roll! \n\n/roll [[@{roll_Temptation}+@{roll_bonus_Temptation}]]d10k[[@{keep_Temptation}+@{keep_bonus_Temptation}]]!!"></button></td>
+            <td><button type="roll" value="/em @{Name} makes a Temptation roll with Emphasis! \n\n/roll [[@{roll_Temptation}+@{roll_bonus_Temptation}]]d10k[[@{keep_Temptation}+@{keep_bonus_Temptation}]]!!r1"></button></td>
     </tr>
-    </table></fieldset>
+    </table>
     
 
 </div>
@@ -1027,157 +1017,301 @@
      
 <div class="tab-content weapons-tab">
     U = Untrained Attack | T = Trained Attack | E = Emphasis Attack
-         <fieldset>
             <h1 class="separator vspace"><span>Melee Weapons</span></h1>
-            <table style='border-collapse: collapse; border-spacing: 0;'>
-            <table style='border-collapse: collapse; border-spacing: 0;'>
+            <table style='border-collapse: collapse; border-spacing: 0; width:100%'>
     <tr>
             <td style='font-weight: bold;'>Weapon</td>
             <td style='font-weight: bold;'>Skill</td>
+            <td style="font-weight: bold">Ability</td>
+            <td style="font-weight: bold">Attack Bonus Roll</td>
+            <td style="font-weight: bold">Attack Bonus Keep</td>
             <td style='font-weight: bold;'>U</td>
             <td style='font-weight: bold;'>T</td>
             <td style='font-weight: bold;'>E</td>
-            <td style='font-weight: bold;'><div>Weapon</div> <div>Damage</div> <div>Roll</div></td>
-            <td style='font-weight: bold;'><div>Weapon</div> <div>Damage</div> <div>Keep</div></td>
+            <td style='font-weight: bold;'><div>Weapon Damage Roll</div></td>
+            <td style='font-weight: bold;'><div>Weapon Damage Keep</div></td>
             <td style='font-weight: bold;'>Damage</td>
             <td style='font-weight: bold;'>Notes</td>
    </tr>
-   
-    <fieldset class="repeating_weapons">
-    <tr>
-        <td><input type="text" name="attr_Weapon" class="regular"></td>
-        <td><select class="narrow" name="attr_WeaponSkill">
-                     <option value="Jiujiutsu">Jiujiutsu</option>
-                     <option value="Chain_Weapons">Chain Weapons</option>
-                     <option value="Heavy_Weapons">Heavy Weapons</option>
-                     <option value="Kenjutsu">Kenjutsu</option>
-                     <option value="Knives">Knives</option>
-                     <option value="Kyujutsu">Kyujutsu</option>
-                     <option value="Ninjutsu_Ranged">Ninjutsu (Ranged)</option>
-                     <option value="Ninjutsu_Melee">Ninjutsu (Melee)</option>
-                     <option value="Ninjutsu_Melee">Ninjutsu (Melee)</option>
-                     <option value="Spears">Spears</option>
-                     <option value="Staves">Staves</option>
-                     <option value="WarFan">War Fan</option>
+   <tr>
+        <td><input type="text" name="attr_Weapon1" class="regular"></td>
+        <td><select class="regular" name="attr_Weapon1Skill">
+                     <option value="@{rank_Jiujutsu}">Jiujutsu</option>
+                     <option value="@{rank_Chain_Weapons}">Chain Weapons</option>
+                     <option value="@{rank_Heavy_Weapons}">Heavy Weapons</option>
+                     <option value="@{rank_Kenjutsu}">Kenjutsu</option>
+                     <option value="@{rank_Knives}">Knives</option>
+                     <option value="@{rank_Ninjutsu}">Ninjutsu</option>
+                     <option value="@{rank_Polearms}">Polearms</option>
+                     <option value="@{rank_Spears}">Spears</option>
+                     <option value="@{rank_Staves}">Staves</option>
+                     <option value="@{rank_WarFan}">War Fan</option>
                      </select></td>
-        <td><button type="roll" name="roll_untrained_attack" value="#[[@{WeaponSkill}&_Untrained_roll]]"></button></td>
-        <td><button type="roll" name="roll_trained_attack" value="#[[@{WeaponSkill}&_Trained_roll]]"></button></td>
-        <td><button type="roll" name="roll_emphasis_attack" value="#[[@{WeaponSkill}&_Emphasis_roll]]"></button></td>
-        <td><input type="number" name="attr_WeaponDamageRoll" class="sheet-short" value="1"></td>
-        <td><input type="number" name="attr_WeaponDamageKeep" class="sheet-short" value="1"></td>
-        <td><button type="roll" name="roll_damage1" value="/roll [[@{WeaponDamageRoll}+@{Strength}]]d10k[[@{WeaponDamageKeep}]]!!"></button></td>
+        <td><select class="narrow" name="attr_Weapon1Attribute"><option value="@{Agility}">Agility</option><option value="@{Reflexes}">Reflexes</option></select></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon1ABRoll" /></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon1ABKeep" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{name} makes an Untrained attack with their @{Weapon1}! \n\n/roll [[@{Weapon1Skill} + @{Weapon1Attribute} + @{Weapon1ABRoll}]]d10k[[@{Weapon1Attribute} + @{Weapon1ABKeep}]]"></button></td>
+        <td><button type="roll" name="roll_trained_attack" value="/em @{name} makes a Trained attack with their @{Weapon1}! \n\n/roll [[@{Weapon1Skill} + @{Weapon1Attribute} + @{Weapon1ABRoll}]]d10k[[@{Weapon1Attribute} + @{Weapon1ABKeep}]]!!"></button></td>
+        <td><button type="roll" name="roll_emphasis_attack" value="/em @{name} makes an attack with Emphasis with their @{Weapon1}! \n\n/roll [[@{Weapon1Skill} + @{Weapon1Attribute} + @{Weapon1ABRoll}]]d10k[[@{Weapon1Attribute} + @{Weapon1ABKeep}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Weapon1DamageRoll" class="sheet-short" value="1"></td>
+        <td><input type="number" name="attr_Weapon1DamageKeep" class="sheet-short" value="1"></td>
+        <td><button type="roll" name="roll_damage" value="/em @{name} deals damage! \n\n/roll [[@{Weapon1DamageRoll}+@{Strength}]]d10k[[@{Weapon1DamageKeep}]]!!"></button></td>
         <td><input type="text" name="attr_Notes" class="sheet-short"></td>
-    </tr>
-   </table> </fieldset>
-    <fieldset>
+        </tr>
+    	
+	   <tr>
+        <td><input type="text" name="attr_Weapon2" class="regular"></td>
+        <td><select class="regular" name="attr_Weapon2Skill">
+                     <option value="@{rank_Jiujutsu}">Jiujutsu</option>
+                     <option value="@{rank_Chain_Weapons}">Chain Weapons</option>
+                     <option value="@{rank_Heavy_Weapons}">Heavy Weapons</option>
+                     <option value="@{rank_Kenjutsu}">Kenjutsu</option>
+                     <option value="@{rank_Knives}">Knives</option>
+                     <option value="@{rank_Ninjutsu}">Ninjutsu</option>
+                     <option value="@{rank_Polearms}">Polearms</option>
+                     <option value="@{rank_Spears}">Spears</option>
+                     <option value="@{rank_Staves}">Staves</option>
+                     <option value="@{rank_WarFan}">War Fan</option>
+                     </select></td>
+        <td><select class="narrow" name="attr_Weapon2Attribute"><option value="@{Agility}">Agility</option><option value="@{Reflexes}">Reflexes</option></select></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon2ABRoll" /></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon2ABKeep" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{name} makes an Untrained attack with their @{Weapon2}! \n\n/roll [[@{Weapon2Skill} + @{Weapon2Attribute} + @{Weapon2ABRoll}]]d10k[[@{Weapon2Attribute} + @{Weapon2ABKeep}]]"></button></td>
+        <td><button type="roll" name="roll_trained_attack" value="/em @{name} makes a Trained attack with their @{Weapon2}! \n\n/roll [[@{Weapon2Skill} + @{Weapon2Attribute} + @{Weapon2ABRoll}]]d10k[[@{Weapon2Attribute} + @{Weapon2ABKeep}]]!!"></button></td>
+        <td><button type="roll" name="roll_emphasis_attack" value="/em @{name} makes an attack with Emphasis with their @{Weapon2}! \n\n/roll [[@{Weapon2Skill} + @{Weapon2Attribute} + @{Weapon2ABRoll}]]d10k[[@{Weapon2Attribute} + @{Weapon2ABKeep}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Weapon2DamageRoll" class="sheet-short" value="1"></td>
+        <td><input type="number" name="attr_Weapon2DamageKeep" class="sheet-short" value="1"></td>
+        <td><button type="roll" name="roll_damage" value="/em @{name} deals damage! \n\n/roll [[@{Weapon2DamageRoll}+@{Strength}]]d10k[[@{Weapon2DamageKeep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+        </tr>
+	   <tr>
+        <td><input type="text" name="attr_Weapon3" class="regular"></td>
+        <td><select class="regular" name="attr_Weapon3Skill">
+                     <option value="@{rank_Jiujutsu}">Jiujutsu</option>
+                     <option value="@{rank_Chain_Weapons}">Chain Weapons</option>
+                     <option value="@{rank_Heavy_Weapons}">Heavy Weapons</option>
+                     <option value="@{rank_Kenjutsu}">Kenjutsu</option>
+                     <option value="@{rank_Knives}">Knives</option>
+                     <option value="@{rank_Ninjutsu}">Ninjutsu</option>
+                     <option value="@{rank_Polearms}">Polearms</option>
+                     <option value="@{rank_Spears}">Spears</option>
+                     <option value="@{rank_Staves}">Staves</option>
+                     <option value="@{rank_WarFan}">War Fan</option>
+                     </select></td>
+        <td><select class="narrow" name="attr_Weapon3Attribute"><option value="@{Agility}">Agility</option><option value="@{Reflexes}">Reflexes</option></select></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon3ABRoll" /></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon3ABKeep" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{name} makes an Untrained attack with their @{Weapon3}! \n\n/roll [[@{Weapon3Skill} + @{Weapon3Attribute} + @{Weapon3ABRoll}]]d10k[[@{Weapon3Attribute} + @{Weapon3ABKeep}]]"></button></td>
+        <td><button type="roll" name="roll_trained_attack" value="/em @{name} makes a Trained attack with their @{Weapon3}! \n\n/roll [[@{Weapon3Skill} + @{Weapon3Attribute} + @{Weapon3ABRoll}]]d10k[[@{Weapon3Attribute} + @{Weapon3ABKeep}]]!!"></button></td>
+        <td><button type="roll" name="roll_emphasis_attack" value="/em @{name} makes an attack with Emphasis with their @{Weapon3}! \n\n/roll [[@{Weapon3Skill} + @{Weapon3Attribute} + @{Weapon3ABRoll}]]d10k[[@{Weapon3Attribute} + @{Weapon3ABKeep}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Weapon3DamageRoll" class="sheet-short" value="1"></td>
+        <td><input type="number" name="attr_Weapon3DamageKeep" class="sheet-short" value="1"></td>
+        <td><button type="roll" name="roll_damage" value="/em @{name} deals damage! \n\n/roll [[@{Weapon3DamageRoll}+@{Strength}]]d10k[[@{Weapon3DamageKeep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+        </tr>
+   <tr>
+        <td><input type="text" name="attr_Weapon4" class="regular"></td>
+        <td><select class="regular" name="attr_Weapon4Skill">
+                     <option value="@{rank_Jiujutsu}">Jiujutsu</option>
+                     <option value="@{rank_Chain_Weapons}">Chain Weapons</option>
+                     <option value="@{rank_Heavy_Weapons}">Heavy Weapons</option>
+                     <option value="@{rank_Kenjutsu}">Kenjutsu</option>
+                     <option value="@{rank_Knives}">Knives</option>
+                     <option value="@{rank_Ninjutsu}">Ninjutsu</option>
+                     <option value="@{rank_Polearms}">Polearms</option>
+                     <option value="@{rank_Spears}">Spears</option>
+                     <option value="@{rank_Staves}">Staves</option>
+                     <option value="@{rank_WarFan}">War Fan</option>
+                     </select></td>
+        <td><select class="narrow" name="attr_Weapon4Attribute"><option value="@{Agility}">Agility</option><option value="@{Reflexes}">Reflexes</option></select></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon4ABRoll" /></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon4ABKeep" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{name} makes an Untrained attack with their @{Weapon4}! \n\n/roll [[@{Weapon4Skill} + @{Weapon4Attribute} + @{Weapon4ABRoll}]]d10k[[@{Weapon4Attribute} + @{Weapon4ABKeep}]]"></button></td>
+        <td><button type="roll" name="roll_trained_attack" value="/em @{name} makes a Trained attack with their @{Weapon4}! \n\n/roll [[@{Weapon4Skill} + @{Weapon4Attribute} + @{Weapon4ABRoll}]]d10k[[@{Weapon4Attribute} + @{Weapon4ABKeep}]]!!"></button></td>
+        <td><button type="roll" name="roll_emphasis_attack" value="/em @{name} makes an attack with Emphasis with their @{Weapon4}! \n\n/roll [[@{Weapon4Skill} + @{Weapon4Attribute} + @{Weapon4ABRoll}]]d10k[[@{Weapon4Attribute} + @{Weapon4ABKeep}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Weapon4DamageRoll" class="sheet-short" value="1"></td>
+        <td><input type="number" name="attr_Weapon4DamageKeep" class="sheet-short" value="1"></td>
+        <td><button type="roll" name="roll_damage" value="/em @{name} deals damage! \n\n/roll [[@{Weapon4DamageRoll}+@{Strength}]]d10k[[@{Weapon4DamageKeep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+        </tr>
+	   <tr>
+        <td><input type="text" name="attr_Weapon5" class="regular"></td>
+        <td><select class="regular" name="attr_Weapon5Skill">
+                     <option value="@{rank_Jiujutsu}">Jiujutsu</option>
+                     <option value="@{rank_Chain_Weapons}">Chain Weapons</option>
+                     <option value="@{rank_Heavy_Weapons}">Heavy Weapons</option>
+                     <option value="@{rank_Kenjutsu}">Kenjutsu</option>
+                     <option value="@{rank_Knives}">Knives</option>
+                     <option value="@{rank_Ninjutsu}">Ninjutsu</option>
+                     <option value="@{rank_Polearms}">Polearms</option>
+                     <option value="@{rank_Spears}">Spears</option>
+                     <option value="@{rank_Staves}">Staves</option>
+                     <option value="@{rank_WarFan}">War Fan</option>
+                     </select></td>
+        <td><select class="narrow" name="attr_Weapon5Attribute"><option value="@{Agility}">Agility</option><option value="@{Reflexes}">Reflexes</option></select></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon5ABRoll" /></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon5ABKeep" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{name} makes an Untrained attack with their @{Weapon5}! \n\n/roll [[@{Weapon5Skill} + @{Weapon5Attribute} + @{Weapon5ABRoll}]]d10k[[@{Weapon5Attribute} + @{Weapon5ABKeep}]]"></button></td>
+        <td><button type="roll" name="roll_trained_attack" value="/em @{name} makes a Trained attack with their @{Weapon5}! \n\n/roll [[@{Weapon5Skill} + @{Weapon5Attribute} + @{Weapon5ABRoll}]]d10k[[@{Weapon5Attribute} + @{Weapon5ABKeep}]]!!"></button></td>
+        <td><button type="roll" name="roll_emphasis_attack" value="/em @{name} makes an attack with Emphasis with their @{Weapon5}! \n\n/roll [[@{Weapon5Skill} + @{Weapon5Attribute} + @{Weapon5ABRoll}]]d10k[[@{Weapon5Attribute} + @{Weapon5ABKeep}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Weapon5DamageRoll" class="sheet-short" value="1"></td>
+        <td><input type="number" name="attr_Weapon5DamageKeep" class="sheet-short" value="1"></td>
+        <td><button type="roll" name="roll_damage" value="/em @{name} deals damage! \n\n/roll [[@{Weapon5DamageRoll}+@{Strength}]]d10k[[@{Weapon5DamageKeep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+        </tr>
+	   <tr>
+        <td><input type="text" name="attr_Weapon6" class="regular"></td>
+        <td><select class="regular" name="attr_Weapon6Skill">
+                     <option value="@{rank_Jiujutsu}">Jiujutsu</option>
+                     <option value="@{rank_Chain_Weapons}">Chain Weapons</option>
+                     <option value="@{rank_Heavy_Weapons}">Heavy Weapons</option>
+                     <option value="@{rank_Kenjutsu}">Kenjutsu</option>
+                     <option value="@{rank_Knives}">Knives</option>
+                     <option value="@{rank_Ninjutsu}">Ninjutsu</option>
+                     <option value="@{rank_Polearms}">Polearms</option>
+                     <option value="@{rank_Spears}">Spears</option>
+                     <option value="@{rank_Staves}">Staves</option>
+                     <option value="@{rank_WarFan}">War Fan</option>
+                     </select></td>
+        <td><select class="narrow" name="attr_Weapon6Attribute"><option value="@{Agility}">Agility</option><option value="@{Reflexes}">Reflexes</option></select></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon6ABRoll" /></td>
+        <td><input type="number" class="sheet-very-narrow" value="0" name="attr_Weapon6ABKeep" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{name} makes an Untrained attack with their @{Weapon6}! \n\n/roll [[@{Weapon6Skill} + @{Weapon6Attribute} + @{Weapon6ABRoll}]]d10k[[@{Weapon6Attribute} + @{Weapon6ABKeep}]]"></button></td>
+        <td><button type="roll" name="roll_trained_attack" value="/em @{name} makes a Trained attack with their @{Weapon6}! \n\n/roll [[@{Weapon6Skill} + @{Weapon6Attribute} + @{Weapon6ABRoll}]]d10k[[@{Weapon6Attribute} + @{Weapon6ABKeep}]]!!"></button></td>
+        <td><button type="roll" name="roll_emphasis_attack" value="/em @{name} makes an attack with Emphasis with their @{Weapon6}! \n\n/roll [[@{Weapon6Skill} + @{Weapon6Attribute} + @{Weapon6ABRoll}]]d10k[[@{Weapon6Attribute} + @{Weapon6ABKeep}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Weapon6DamageRoll" class="sheet-short" value="1"></td>
+        <td><input type="number" name="attr_Weapon6DamageKeep" class="sheet-short" value="1"></td>
+        <td><button type="roll" name="roll_damage" value="/em @{name} deals damage! \n\n/roll [[@{Weapon6DamageRoll}+@{Strength}]]d10k[[@{Weapon6DamageKeep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+        </tr>
+    </table>
             <h1 class="separator vspace"><span>Bows</span></h1>
             <table style='border-collapse: collapse; border-spacing: 0;'>
-            <table style='border-collapse: collapse; border-spacing: 0;'>
     <tr>
             <td style='font-weight: bold;'>Bow</td>
             <td style='font-weight: bold;'>Skill</td>
             <td style='font-weight: bold;'>Strength</td>
+            <td style="font-weight:bold;">Bow Roll Bonus</td>
+            <td style="font-weight:bold;">Bow Keep Bonus</td>
             <td style='font-weight: bold;'>U</td>
             <td style='font-weight: bold;'>T</td>
             <td style='font-weight: bold;'>E</td>
-            <td style='font-weight: bold;'>Arrow</td>
-            <td style='font-weight: bold;'><div>Arrow</div> <div>Damage</div> <div>Roll</div></td>
-            <td style='font-weight: bold;'><div>Arrow</div> <div>Damage</div> <div>Keep</div></td>
+            <td style='font-weight: bold;'>Arrow Damage Roll</td>
+            <td style='font-weight: bold;'>Arrow Damage Keep</td>
             <td style='font-weight: bold;'>Damage</td>
             <td style='font-weight: bold;'>Notes</td>
    </tr>
-    <fieldset class="repeating_ranged_weapons">
     <tr>
-        <td><input type="text" name="attr_ranged_Weapon" class="regular"></td>
-        <td><input type="text" class="narrow" name="attr_ranged_WeaponSkill" value="Kyujutsu" disabled='true'></td>
-        <td><input type="number" name="attr_bow_Strength" class="sheet-short"></td>
-        <td><button type="roll" name="roll_untrained_attack" value="/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]"></button></td>
-        <td><button type="roll" name="roll_trained_attack" value="/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]!!"></button></td>
-        <td><button type="roll" name="roll_emphasis_attack" value="/roll [[@{roll_Kyujutsu}+@{roll_bonus_Kyujutsu}]]d10k[[@{keep_Kyujutsu}+@{keep_bonus_Kyujutsu}]]!!&lt;1"></button></td>
-        <td><select class="narrow" name="attr_ArrowType">
-             <option value="ArmorPiercing"></option>
-             <option value="ArmorPiercing">Armor Piercing</option>
-             <option value="FleshCutter">Flesh Cutter</option>
-             <option value="HummingBulb">Humming Bulb</option>
-             <option value="RopeCutter">Rope Cutter</option>
-             <option value="WillowLeaf">Willow Leaf</option>
-             </select></td>
-        <td><button type="roll" name="roll_damage1" value="/roll [[@{arrow_roll}+min(@{Agility},@{bow_Strength})]]d10k[[@{arrow_keep}]]!!"></button></td>
+        <td><input type="text" name="attr_Bow1" class="regular"></td>
+        <td><input type="text" class="narrow" disabled="true" value="Kyujutsu" /><input type="hidden" name="attr_ranged_WeaponSkill" value="@{rank_Kyujutsu}"></td>
+        <td><input type="number" name="attr_Bow1_Strength" class="sheet-short"> <input type="hidden" name="attr_Bow1_damageMod" value="(@{Agility} + @{Bow1_Strength} - abs(@{Agility} - @{Bow1_Strength})) / 2" /></td>
+        <td><input type="number" name="attr_Bow1_ranged_rollBonus" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow1_ranged_keepBonus" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{Name} makes an Untrained attack with their @{Bow1}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow1_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow1_ranged_keepBonus}]]"></button></td>
+		<td><button type="roll" name="roll_trained_attack" value="/em @{Name} makes a Trained attack with their @{Bow1}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow1_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow1_ranged_keepBonus}]]!!"></button></td>
+		<td><button type="roll" name="roll_emphasis_attack" value="/em @{Name} makes an attack with Emphasis with their @{Bow1}! \n\n//roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow1_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow1_ranged_keepBonus}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Bow1_arrow_roll" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow1_arrow_keep" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_damage1" value="/em @{name} deals damage! \n\n/roll [[@{Bow1_arrow_roll} + @{Bow1_damageMod}]]d10k[[@{Bow1_arrow_keep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+    </tr>
+        	    <tr>
+        <td><input type="text" name="attr_Bow2" class="regular"></td>
+        <td><input type="text" class="narrow" disabled="true" value="Kyujutsu" /><input type="hidden" name="attr_ranged_WeaponSkill" value="@{rank_Kyujutsu}"></td>
+        <td><input type="number" name="attr_Bow2_Strength" class="sheet-short"> <input type="hidden" name="attr_Bow2_damageMod" value="(@{Agility} + @{Bow2_Strength} - abs(@{Agility} - @{Bow2_Strength})) / 2" /></td>
+    	<td><input type="number" name="attr_Bow2_ranged_rollBonus" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow2_ranged_keepBonus" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{Name} makes an Untrained attack with their @{Bow2}! \n\n//roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow2_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow2_ranged_keepBonus}]]"></button></td>
+		<td><button type="roll" name="roll_trained_attack" value="/em @{Name} makes a Trained attack with their @{Bow2}! \n\n//roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow2_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow2_ranged_keepBonus}]]!!"></button></td>
+		<td><button type="roll" name="roll_emphasis_attack" value="/em @{Name} makes an attack with Emphasis with their @{Bow2}! \n\n//roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow2_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow2_ranged_keepBonus}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Bow2_arrow_roll" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow2_arrow_keep" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_damage1" value="/em @{name} deals damage! \n\n/roll [[@{Bow2_arrow_roll} + @{Bow2_damageMod}]]d10k[[@{Bow2_arrow_keep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+    </tr>
+		    <tr>
+        <td><input type="text" name="attr_Bow3" class="regular"></td>
+        <td><input type="text" class="narrow" disabled="true" value="Kyujutsu" /><input type="hidden" name="attr_ranged_WeaponSkill" value="@{rank_Kyujutsu}"></td>
+        <td><input type="number" name="attr_Bow3_Strength" class="sheet-short"> <input type="hidden" name="attr_Bow3_damageMod" value="(@{Agility} + @{Bow3_Strength} - abs(@{Agility} - @{Bow3_Strength})) / 2" /></td>
+    	<td><input type="number" name="attr_Bow3_ranged_rollBonus" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow3_ranged_keepBonus" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{Name} makes an Untrained attack with their @{Bow3}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow3_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow3_ranged_keepBonus}]]"></button></td>
+		<td><button type="roll" name="roll_trained_attack" value="/em @{Name} makes a Trained attack with their @{Bow3}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow3_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow3_ranged_keepBonus}]]!!"></button></td>
+		<td><button type="roll" name="roll_emphasis_attack" value="/em @{Name} makes an attack with Emphasis with their @{Bow3}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow3_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow3_ranged_keepBonus}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Bow3_arrow_roll" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow3_arrow_keep" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_damage1" value="/em @{name} deals damage! \n\n/roll [[@{Bow3_arrow_roll} + @{Bow3_damageMod}]]d10k[[@{Bow3_arrow_keep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+    </tr>
+		    <tr>
+        <td><input type="text" name="attr_Bow4" class="regular"></td>
+        <td><input type="text" class="narrow" disabled="true" value="Kyujutsu" /><input type="hidden" name="attr_ranged_WeaponSkill" value="@{rank_Kyujutsu}"></td>
+        <td><input type="number" name="attr_Bow4_Strength" class="sheet-short"> <input type="hidden" name="attr_Bow4_damageMod" value="(@{Agility} + @{Bow4_Strength} - abs(@{Agility} - @{Bow4_Strength})) / 2" /></td>
+    	<td><input type="number" name="attr_Bow4_ranged_rollBonus" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow4_ranged_keepBonus" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{Name} makes a Untrained attack with their @{Bow4}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow4_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow4_ranged_keepBonus}]]"></button></td>
+		<td><button type="roll" name="roll_trained_attack" value="/em @{Name} makes a Trained attack with their @{Bow4}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow4_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow4_ranged_keepBonus}]]!!"></button></td>
+		<td><button type="roll" name="roll_emphasis_attack" value="/em @{Name} makes an attack with Emphasis with their @{Bow4}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow4_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow4_ranged_keepBonus}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Bow4_arrow_roll" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow4_arrow_keep" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_damage1" value="/em @{name} deals damage! \n\n/roll [[@{Bow4_arrow_roll} + @{Bow4_damageMod}]]d10k[[@{Bow4_arrow_keep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+    </tr>
+		    <tr>
+        <td><input type="text" name="attr_Bow5" class="regular"></td>
+        <td><input type="text" class="narrow" disabled="true" value="Kyujutsu" /><input type="hidden" name="attr_ranged_WeaponSkill" value="@{rank_Kyujutsu}"></td>
+        <td><input type="number" name="attr_Bow5_Strength" class="sheet-short"> <input type="hidden" name="attr_Bow5_damageMod" value="(@{Agility} + @{Bow5_Strength} - abs(@{Agility} - @{Bow5_Strength})) / 2" /></td>
+    	<td><input type="number" name="attr_Bow5_ranged_rollBonus" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow5_ranged_keepBonus" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{Name} makes a Untrained attack with their @{Bow5}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow5_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow5_ranged_keepBonus}]]"></button></td>
+		<td><button type="roll" name="roll_trained_attack" value="/em @{Name} makes a Trained attack with their @{Bow5}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow5_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow5_ranged_keepBonus}]]!!"></button></td>
+		<td><button type="roll" name="roll_emphasis_attack" value="/em @{Name} makes an attack with Emphasis with their @{Bow5}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow5_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow5_ranged_keepBonus}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Bow5_arrow_roll" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow5_arrow_keep" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_damage1" value="/em @{name} deals damage! \n\n/roll [[@{Bow5_arrow_roll} + @{Bow5_damageMod}]]d10k[[@{Bow5_arrow_keep}]]!!"></button></td>
+        <td><input type="text" name="attr_Notes" class="sheet-short"></td>
+    </tr>
+		    <tr>
+        <td><input type="text" name="attr_Bow6" class="regular"></td>
+        <td><input type="text" class="narrow" disabled="true" value="Kyujutsu" /><input type="hidden" name="attr_ranged_WeaponSkill" value="@{rank_Kyujutsu}"></td>
+        <td><input type="number" name="attr_Bow6_Strength" class="sheet-short"> <input type="hidden" name="attr_Bow6_damageMod" value="(@{Agility} + @{Bow6_Strength} - abs(@{Agility} - @{Bow6_Strength})) / 2" /></td>
+    	<td><input type="number" name="attr_Bow6_ranged_rollBonus" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow6_ranged_keepBonus" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_untrained_attack" value="/em @{Name} makes a Untrained attack with their @{Bow6}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow6_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow6_ranged_keepBonus}]]"></button></td>
+		<td><button type="roll" name="roll_trained_attack" value="/em @{Name} makes a Trained attack with their @{Bow6}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow6_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow6_ranged_keepBonus}]]!!"></button></td>
+		<td><button type="roll" name="roll_emphasis_attack" value="/em @{Name} makes an attack with Emphasis with their @{Bow6}! \n\n/roll [[@{Reflexes} + @{ranged_WeaponSkill}+@{Bow6_ranged_rollBonus}]]d10k[[@{Reflexes}+@{Bow6_ranged_keepBonus}]]!!r1"></button></td>
+        <td><input type="number" name="attr_Bow6_arrow_roll" class="sheet-narrow" /></td>
+		<td><input type="number" name="attr_Bow6_arrow_keep" class="sheet-narrow" /></td>
+        <td><button type="roll" name="roll_damage1" value="/em @{name} deals damage! \n\n/roll [[@{Bow6_arrow_roll} + @{Bow6_damageMod}]]d10k[[@{Bow6_arrow_keep}]]!!"></button></td>
         <td><input type="text" name="attr_Notes" class="sheet-short"></td>
     </tr>
     </table>
-    
-    <fieldset class="sheet-3colrow">
-        <fieldset class="sheet-col">
-            <tr><td style='font-weight: bold;'>Armor Piercing</td></tr>
-            <tr><td style='font-weight: bold;'>Flesh Cutter</td></tr>
-            <tr style='font-weight: bold;'>Humming Bulb</tr>
-            <tr style='font-weight: bold;'>Rope Cutter</tr>
-            <tr style='font-weight: bold;'>Willow Leaf</tr>
-        </fieldset>
-        <fieldset class="sheet-col">    
-            <div class="dots">
-                    <input type="radio" name="attr_arrow_roll" value="1" checked="checked" />
-                    <input type="radio" name="attr_arrow_roll" value="2" /><span></span>
-                    <input type="radio" name="attr_arrow_roll" value="0" /><span></span>
-                    <input type="radio" name="attr_arrow_roll" value="1" /><span></span>
-                    <input type="radio" name="attr_arrow_roll" value="2" /><span></span>
-            </div>
-        </fieldset>
-        <fieldset class="sheet-col">    
-            <div class="dots">
-                    <input type="radio" name="attr_arrow_keep" value="1" checked="checked" />
-                    <input type="radio" name="attr_arrow_keep" value="2" /><span></span>
-                    <input type="radio" name="attr_arrow_keep" value="0" /><span></span>
-                    <input type="radio" name="attr_arrow_keep" value="1" /><span></span>
-                    <input type="radio" name="attr_arrow_keep" value="2" /><span></span>
-            </div>
-        </fieldset>
-    </fieldset>
-    
-    <div class="sheet-2colrow">
-    <div class="sheet-col">
-<h4>Gear</h4><table style='border-collapse: collapse; border-spacing: 0;'>
-    <tr>
-            <td style='background-color: #26ADE4; color: #FFF; font-weight: bold;'>Description</td>
-            <td style='background-color: #26ADE4; color: #FFF; font-weight: bold;'>Weight</td>
-            <td style='background-color: #26ADE4; color: #FFF; font-weight: bold;'>Location</td>
-    </tr>
-    <tr>
-            <td><input type="text" name="attr_geardesc"></td>
-            <td><input type="text" name="attr_gearweigh" class="sheet-short"></td>
-            <td><input type="text" name="attr_gearloc" class=""></td>
-    </tr>
-</table>
-<fieldset name="repeating_gear" class="repeating_gear"><table style='border-collapse: collapse; border-spacing: 0;'>
-        <tr>
-            <td><input type="text" name="attr_geardesc"></td>
-            <td><input type="text" name="attr_gearweigh" class="sheet-short"></td>
-            <td><input type="text" name="attr_gearloc" class=""></td>
-    </tr>
-</table></fieldset><br>
-Current weight:<input type="number" name="attr_gearweighttotal" class="sheet-nobut"><br>
-<b>Notes</b><textarea name="attr_gearnotes"></textarea>
-    
-    
-    
-    
-     </div>     
-</div>
 </div>
 
 <div class="tab-content spells-tab">
-    <div class="sheet-3colrow">
-        <div class="sheet-col">
-            <h3>Background</h3>
-            <textarea name="attr_Background" class="four-lines"></textarea>        
-
-        </div>
+    <div>Shugenja School Rank: 
+    <input type="number" name="attr_shugenja_rank">
+    </div>
+    <table class="sheet-spelltable">
+        <tr><td><h3>Element</h3></td><td><h3>Spells Used</h3></td><td><h3>Max Spell Slots</h3></td><td><h3>Affinity/Deficiency</h3></td></tr>
+        <tr><td>Air</td><td><input type="number"></td><td><input type="number" disabled="true" name="attr_airSpellSlots" value="((@{Reflexes} + @{Awareness}) - abs(@{Reflexes} - @{Awareness})) / 2"></td><td><select name="attr_airAffinity" class="sheet-regular"><option value="0">None</option><option value="1">Affinity</option><option value="-1">Deficiency</option></select></tr>
+        <tr><td>Earth</td><td><input type="number"></td><td><input type="number" disabled="true" name="attr_earthSpellSlots" value="((@{Stamina} + @{Willpower}) - abs(@{Stamina} - @{Willpower}))/ 2"></td><td><select name="attr_earthAffinity" class="sheet-regular"><option value="0">None</option><option value="1">Affinity</option><option value="-1">Deficiency</option></select></td></tr>
+        <tr><td>Fire</td><td><input type="number"></td><td><input type="number" disabled="true" name="attr_fireSpellSlots" value='((@{Agility} + @{Intelligence}) - abs(@{Agility} - @{Intelligence})) / 2'></td><td><select name="attr_fireAffinity" class="sheet-regular"><option value="0">None</option><option value="1">Affinity</option><option value="-1">Deficiency</option></select></td></tr>
+        <tr><td>Water</td><td><input type="number"></td><td><input type="number" disabled="true" name="attr_waterSpellSlots" value='((@{Strength} + @{Perception}) - abs(@{Strength} - @{Perception})) / 2'></td><td><select name="attr_waterAffinity" class="sheet-regular"><option value="0">None</option><option value="1">Affinity</option><option value="-1">Deficiency</option></select></td></tr>
+        <tr><td>Bonus</td><td><input type="number"></td><td><input type="number" disabled="true" name="attr_bonusSpellSlots" value="(@{Void} + 0)"></td><td><select name="voidAffinity" class="sheet-regular"><option value="0">None</option><option value="1">Affinity</option><option value="-1">Deficiency</option></select></td></tr>
+    </table>
+    <div>
+    <fieldset class="repeating_spells">
+        <table style="width:50%;">
+            <tr><td><strong>Name:</strong><input type="text" name="attr_spellName" class="sheet-regular" /></td><td><strong>Ring:</strong><select name="attr_spellRing" class="sheet-narrow"><option value="@{Air}">Air</option><option value="@{Earth}">Earth</option><option value="@{Fire}">Fire</option><option value="@{Water}">Water</option><option value="@{Void}">Void</option></select></td><td><strong>Level:</strong><input type="number" name="attr_spellLevel" /></td></tr>
+            <tr><td><strong>Range:</strong><input type="text" name="attr_spellRange"/></td><td><strong>AoE:</strong><input type="text" name="attr_spellAoE"></td><td><strong>Ring</strong><select name="attr_spellAffinity" class="narrow"><option value="@{airAffinity}">Air</option><option value="@{earthAffinity}">Earth</option><option value="@{fireAffinity}">Fire</option><option value="@{waterAffinity}">Water</option><option value="@{voidAffinity}">Void</option></select></td></tr>
+            <tr><td><strong>Duration</strong><input type="text" name="attr_spellDuration" /></td><td><strong>Raises</strong><input type="text" name="attr_spellRaises"></td><td><input type="hidden" name="attr_spellTN" value="5 + @{spellLevel} * 5"><strong>Cast</strong><button type="roll" value = "/em @{Name} casts @{spellName}!\n\n/roll [[@{spellRing}+@{spellAffinity}+@{shugenja_rank}]]d10k[[@{spellRing}]]!!\n\n vs TN [[@{spellTN}]]"></button></td></tr>
+        </table>
+    </fieldset>
+    Make sure that both Rings have the same value. Otherwise, Affinities will not display properly. 
     </div>
 </div>
-
-
 </div>
 
 
-</div>
+</div>
\ No newline at end of file
diff --git a/L5R/L5RsheetCSS.css b/L5R/L5RsheetCSS.css
index 268ab14f4b..580ec9eb88 100644
--- a/L5R/L5RsheetCSS.css
+++ b/L5R/L5RsheetCSS.css
@@ -2,7 +2,7 @@
 {
     background-color: #fff;
     overflow: hidden;
-    font-family: Papyrus, fantasy;
+    font-family: Calibri;
    
 }
 
@@ -528,7 +528,6 @@ input.sheet-tab:checked + span::before
 }
 
 .sheet-tab-content { display: none; }
-
 .sheet-center,
 h3.sheet-ability,
 h4,
@@ -570,6 +569,18 @@ div.sheet-craft-types:hover ul.sheet-craft-types,
 .sheet-tab[value=weapons]:checked ~ .sheet-weapons-tab,
 .sheet-tab[value=spells]:checked ~ .sheet-spells-tab { display: block; }
 
+
+
 div.sheet-ability > input[type=checkbox]:first-child + span::before,
 .sheet-dots input[type=checkbox]:first-child:hover + span::before,
-.sheet-dots input[type=checkbox]:first-child:checked + span::before { opacity: 1; }
\ No newline at end of file
+.sheet-dots input[type=checkbox]:first-child:checked + span::before { opacity: 1; }
+
+.sheet-col select {width: 85px;}
+
+.sheet-skillselect {
+    width: 85px;
+    }
+    
+.sheet-spelltable {
+    width:100%;
+    }
\ No newline at end of file
diff --git a/Silent Legions/silentlegions_sheet.css b/Silent Legions/silentlegions_sheet.css
index 413b38a860..bba3aef1f8 100644
--- a/Silent Legions/silentlegions_sheet.css	
+++ b/Silent Legions/silentlegions_sheet.css	
@@ -1,6 +1,5 @@
-* {
-    width: 100%;
-    height: 100%;
+.charsheet{
+    font-family:Calibri;
     }
 
 td {
@@ -26,4 +25,16 @@ select {
     
 .sheet-weaponAmmo {
     width:50px;
+    }
+    
+.sheet-narrow{
+    width: 80px;
+    }
+    
+.sheet-standard{
+    width: 120px;
+    }
+    
+.sheet-verynarrow{
+    width: 40px;
     }
\ No newline at end of file
diff --git a/Silent Legions/silentlegions_sheet.html b/Silent Legions/silentlegions_sheet.html
index 52bb105aa0..87e7f21fa0 100644
--- a/Silent Legions/silentlegions_sheet.html	
+++ b/Silent Legions/silentlegions_sheet.html	
@@ -1,12 +1,13 @@
 <div class="sheet-2colrow">
 <div class="sheet-col">
-<table class="sheet-basicinfo">
-<tr><td>Character Name</td><td><input name="attr_name" type="text" /></td></tr>
-<tr><td>Class</td><td><input name="attr_class" type="text" /></td></tr>
-<tr><td>Wealth</td><td><input type="text" name="attr_wealth"></td></tr>
-<tr><td>Level:</td><td><input name="attr_level" type="number" value=1></td><td>HP</td><td><input type="number" name="attr_hitpoints"></td></tr>
-<tr><td>XP</td><td><input type="number" name="attr_XP"></td><td>Expertise:</td><td><input type="number" name="attr_expertise"></td></tr>
-<tr><td>Next Level</td><td><input type="number" name="attr_XP_next"></td><td>Madness:</td><td><input type="number" name="attr_madness"></td></tr>
+<h2>Character</h2>
+<table>
+<tr><td>Name</td><td><input name="attr_name" type="text" class="sheet-standard" /></td></tr>
+<tr><td>Class</td><td><input name="attr_class" type="text" class="sheet-standard"/></td></tr>
+<tr><td>Wealth</td><td><input type="text" name="attr_wealth" class="sheet-standard"></td></tr>
+<tr><td>Level:</td><td><input name="attr_level" type="text" value="1" class="sheet-narrow"></td><td>HP</td><td><input type="text" name="attr_hitpoints" class="sheet-verynarrow"></td><td>Max HP</td><td><input type="text" name="attr_hitpointsMax" class="sheet-verynarrow"></td></tr>
+<tr><td>XP</td><td><input type="text" name="attr_XP" class="sheet-narrow"></td><td>Expertise</td><td><input type="text" name="attr_expertise" class="sheet-verynarrow"></td><td>Max Expertise</td><td><input type="text" value="[[1+@{level}]]" name="attr_expertiseMax" class="sheet-verynarrow" disabled="true"></td></tr>
+<tr><td>Next Level</td><td><input type="text" name="attr_XP_next" class="sheet-narrow"></td><td>Madness:</td><td><input type="text" name="attr_madness" class="sheet-narrow"></td></tr>
 </table>
 </div>
 <div class="sheet-col">
@@ -34,7 +35,7 @@
     <td><input type="number" name="attr_luckSave"></td>
     </tr>
     <tr>
-        <td><button type="roll" value="/roll 1d20>@{physSave}"></button></td><td><button type="roll" value="/roll 1d20>@{mentSave}"></button></td><td><button type="roll" value="/roll 1d20>{@evSave}"></button></td><td><button type="roll" value="/roll 1d20>@{magSave}"></button></td><td><button type="roll" value="/roll 1d20>@{luckSave}"></button></td>
+        <td><button type="roll" value="/roll 1d20>@{physSave}"></button></td><td><button type="roll" value="/roll 1d20>@{mentSave}"></button></td><td><button type="roll" value="/roll 1d20>@{evSave}"></button></td><td><button type="roll" value="/roll 1d20>@{magSave}"></button></td><td><button type="roll" value="/roll 1d20>@{luckSave}"></button></td>
     </tr>
     </table>
     <label>Abilities, Spells, and Disciplines</label>
@@ -46,10 +47,10 @@
         <tr><td><select><option>Ability</option><option>Spell</option><option>Discipline</option></select></td>
         <td><input type="text" name="attr_asdname"></td>
         <td><input type="text" name="attr_asddice"></td>
-        <td><button type="roll" name="attr_asdroll" value="@{asddice}" /></td></tr>
+        <td><button type="roll" name="attr_asdroll" value="/roll @{asddice}" /></td></tr>
         </table>
     </fieldset>
-     <label>Gear</label>
+     <h2>Gear</h2>
      <table>
     <td>Name</td><td>Encumbrance</td>
     </table>
@@ -60,25 +61,37 @@
         </tr>
         </table>
     </fieldset>
-    <strong>AC: </strong><input type="number" value=9/><strong>Attack Bonus:</strong><input type="number" name="attr_class_attack_bonus"/>
+    <h2>Wealth</h2>
+    <fieldset class="repeating_wealth">
+    <strong>Name</strong><input type="text" name="attr_">
+        <strong>Type</strong><select>
+            <option value="struggling">Struggling</option>
+            <option value="average">Average</option>
+            <option value="affluent">Affluent</option>
+            <option value="rich">Rich</option>
+            <option value="plutocratic">Plutocratic</option>
+        </select>
+    </fieldset>
+    <h2>Combat & Weapons</h2>
+    <strong>AC: </strong><input type="number" name="attr_AC" value="9"/><strong>Attack Bonus:</strong><input type="number" name="attr_class_attack_bonus"/><strong>Initiative:</strong><button type="roll" value="/roll 1d8+[[@{dexterity_mod}]] &{tracker}" class="sheet-verynarrow"></button>
    
-    <label>Melee Weapons</label>
+    <h3>Melee Weapons</h3>
     <table class="sheet-weapontable"><tr><td>Name</td><td>Weapon Skill</td><td>Damage</td><td>Slaughter</td><td>Attack</td><td>Damage</td></tr>
     </table>
     <fieldset class="repeating_weaponsMelee">
-    <table><tr><td><input class="sheet-weaponname"  name="attr_weaponName-m" type="text" /></td><td><select name="attr_wpnBonus-m"><option value="[[@{combat1Level}]]">Combat 1</option><option value="[[@{combat2Level}]]">Combat 2</option></select></td><td><input type="text" name="attr_wpnDmg-m" /></td><td><input type="text" name="attr_wpnSlaughter-m"></td><td><button type="roll" value="/em attacks with @{weaponName-m}!\n\n/roll 1d20+@{class_attack_bonus}+[[@{strength_mod}]]+@{wpnBonus-m}+?{Target AC|9}"></td><td><button type="roll" value="/roll [[@{wpnDmg-m}+@{strength_mod}]] + 2 * [[@{wpnDmg-m}+@{strength_mod}]] * [[@{wpnSlaughter-m}>6]]"></button></td></tr></table>
+    <table><tr><td><input class="sheet-weaponname"  name="attr_weaponName-m" type="text" class="sheet-standard"/></td><td><select name="attr_wpnBonus-m"><option value="[[@{combat1Level}]]">Combat 1</option><option value="[[@{combat2Level}]]">Combat 2</option></select></td><td><input type="text" name="attr_wpnDmg-m" class="sheet-verynarrow" /></td><td><input type="text" name="attr_wpnSlaughter-m" class="sheet-verynarrow"></td><td><button type="roll" value="/em attacks with @{weaponName-m}!\n\n/roll 1d20+@{class_attack_bonus}+[[@{strength_mod}]]+@{wpnBonus-m}+?{Target AC|9}"></td><td><button type="roll" value="/roll [[@{wpnDmg-m}+@{strength_mod}]] + 2 * [[@{wpnDmg-m}+@{strength_mod}]] * [[@{wpnSlaughter-m}>6]]"></button></td></tr></table>
     </fieldset>
-    <label>Ranged Weapons</label>
+    <h3>Ranged Weapons</h3>
     <table class="sheet-weapontable"><tr><td>Name</td><td>Weapon Skill</td><td>Damage</td><td>Slaughter</td><td>Attack</td><td>Damage</td></tr>
     </table>
     <fieldset class="repeating_weaponsRanged">
-    <table><tr><td><input class="sheet-weaponname"  name="attr_weaponName-r" type="text" /></td><td><select name="attr_wpnBonus-r"><option value="[[@{combat1Level}]]">Combat 1</option><option value="[[@{combat2Level}]]">Combat 2</option></select></td><td><input type="text" name="attr_wpnDmg-r" /></td><td><input type="text" name="attr_wpnSlaughter-r"></td><td><button type="roll" value="/em attacks with @{weaponName-r}!\n\n/roll 1d20+@{class_attack_bonus}+[[@{dexterity_mod}]]+@{wpnBonus-r}+?{Target AC|9}"></td><td><button type="roll" value="/roll [[@{wpnDmg-r}+@{dexterity_mod}]] + 2 * [[@{wpnDmg-r}+@{dexterity_mod}]] * [[@{wpnSlaughter-r}>6]]"></button></td></tr></table>
+    <table><tr><td><input class="sheet-weaponname"  name="attr_weaponName-r" type="text" class="sheet-standard"/></td><td><select name="attr_wpnBonus-r"><option value="[[@{combat1Level}]]">Combat 1</option><option value="[[@{combat2Level}]]">Combat 2</option></select></td><td><input type="text" name="attr_wpnDmg-r" class="sheet-verynarrow" /></td><td><input type="text" name="attr_wpnSlaughter-r" class="sheet-verynarrow"></td><td><button type="roll" value="/em attacks with @{weaponName-r}!\n\n/roll 1d20+@{class_attack_bonus}+[[@{dexterity_mod}]]+@{wpnBonus-r}+?{Target AC|9}"></td><td><button type="roll" value="/roll [[@{wpnDmg-r}+@{dexterity_mod}]] + 2 * [[@{wpnDmg-r}+@{dexterity_mod}]] * [[@{wpnSlaughter-r}>6]]"></button></td></tr></table>
     </fieldset>
     </div>
     <div class="sheet-col">
     <table class="sheet-skilltable">
-        <tr><td><strong>Skills</strong></td><td>Stat</td><td>Level</td><td>Class?</td><td>Roll</td></tr>
-        <tr><td>Art</td><td>
+        <tr><td><strong>Skills</strong></td><td>Stat</td><td>Level</td><td>Class?</td><td>Modifier</td><td>Roll</td></tr>
+        <tr><td>Art <input type="text" name="attr_artName" /></td><td>
         <select name="attr_artAttribute">
         <option value="@{strength_mod}">STR</option>
         <option value="@{intelligence_mod}">INT</option>
@@ -88,7 +101,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_artLevel" value="-1"/></td><td><input type="checkbox" name="attr_artClass" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes an Art check! \n\n/roll 2d6 + [[@{artAttribute} + @{artLevel}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_artModifier" value="[[@{artAttribute} + @{artLevel}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes an Art (@{artName}) check! \n\n/roll 2d6 + [[@{artAttribute} + @{artLevel}]]"></button></td>
         </tr>
                 <tr><td>Athletics</td><td>
         <select name="attr_athleticsAttribute">
@@ -100,6 +114,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_athleticsLevel" value="-1"/></td><td><input type="checkbox" name="attr_athleticsClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_athleticsModifier" value="[[@{athleticsAttribute} + @{athleticsLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes an Athletics check! \n\n/roll 2d6 + [[@{athleticsAttribute} + @{athleticsLevel}]]"></button></td>
         </tr>
                 <tr><td>Business</td><td>
@@ -112,6 +127,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_businessLevel" value="-1"/></td><td><input type="checkbox" name="attr_businessClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_businessModifier" value="[[@{businessAttribute} + @{businessLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Business check! \n\n/roll 2d6 + [[@{businessAttribute} + @{businessLevel}]]"></button></td>
         </tr>
                 <tr><td>Combat <input type="text" name="attr_combat1Name" /></td><td>
@@ -124,7 +140,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_combat1Level" value="-1"/></td><td><input type="checkbox" name="attr_combat1Class" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a Combat check! \n\n/roll 2d6 + [[@{combat1Attribute} + @{combat1Level}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_combat1Modifier" value="[[@{combat1Attribute} + @{combat1Level}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Combat (@{@combat1Name}) check! \n\n/roll 2d6 + [[@{combat1Attribute} + @{combat1Level}]]"></button></td>
         </tr>
         <tr><td>Combat <input type="text" name="attr_combat2Name"</td><td>
         <select name="attr_combat2Attribute">
@@ -136,7 +153,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_combat2Level" value="-1"/></td><td><input type="checkbox" name="attr_combat2Class" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a Combat check! \n\n/roll 2d6 + [[@{combat2Attribute} + @{combat2Level}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_combat2Modifier" value="[[@{combat2Attribute} + @{combat2Level}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Combat (@{combat2Name})check! \n\n/roll 2d6 + [[@{combat2Attribute} + @{combat2Level}]]"></button></td>
         </tr>
         </tr>
         <tr><td>Computer</td><td>
@@ -149,7 +167,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_computerLevel"/></td><td><input type="checkbox" name="attr_computerClass" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a computer check! \n\n/roll 2d6 + [[@{computerAttribute} + @{computerLevel}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_computerModifier" value="[[@{computerAttribute} + @{computerLevel}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Computer check! \n\n/roll 2d6 + [[@{computerAttribute} + @{computerLevel}]]"></button></td>
         </tr>
     
         <tr><td>Culture <input type="text" name="attr_culture1Name" /></td><td>
@@ -162,7 +181,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_culture1Level" value="-1"/></td><td><input type="checkbox" name="attr_culture1Class" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a Culture check! \n\n/roll 2d6 + [[@{culture1Attribute} + @{culture1Level}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_culture1Modifier" value="[[@{culture1Attribute} + @{culture1Level}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Culture (@{culture1Name}) check! \n\n/roll 2d6 + [[@{culture1Attribute} + @{culture1Level}]]"></button></td>
         </tr>
         <tr><td>Culture <input type="text" name="attr_culture2Name" /></td><td>
         <select name="attr_culture2Attribute">
@@ -174,7 +194,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" name="attr_culture2Level" value="-1"/></td><td><input type="checkbox" name="attr_culture2Class" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a Culture check! \n\n/roll 2d6 + [[@{culture2Attribute} + @{culture2Level}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_culture2Modifier" value="[[@{culture2Attribute} + @{culture2Level}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Culture (@{culture2Name})check! \n\n/roll 2d6 + [[@{culture2Attribute} + @{culture2Level}]]"></button></td>
         </tr>
                 <tr><td>Engineering</td><td>
         <select name="attr_engineeringAttribute">
@@ -186,6 +207,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_engineeringLevel"/></td><td><input type="checkbox" name="attr_engineeringClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_engineeringModifier" value="[[@{engineeringAttribute} + @{engineeringLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes an Engineering check! \n\n/roll 2d6 + [[@{engineeringAttribute} + @{engineeringLevel}]]"></button></td>
         </tr>
                 <tr><td>Gambling</td><td>
@@ -198,6 +220,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_gamblingLevel"/></td><td><input type="checkbox" name="attr_gamblingClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_gamblingModifier" value="[[@{gamblingAttribute} + @{gamblingLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Gambling check! \n\n/roll 2d6 + [[@{gamblingAttribute} + @{gamblingLevel}]]"></button></td>
         </tr>
                 <tr><td>History</td><td>
@@ -210,6 +233,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_historyLevel"/></td><td><input type="checkbox" name="attr_historyClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_historyModifier" value="[[@{historyAttribute} + @{historyLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a History check! \n\n/roll 2d6 + [[@{historyAttribute} + @{historyLevel}]]"></button></td>
         </tr>
                 <tr><td>Language</td><td>
@@ -222,6 +246,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_languageLevel"/></td><td><input type="checkbox" name="attr_languageClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_languageModifier" value="[[@{languageAttribute} + @{languageLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Language check! \n\n/roll 2d6 + [[@{languageAttribute} + @{languageLevel}]]"></button></td>
         </tr>
                 <tr><td>Law</td><td>
@@ -234,6 +259,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_lawLevel"/></td><td><input type="checkbox" name="attr_lawClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_lawModifier" value="[[@{lawAttribute} + @{lawLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Law check! \n\n/roll 2d6 + [[@{lawAttribute} + @{lawLevel}]]"></button></td>
         </tr>
                 <tr><td>Leadership</td><td>
@@ -246,6 +272,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_leadershipLevel"/></td><td><input type="checkbox" name="attr_leadershipClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_leadershipModifier" value="[[@{leadershipAttribute} + @{leadershipLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Leadership check! \n\n/roll 2d6 + [[@{leadershipAttribute} + @{leadershipLevel}]]"></button></td>
         </tr>
                 <tr><td>Medicine</td><td>
@@ -258,6 +285,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_medicineLevel"/></td><td><input type="checkbox" name="attr_medicineClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_medicineModifier" value="[[@{medicineAttribute} + @{medicineLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Medicine check! \n\n/roll 2d6 + [[@{medicineAttribute} + @{medicineLevel}]]"></button></td>
         </tr>
         <tr><td>Navigation</td><td>
@@ -270,6 +298,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_navigationLevel"/></td><td><input type="checkbox" name="attr_navigationClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_navigationModifier" value="[[@{navigationAttribute} + @{navigationLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Navigation check! \n\n/roll 2d6 + [[@{navigationAttribute} + @{navigationLevel}]]"></button></td>
         </tr>
         <tr><td>Occult</td><td>
@@ -282,6 +311,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_occultLevel"/></td><td><input type="checkbox" name="attr_occultClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_occultModifier" value="[[@{occultAttribute} + @{occultLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes an Occult check! \n\n/roll 2d6 + [[@{occultAttribute} + @{occultLevel}]]"></button></td>
         </tr>
                <tr><td>Perception</td><td>
@@ -294,6 +324,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_perceptionLevel"/></td><td><input type="checkbox" name="attr_perceptionClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_perceptionModifier" value="[[@{perceptionAttribute} + @{perceptionLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Perception check! \n\n/roll 2d6 + [[@{perceptionAttribute} + @{perceptionLevel}]]"></button></td>
         </tr>
                 <tr><td>Persuade</td><td>
@@ -306,9 +337,10 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_persuadeLevel"/></td><td><input type="checkbox" name="attr_persuadeClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_persuadeModifier" value="[[@{persuadeAttribute} + @{persuadeLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Persuade check! \n\n/roll 2d6 + [[@{persuadeAttribute} + @{persuadeLevel}]]"></button></td>
         </tr>
-                <tr><td>Profession</td><td>
+                <tr><td>Profession <input type="text" name="attr_professionName" /></td><td>
         <select name="attr_professionAttribute">
         <option value="@{strength_mod}">STR</option>
         <option value="@{intelligence_mod}">INT</option>
@@ -318,7 +350,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_professionLevel"/></td><td><input type="checkbox" name="attr_professionClass" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a Profession check! \n\n/roll 2d6 + [[@{professionAttribute} + @{professionLevel}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_professionModifier" value="[[@{professionAttribute} + @{professionLevel}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Profession (@{professionName}) check! \n\n/roll 2d6 + [[@{professionAttribute} + @{professionLevel}]]"></button></td>
         </tr>
                 <tr><td>Research</td><td>
         <select name="attr_researchAttribute">
@@ -330,6 +363,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_researchLevel"/></td><td><input type="checkbox" name="attr_researchClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_researchModifier" value="[[@{researchAttribute} + @{researchLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Research check! \n\n/roll 2d6 + [[@{researchAttribute} + @{researchLevel}]]"></button></td>
         </tr>
                 <tr><td>Religion</td><td>
@@ -342,6 +376,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_religionLevel"/></td><td><input type="checkbox" name="attr_religionClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_religionModifier" value="[[@{religionAttribute} + @{religionLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Religion check! \n\n/roll 2d6 + [[@{religionAttribute} + @{religionLevel}]]"></button></td>
         </tr>
         <tr><td>Science</td><td>
@@ -354,6 +389,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_scienceLevel"/></td><td><input type="checkbox" name="attr_scienceClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_scienceModifier" value="[[@{scienceAttribute} + @{scienceLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Science check! \n\n/roll 2d6 + [[@{scienceAttribute} + @{scienceLevel}]]"></button></td>
         </tr>
                 <tr><td>Security</td><td>
@@ -366,6 +402,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_securityLevel"/></td><td><input type="checkbox" name="attr_securityClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_securityModifier" value="[[@{securityAttribute} + @{securityLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Security check! \n\n/roll 2d6 + [[@{securityAttribute} + @{securityLevel}]]"></button></td>
         </tr>
                 <tr><td>Stealth</td><td>
@@ -378,6 +415,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_stealthLevel"/></td><td><input type="checkbox" name="attr_stealthClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_stealthModifier" value="[[@{stealthAttribute} + @{stealthLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Stealth check! \n\n/roll 2d6 + [[@{stealthAttribute} + @{stealthLevel}]]"></button></td>
         </tr>
         <tr><td>Survival</td><td>
@@ -390,6 +428,7 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_survivalLevel"/></td><td><input type="checkbox" name="attr_survivalClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_survivalModifier" value="[[@{survivalAttribute} + @{survivalLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Survival check! \n\n/roll 2d6 + [[@{survivalAttribute} + @{survivalLevel}]]"></button></td>
         </tr>
                 <tr><td>Tactics</td><td>
@@ -402,9 +441,10 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_tacticsLevel"/></td><td><input type="checkbox" name="attr_tacticsClass" value=1></td>
+        <td><input type="text" disabled="true" name="attr_tacticsModifier" value="[[@{tacticsAttribute} + @{tacticsLevel}]]"></td>
         <td><button type="roll" value="/em :@{name} makes a Tactics check! \n\n/roll 2d6 + [[@{tacticsAttribute} + @{tacticsLevel}]]"></button></td>
         </tr>
-                <tr><td>Vehicle</td><td>
+                <tr><td>Vehicle <input type="text" name="attr_vehicleName"</td><td>
         <select name="attr_vehicleAttribute">
         <option value="@{strength_mod}">STR</option>
         <option value="@{intelligence_mod}">INT</option>
@@ -414,7 +454,8 @@
         <option value="@{charisma_mod}">CHA</option>
         </select></td>
         <td><input type="number" value=”-1” name="attr_vehicleLevel"/></td><td><input type="checkbox" name="attr_vehicleClass" value=1></td>
-        <td><button type="roll" value="/em :@{name} makes a Vehicle check! \n\n/roll 2d6 + [[@{vehicleAttribute} + @{vehicleLevel}]]"></button></td>
+        <td><input type="text" disabled="true" name="attr_vehicleModifier" value="[[@{vehicleAttribute} + @{vehicleLevel}]]"></td>
+        <td><button type="roll" value="/em :@{name} makes a Vehicle (@{vehicleName}) check! \n\n/roll 2d6 + [[@{vehicleAttribute} + @{vehicleLevel}]]"></button></td>
         </tr>
         </table>
     </div>