diff --git a/Call_of_Cthulhu_7th_Ed/coc_7th_ed.css b/Call_of_Cthulhu_7th_Ed/coc_7th_ed.css
index 064595f9bb..274bd5d1ad 100644
--- a/Call_of_Cthulhu_7th_Ed/coc_7th_ed.css
+++ b/Call_of_Cthulhu_7th_Ed/coc_7th_ed.css
@@ -43,20 +43,29 @@ table td.sheet-attr {
 }
 
 table td.sheet-attr-label {
-    width: 13.33%;
     height: 58px;
     font-size: 120%; 
     text-align: center;
 }
 
-input.sheet-attr-input-std {
-    width: 100%; 
+input[type="text"].sheet-attr-input {
+    width: 54px; 
     height: 58px; 
     font-size: 200%; 
     text-align: center;
 }
 
-input[type="number"].sheet-attr-input-small {
+table td.sheet-attr-roll {
+    height: 58px;
+    text-align: center;
+}
+
+input.sheet-secondary-attr-input {
+    width: 100%;
+    text-align: center;
+}
+
+input[type="number"].sheet-secondary-attr-input {
     width: 100%;
     text-align: center;
 }
@@ -67,10 +76,12 @@ table td.sheet-skill-label {
 
 input[type="text"].sheet-skill-input {
     width: 30px;
+    text-align: center;
 }
 
 input[type="number"].sheet-skill-input {
     width: 30px;
+    text-align: center;
 }
 
 texarea.sheet-backstory-box {
diff --git a/Call_of_Cthulhu_7th_Ed/coc_7th_ed.html b/Call_of_Cthulhu_7th_Ed/coc_7th_ed.html
index d2001c595e..1189033338 100644
--- a/Call_of_Cthulhu_7th_Ed/coc_7th_ed.html
+++ b/Call_of_Cthulhu_7th_Ed/coc_7th_ed.html
@@ -29,6 +29,7 @@
                     <td>Birthplace </td>
                     <td colspan="3"><input type="text" name="attr_birthplace" style="width:100%"></td>
                 </tr>
+            </table>
         </div>
     </div>
     <div class='sheet-col'>
@@ -36,52 +37,43 @@
         <div class="section">
             <table style="width:100%">
             <tr>
-                <td class="attr-label" rowspan="2"><strong>STR</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_str" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_str_hard" value="floor(@{str}/2)" disabled="true"></td>
-                <td class="attr-label" rowspan="2"><strong>DEX</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_dex" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_dex_hard" value="floor(@{dex}/2)" disabled="true"></td>
-                <td class="attr-label" rowspan="2"><strong>POW</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_pow" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_pow_hard" value="floor(@{pow}/2)" disabled="true"></td>
+                <td class="attr-label" ><strong>STR</strong></td>
+                <td><input class="attr-input" type="text" name="attr_str" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{str}]]/[[floor(@{str}/2)]]/[[floor(@{str}/5)]]' name='roll_str_check' /></td>
+                <td> </td>
+                <td class="attr-label"><strong>DEX</strong></td>
+                <td><input class="attr-input" type="text" name="attr_dex" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{dex}]]/[[floor(@{dex}/2)]]/[[floor(@{dex}/5)]]' name='roll_dex_check' /></td>
+                <td> </td>
+                <td class="attr-label"><strong>POW</strong></td>
+                <td><input class="attr-input" type="text" name="attr_pow" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{pow}]]/[[floor(@{pow}/2)]]/[[floor(@{pow}/5)]]' name='roll_pow_check' /></td>
             </tr>
             <tr>
-                <td><input class="attr-input-small" type="number" name="attr_str_extreme" value="floor(@{str}/5)" disabled="true"></td>
-                <td><input class="attr-input-small" type="number" name="attr_dex_extreme" value="floor(@{dex}/5)" disabled="true"></td>
-                <td><input class="attr-input-small" type="number" name="attr_pow_extreme" value="floor(@{pow}/5)" disabled="true"></td>
+                <td class="attr-label" ><strong>CON</strong></td>
+                <td><input class="attr-input" type="text" name="attr_con" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{con}]]/[[floor(@{con}/2)]]/[[floor(@{con}/5)]]' name='roll_str_check' /></td>
+                <td> </td>
+                <td class="attr-label"><strong>APP</strong></td>
+                <td><input class="attr-input" type="text" name="attr_app" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{app}]]/[[floor(@{app}/2)]]/[[floor(@{app}/5)]]' name='roll_dex_check' /></td>
+                <td> </td>
+                <td class="attr-label"><strong>EDU</strong></td>
+                <td><input class="attr-input" type="text" name="attr_edu" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{edu}]]/[[floor(@{edu}/2)]]/[[floor(@{edu}/5)]]' name='roll_pow_check' /></td>
             </tr>
             <tr>
-                <td class="attr-label" rowspan="2"><strong>CON</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_con" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_con_hard" value="floor(@{con}/2)" disabled="true"></td>
-                <td class="attr-label" rowspan="2"><strong>APP</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_app" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_app_hard" value="floor(@{app}/2)" disabled="true"></td>
-                <td class="attr-label" rowspan="2"><strong>EDU</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_edu" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_edu_hard" value="floor(@{edu}/2)" disabled="true"></td>
-            </tr>
-            <tr>
-                <td><input class="attr-input-small" type="number" name="attr_con_extreme" value="floor(@{con}/5)" disabled="true"></td>
-                <td><input class="attr-input-small" type="number" name="attr_app_extreme" value="floor(@{app}/5)" disabled="true"></td>
-                <td><input class="attr-input-small" type="number" name="attr_edu_extreme" value="floor(@{edu}/5)" disabled="true"></td>
-            </tr>
-            <tr>
-                <td class="attr-label" rowspan="2"><strong>SIZ</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_siz" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_siz_hard" value="floor(@{siz}/2)" disabled="true"></td>
-                <td class="attr-label" rowspan="2"><strong>INT</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_int" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_int_hard" value="floor(@{int}/2)" disabled="true"></td>
-                <td class="attr-label" rowspan="2"><strong>Move rate</strong></td>
-                <td rowspan="2"><input class="attr-input-std" type="text" name="attr_move" ></td>
-                <td><input class="attr-input-small" type="number" name="attr_moveplus1" value="@{move}+1" disabled="true"></td>
-            </tr>
-            <tr>
-                <td><input class="attr-input-small" type="number" name="attr_siz_extreme" value="floor(@{siz}/5)" disabled="true"></td>
-                <td><input class="attr-input-small" type="number" name="attr_int_extreme" value="floor(@{int}/5)" disabled="true"></td>
-                <td><input class="attr-input-small" type="number" name="attr_moveminus1" value="@{move}-1" disabled="true"></td>
+                <td class="attr-label" ><strong>SIZ</strong></td>
+                <td><input class="attr-input" type="text" name="attr_siz" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{siz}]]/[[floor(@{siz}/2)]]/[[floor(@{siz}/5)]]' name='roll_str_check' /></td>
+                <td> </td>
+                <td class="attr-label"><strong>INT</strong></td>
+                <td><input class="attr-input" type="text" name="attr_int" /></td>
+                <td class="attr-roll" ><button type='roll' value='/roll 1d100 vs [[@{int}]]/[[floor(@{int}/2)]]/[[floor(@{int}/5)]]' name='roll_dex_check' /></td>
+                <td> </td>
+                <td class="attr-label"><strong>Move rate</strong></td>
+                <td><input class="attr-input" type="text" name="attr_mov" /></td>
+                <td class="attr-roll" ></td>
             </tr>
         </table>
         </div>
@@ -94,11 +86,11 @@
             <table style="width:100%">
                 <tr>
                     <td>
-                        <input style="width:100%" placeholder="current" type="number" min="0" name="attr_hp">
+                        <input class="secondary-attr-input" placeholder="current" type="text" min="0" name="attr_hp">
                     </td>
                     <td style="text-align: center">/</td>
                     <td>
-                        <input style="width:100%" placeholder="max" type="number" min="0" name="attr_hp_max" value="floor((@{con}+@{siz})/10)" disabled="true">
+                        <input class="secondary-attr-input" placeholder="max" type="number" min="0" name="attr_hp_max" value="floor((@{con}+@{siz})/10)" disabled="true">
                     </td>
                 </tr>
                 <tr>
@@ -112,8 +104,11 @@
         <div class="section">
             <table style="width:100%">
                 <tr>
+                    <td style="width:100%">
+                        <input class="secondary-attr-input" placeholder="current" type="text" min="0" max="100" name="attr_luck">
+                    </td>
                     <td>
-                        <input style="width:100%" placeholder="current" type="number" min="0" max="100" name="attr_luck">
+                        <button type='roll' value='/roll 1d100 vs [[@{luck}]]/[[floor(@{luck}/2)]]/[[floor(@{luck}/5)]]' name='roll_luck_check' />
                     </td>
                 </tr>
             </table>
@@ -124,13 +119,28 @@
         <div style="width:50%;float:left">
             <h4 class="section-head">Damage Bonus</h4>
             <div class="section">
-                <input style="width:100%" type="text" name="attr_damage_bonus">
+                <select style="width:100%;" name="attr_damage_bonus">
+                    <option value="-2">-2</option>
+                    <option value="-1">-1</option>
+                    <option value="+0" selected>None</option>
+                    <option value="+1d4">+1d4</option>
+                    <option value="+1d6">+1d6</option>
+                    <option value="+2d6">+2d6</option>
+                    <option value="+3d6">+3d6</option>
+                    <option value="+4d6">+4d6</option>
+                    <option value="+5d6">+5d6</option>
+                    <option value="+6d6">+6d6</option>
+                    <option value="+7d6">+7d6</option>
+                    <option value="+8d6">+8d6</option>
+                    <option value="+9d6">+9d6</option>
+                    <option value="+10d6">+10d6</option>
+                </select>
             </div>
         </div>
         <div style="width:50%;float:left">
             <h4 class="section-head">Build</h4>
             <div class="section">
-                <input style="width:100%" type="text" name="attr_build">
+                <input class="secondary-attr-input" type="text" name="attr_build">
             </div>
         </div>
     </div>
@@ -140,15 +150,18 @@
             <table style="width:100%">
                 <tr>
                     <td colspan="2">
-                        <input style="width:100%" placeholder="current" type="number" min="0" name="attr_san">
+                        <input class="secondary-attr-input" placeholder="current" type="text" min="0" name="attr_san">
+                    </td>
+                    <td>
+                        <button type='roll' value='/roll 1d100 vs [[@{san}]]/[[floor(@{san}/2)]]/[[floor(@{san}/5)]]' name='roll_san_check' />
                     </td>
                     <td style="text-align: center">/</td>
                     <td colspan="2">
-                        <input style="width:100%" placeholder="start" type="number" min="0" name="attr_san_start" value="@{pow}" disabled="true">
+                        <input class="secondary-attr-input" placeholder="start" type="number" min="0" name="attr_san_start" value="@{pow}" disabled="true">
                     </td>
                     <td style="text-align: center">/</td>
                     <td colspan="2">
-                        <input style="width:100%" type="number" min="0" name="attr_san_max" placeholder="max" value="99-@{cthulhu_mythos}" disabled="true">
+                        <input class="secondary-attr-input" type="number" min="0" name="attr_san_max" placeholder="max" value="99-@{cthulhu_mythos}" disabled="true">
                     </td>
                 </tr>
                 <tr>
@@ -166,11 +179,11 @@
             <table style="width:100%">
                 <tr>
                     <td>
-                        <input style="width:100%" placeholder="current" type="number" min="0" name="attr_mp">
+                        <input class="secondary-attr-input" placeholder="current" type="text" min="0" name="attr_mp">
                     </td>
                     <td style="text-align: center">/</td>
                     <td>
-                        <input style="width:100%" placeholder="max" type="number" min="0" name="attr_mp_max" value="floor(@{pow}/5)" disabled="true">
+                        <input class="secondary-attr-input" placeholder="max" type="number" min="0" name="attr_mp_max" value="floor(@{pow}/5)" disabled="true">
                     </td>
                 </tr>
             </table>
@@ -185,128 +198,110 @@
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Accounting(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_accounting" /></td>
-                    <td><input class="skill-input" type="number" name="attr_accounting_hard" value="floor(@{accounting}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_accounting_extreme" value="floor(@{accounting}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_accounting" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{accounting}]]/[[floor(@{accounting}/2)]]/[[floor(@{accounting}/5)]]' name='roll_accounting_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Anthropology(01%)</td>
-                    <td><input class="skill-input" type="number" name="attr_anthropology" /></td>
-                    <td><input class="skill-input" type="number" name="attr_anthropology_hard" value="floor(@{anthropology}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_anthropology_extreme" value="floor(@{anthropology}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_anthropology" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{anthropology}]]/[[floor(@{anthropology}/2)]]/[[floor(@{anthropology}/5)]]' name='roll_anthropology_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Appraise(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_appraise" /></td>
-                    <td><input class="skill-input" type="number" name="attr_appraise_hard" value="floor(@{appraise}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_appraise_extreme" value="floor(@{appraise}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_appraise" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{appraise}]]/[[floor(@{appraise}/2)]]/[[floor(@{appraise}/5)]]' name='roll_appraise_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Archaeology(01%)</td>
-                    <td><input class="skill-input" type="number" name="attr_archaeology" /></td>
-                    <td><input class="skill-input" type="number" name="attr_archaeology_hard" value="floor(@{archaeology}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_archaeology_extreme" value="floor(@{archaeology}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_archaeology" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{archaeology}]]/[[floor(@{archaeology}/2)]]/[[floor(@{archaeology}/5)]]' name='roll_archaeology_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Charm(15%)</td>
-                    <td><input class="skill-input" type="number" name="attr_charm" /></td>
-                    <td><input class="skill-input" type="number" name="attr_charm_hard" value="floor(@{charm}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_charm_extreme" value="floor(@{charm}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_charm" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{charm}]]/[[floor(@{charm}/2)]]/[[floor(@{charm}/5)]]' name='roll_charm_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Climb(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_climb" /></td>
-                    <td><input class="skill-input" type="number" name="attr_climb_hard" value="floor(@{climb}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_climb_extreme" value="floor(@{climb}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_climb" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{climb}]]/[[floor(@{climb}/2)]]/[[floor(@{climb}/5)]]' name='roll_climb_check' /></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td class="skill-label">Credit Rating(00%)</td>
-                    <td><input class="skill-input" type="number" name="attr_credit_rating" /></td>
-                    <td><input class="skill-input" type="number" name="attr_credit_rating_hard" value="floor(@{credit_rating}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_credit_rating_extreme" value="floor(@{credit_rating}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_credit_rating" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{credit_rating}]]/[[floor(@{credit_rating}/2)]]/[[floor(@{credit_rating}/5)]]' name='roll_credit_rating_check' /></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td class="skill-label">Cthulhu Mythos(00%)</td>
-                    <td><input class="skill-input" type="number" name="attr_cthulhu_mythos" /></td>
-                    <td><input class="skill-input" type="number" name="attr_cthulhu_mythos_hard" value="floor(@{cthulhu_mythos}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_cthulhu_mythos_extreme" value="floor(@{cthulhu_mythos}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_cthulhu_mythos" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{cthulhu_mythos}]]/[[floor(@{cthulhu_mythos}/2)]]/[[floor(@{cthulhu_mythos}/5)]]' name='roll_cthulhu_mythos_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Disguise(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_disguise" /></td>
-                    <td><input class="skill-input" type="number" name="attr_disguise_hard" value="floor(@{disguise}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_disguise_extreme" value="floor(@{disguise}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_disguise" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{disguise}]]/[[floor(@{disguise}/2)]]/[[floor(@{disguise}/5)]]' name='roll_disguise_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Dodge(half DEX)</td>
-                    <td><input class="skill-input" type="number" name="attr_dodge" /></td>
-                    <td><input class="skill-input" type="number" name="attr_dodge_hard" value="floor(@{dodge}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_dodge_extreme" value="floor(@{dodge}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_dodge" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{dodge}]]/[[floor(@{dodge}/2)]]/[[floor(@{dodge}/5)]]' name='roll_dodge_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Drive Auto(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_drive_auto" /></td>
-                    <td><input class="skill-input" type="number" name="attr_drive_auto_hard" value="floor(@{drive_auto}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_drive_auto_extreme" value="floor(@{drive_auto}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_drive_auto" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{drive_auto}]]/[[floor(@{drive_auto}/2)]]/[[floor(@{drive_auto}/5)]]' name='roll_drive_auto_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Elec Repair(10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_elec_repair" /></td>
-                    <td><input class="skill-input" type="number" name="attr_elec_repair_hard" value="floor(@{elec_repair}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_elec_repair_extreme" value="floor(@{elec_repair}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_elec_repair" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{elec_repair}]]/[[floor(@{elec_repair}/2)]]/[[floor(@{elec_repair}/5)]]' name='roll_elec_repair_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Fast Talk(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_fast_talk" /></td>
-                    <td><input class="skill-input" type="number" name="attr_fast_talk_hard" value="floor(@{fast_talk}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_fast_talk_extreme" value="floor(@{fast_talk}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_fast_talk" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{fast_talk}]]/[[floor(@{fast_talk}/2)]]/[[floor(@{fast_talk}/5)]]' name='roll_fast_talk_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Fighting(Brawl)(25%)</td>
-                    <td><input class="skill-input" type="number" name="attr_fighting_brawl" /></td>
-                    <td><input class="skill-input" type="number" name="attr_fighting_brawl_hard" value="floor(@{fighting_brawl}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_fighting_brawl_extreme" value="floor(@{fighting_brawl}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_fighting_brawl" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{fighting_brawl}]]/[[floor(@{fighting_brawl}/2)]]/[[floor(@{fighting_brawl}/5)]]' name='roll_fighting_brawl_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
-                    <td sclass="skill-label">Firearms<span style="font-size:85%">(Handgun)(20%)</span></td>
-                    <td><input class="skill-input" type="number" name="attr_firearms_handgun" /></td>
-                    <td><input class="skill-input" type="number" name="attr_firearms_handgun_hard" value="floor(@{firearms_handgun}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_firearms_handgun_extreme" value="floor(@{firearms_handgun}/5)" disabled="true" /></td>
+                    <td sclass="skill-label">Firearms(Handgun)(20%)</td>
+                    <td><input class="skill-input" type="text" name="attr_firearms_handgun" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{firearms_handgun}]]/[[floor(@{firearms_handgun}/2)]]/[[floor(@{firearms_handgun}/5)]]' name='roll_firearms_handgun_check' /></td>
                 </tr>
-                                <tr>
+                <tr>
                     <td><input type="checkbox"></td>
-                    <td class="skill-label">Firearms<span style="font-size:85%">(Rif./Shot.)(25%)</span></td>
-                    <td><input class="skill-input" type="number" name="attr_firearms_rifle" /></td>
-                    <td><input class="skill-input" type="number" name="attr_firearms_rifle_hard" value="floor(@{firearms_rifle}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_firearms_rifle_extreme" value="floor(@{firearms_rifle}/5)" disabled="true" /></td>
+                    <td class="skill-label">Firearms<span style="font-size:90%">(Rifle/Shotgun)(25%)</span></td>
+                    <td><input class="skill-input" type="text" name="attr_firearms_rifle" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{firearms_rifle}]]/[[floor(@{firearms_rifle}/2)]]/[[floor(@{firearms_rifle}/5)]]' name='roll_firearms_rifle_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">First Aid(30%)</td>
-                    <td><input class="skill-input" type="number" name="attr_first_aid" /></td>
-                    <td><input class="skill-input" type="number" name="attr_first_aid_hard" value="floor(@{first_aid}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_first_aid_extreme" value="floor(@{first_aid}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_first_aid" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{first_aid}]]/[[floor(@{first_aid}/2)]]/[[floor(@{first_aid}/5)]]' name='roll_first_aid_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">History(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_history" /></td>
-                    <td><input class="skill-input" type="number" name="attr_history_hard" value="floor(@{history}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_history_extreme" value="floor(@{history}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_history" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{history}]]/[[floor(@{history}/2)]]/[[floor(@{history}/5)]]' name='roll_history_check' /></td>
                 </tr>
             </table>
         </div>
@@ -315,128 +310,110 @@
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Intimidate(15%)</td>
-                    <td><input class="skill-input" type="number" name="attr_intimidate" /></td>
-                    <td><input class="skill-input" type="number" name="attr_intimidate_hard" value="floor(@{intimidate}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_intimidate_extreme" value="floor(@{intimidate}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_intimidate" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{intimidate}]]/[[floor(@{intimidate}/2)]]/[[floor(@{intimidate}/5)]]' name='roll_intimidate_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Jump(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_jump" /></td>
-                    <td><input class="skill-input" type="number" name="attr_jump_hard" value="floor(@{jump}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_jump_extreme" value="floor(@{jump}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_jump" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{jump}]]/[[floor(@{jump}/2)]]/[[floor(@{jump}/5)]]' name='roll_jump_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Language(Own)(EDU)</td>
-                    <td><input class="skill-input" type="number" name="attr_language_own" /></td>
-                    <td><input class="skill-input" type="number" name="attr_language_own_hard" value="floor(@{language_own}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_language_own_extreme" value="floor(@{language_own}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_language_own" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{language_own}]]/[[floor(@{language_own}/2)]]/[[floor(@{language_own}/5)]]' name='roll_language_own_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Law(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_law" /></td>
-                    <td><input class="skill-input" type="number" name="attr_law_hard" value="floor(@{law}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_law_extreme" value="floor(@{law}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_law" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{law}]]/[[floor(@{law}/2)]]/[[floor(@{law}/5)]]' name='roll_law_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Library Use(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_library_use" /></td>
-                    <td><input class="skill-input" type="number" name="attr_library_use_hard" value="floor(@{library_use}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_library_use_extreme" value="floor(@{library_use}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_library_use" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{library_use}]]/[[floor(@{library_use}/2)]]/[[floor(@{library_use}/5)]]' name='roll_library_use_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Listen(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_listen" /></td>
-                    <td><input class="skill-input" type="number" name="attr_listen_hard" value="floor(@{listen}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_listen_extreme" value="floor(@{listen}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_listen" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{listen}]]/[[floor(@{listen}/2)]]/[[floor(@{listen}/5)]]' name='roll_listen_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Locksmith(01%)</td>
-                    <td><input class="skill-input" type="number" name="attr_locksmith" /></td>
-                    <td><input class="skill-input" type="number" name="attr_locksmith_hard" value="floor(@{locksmith}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_locksmith_extreme" value="floor(@{locksmith}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_locksmith" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{locksmith}]]/[[floor(@{locksmith}/2)]]/[[floor(@{locksmith}/5)]]' name='roll_locksmith_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Mech Repair(10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_mech_repair" /></td>
-                    <td><input class="skill-input" type="number" name="attr_mech_repair_hard" value="floor(@{mech_repair}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_mech_repair_extreme" value="floor(@{mech_repair}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_mech_repair" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{mech_repair}]]/[[floor(@{mech_repair}/2)]]/[[floor(@{mech_repair}/5)]]' name='roll_mech_repair_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Medicine(01%)</td>
-                    <td><input class="skill-input" type="number" name="attr_medicine" /></td>
-                    <td><input class="skill-input" type="number" name="attr_medicine_hard" value="floor(@{medicine}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_medicine_extreme" value="floor(@{medicine}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_medicine" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{medicine}]]/[[floor(@{medicine}/2)]]/[[floor(@{medicine}/5)]]' name='roll_medicine_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Natural World(10%)</td>
                     <td><input class="skill-input" type="text" name="attr_natural_world" /></td>
-                    <td><input class="skill-input" type="number" name="attr_natural_world_hard" value="floor(@{natural_world}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_natural_world_extreme" value="floor(@{natural_world}/5)" disabled="true" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{natural_world}]]/[[floor(@{natural_world}/2)]]/[[floor(@{natural_world}/5)]]' name='roll_natural_world_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Navigate(10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_navigate" /></td>
-                    <td><input class="skill-input" type="number" name="attr_navigate_hard" value="floor(@{navigate}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_navigate_extreme" value="floor(@{navigate}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_navigate" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{navigate}]]/[[floor(@{navigate}/2)]]/[[floor(@{navigate}/5)]]' name='roll_navigate_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Occult(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_occult" /></td>
-                    <td><input class="skill-input" type="number" name="attr_occult_hard" value="floor(@{occult}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_occult_extreme" value="floor(@{occult}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_occult" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{occult}]]/[[floor(@{occult}/2)]]/[[floor(@{occult}/5)]]' name='roll_occult_check' /></td>
                 </tr>
                                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Op Hv Machine(01%)</td>
-                    <td><input class="skill-input" type="number" name="attr_op_hv_machine" /></td>
-                    <td><input class="skill-input" type="number" name="attr_op_hv_machine_hard" value="floor(@{op_hv_machine}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_op_hv_machine_extreme" value="floor(@{op_hv_machine}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_op_hv_machine" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{op_hv_machine}]]/[[floor(@{op_hv_machine}/2)]]/[[floor(@{op_hv_machine}/5)]]' name='roll_op_hv_machine_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Persuade(10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_persuade" /></td>
-                    <td><input class="skill-input" type="number" name="attr_persuade_hard" value="floor(@{persuade}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_persuade_extreme" value="floor(@{persuade}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_persuade" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{persuade}]]/[[floor(@{persuade}/2)]]/[[floor(@{persuade}/5)]]' name='roll_persuade_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Psychology(10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_psychology" /></td>
-                    <td><input class="skill-input" type="number" name="attr_psychology_hard" value="floor(@{psychology}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_psychology_extreme" value="floor(@{psychology}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_psychology" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{psychology}]]/[[floor(@{psychology}/2)]]/[[floor(@{psychology}/5)]]' name='roll_psychology_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Psychoanalysis(01%)</td>
-                    <td><input class="skill-input" type="number" name="attr_psychoanalysis" /></td>
-                    <td><input class="skill-input" type="number" name="attr_psychoanalysis_hard" value="floor(@{psychoanalysis}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_psychoanalysis_extreme" value="floor(@{psychoanalysis}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_psychoanalysis" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{psychoanalysis}]]/[[floor(@{psychoanalysis}/2)]]/[[floor(@{psychoanalysis}/5)]]' name='roll_psychoanalysis_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Ride(05%)</td>
-                    <td><input class="skill-input" type="number" name="attr_ride" /></td>
-                    <td><input class="skill-input" type="number" name="attr_ride_hard" value="floor(@{ride}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_ride_extreme" value="floor(@{ride}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_ride" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{ride}]]/[[floor(@{ride}/2)]]/[[floor(@{ride}/5)]]' name='roll_ride_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Sleight of Hand(10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_sleight_of_hand" /></td>
-                    <td><input class="skill-input" type="number" name="attr_sleight_of_hand_hard" value="floor(@{sleight_of_hand}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_sleight_of_hand_extreme" value="floor(@{sleight_of_hand}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_sleight_of_hand" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{sleight_of_hand}]]/[[floor(@{sleight_of_hand}/2)]]/[[floor(@{sleight_of_hand}/5)]]' name='roll_sleight_of_hand_check' /></td>
                 </tr>
             </table>
         </div>
@@ -445,37 +422,32 @@
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Spot Hidden(25%)</td>
-                    <td><input class="skill-input" type="number" name="attr_spot_hidden" /></td>
-                    <td><input class="skill-input" type="number" name="attr_spot_hidden_hard" value="floor(@{spot_hidden}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_spot_hidden_extreme" value="floor(@{spot_hidden}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_spot_hidden" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{spot_hidden}]]/[[floor(@{spot_hidden}/2)]]/[[floor(@{spot_hidden}/5)]]' name='roll_spot_hidden_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Stealth(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_stealth" /></td>
-                    <td><input class="skill-input" type="number" name="attr_stealth_hard" value="floor(@{stealth}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_stealth_extreme" value="floor(@{stealth}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_stealth" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{stealth}]]/[[floor(@{stealth}/2)]]/[[floor(@{stealth}/5)]]' name='roll_stealth_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Swim(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_swim" /></td>
-                    <td><input class="skill-input" type="number" name="attr_swim_hard" value="floor(@{swim}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_swim_extreme" value="floor(@{swim}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_swim" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{swim}]]/[[floor(@{swim}/2)]]/[[floor(@{swim}/5)]]' name='roll_swim_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Throw(20%)</td>
-                    <td><input class="skill-input" type="number" name="attr_throw" /></td>
-                    <td><input class="skill-input" type="number" name="attr_throw_hard" value="floor(@{throw}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_throw_extreme" value="floor(@{throw}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_throw" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{throw}]]/[[floor(@{throw}/2)]]/[[floor(@{throw}/5)]]' name='roll_throw_check' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox"></td>
                     <td class="skill-label">Track (10%)</td>
-                    <td><input class="skill-input" type="number" name="attr_track" /></td>
-                    <td><input class="skill-input" type="number" name="attr_track_hard" value="floor(@{track}/2)" disabled="true" /></td>
-                    <td><input class="skill-input" type="number" name="attr_track_extreme" value="floor(@{track}/5)" disabled="true" /></td>
+                    <td><input class="skill-input" type="text" name="attr_track" /></td>
+                    <td><button type='roll' value='/roll 1d100 vs [[@{track}]]/[[floor(@{track}/2)]]/[[floor(@{track}/5)]]' name='roll_track_check' /></td>
                 </tr>
             </table>
             <table style="width:100%">
@@ -495,9 +467,8 @@
                     <tr>
                         <td><input type="checkbox"></td>
                         <td class="skill-label"><input style="width:100%" type="text" name="attr_skillname" /></td>
-                        <td><input class="skill-input" type="number" name="attr_skill" /></td>
-                        <td><input class="skill-input" type="number" name="attr_skill_hard" value="floor(@{skill}/2)" disabled="true" /></td>
-                        <td><input class="skill-input" type="number" name="attr_skill_extreme" value="floor(@{skill}/5)" disabled="true" /></td>
+                        <td><input class="skill-input" type="text" name="attr_skill" /></td>
+                        <td><button type='roll' value='/roll 1d100 vs [[@{skill}]]/[[floor(@{skill}/2)]]/[[floor(@{skill}/5)]]' name='roll_skill_check' /></td>
                     </tr>
                 </table>
             </fieldset>
@@ -510,61 +481,63 @@
         <table style="width:100%">
             <thead>
                 <th style="width:18%">Weapon</th>
-                <th style="width:12%">Skill</th>
-                <th style="width:7%">Regular</th>
-                <th style="width:7%">Hard</th>
-                <th style="width:7%">Extreme</th>
-                <th style="width:9%">Damage</th>
-                <th style="width:8%">Range</th>
-                <th style="width:8%">Attacks</th>
-                <th style="width:6%">Ammo</th>
-                <th style="width:6%">Malf</th>
+                <th style="width:19%">Skill</th>
+                <th style="width:19%">Damage</th>
+                <th style="width:11%">Range</th>
+                <th style="width:11%">Attacks</th>
+                <th style="width:11%">Ammo</th>
+                <th style="width:11%">Malf</th>
             </thead>
         </table>
         <table style="width:100%">
             <tr>
                 <td style="width:18%"><input style="width:100%" type="text" value="Unarmed" disabled="true"/></td>
-                <td style="width:12%"><input style="width:100%" type="text" value="Brawl" disabled="true"/></td>
-                <td style="width:7%"><input style="width:100%" type="number" name="attr_unarmed_regular" value="@{fighting_brawl}" disabled="true"/></td>
-                <td style="width:7%"><input style="width:100%" type="number" name="attr_unarmed_hard" value="floor(@{fighting_brawl}/2)" disabled="true"/></td>
-                <td style="width:7%"><input style="width:100%" type="number" name="attr_unarmed_extreme" value="floor(@{fighting_brawl}/5)" disabled="true"/></td>
-                <td style="width:9%"><input style="width:100%" type="text" value="1d3 + db" disabled="true"/></td>
-                <td style="width:8%"><input style="width:100%" type="text" value="-" disabled="true"/></td>
-                <td style="width:8%"><input style="width:100%" type="text" value="1" disabled="true"/></td>
-                <td style="width:6%"><input style="width:100%" type="text" value="-" disabled="true"/></td>
-                <td style="width:6%"><input style="width:100%" type="text" value="-" disabled="true"/></td>
+                <td style="width:15%"><input style="width:100%" type="text" value="Fighting(Brawl)" disabled="true"/></td>
+                <td style="width:4%"><button type='roll' value='/roll 1d100 vs [[@{fighting_brawl}]]/[[floor(@{fighting_brawl}/2)]]/[[floor(@{fighting_brawl}/5)]]' name='roll_unarmed_check' /></td>
+                <td style="width:7%"><input style="width:100%;text-align:right;" type="text" value="1d3" disabled="true"/></td>
+                <td style="width:8%"><input style="width:100%;text-align:left;" type="text" value="+db" disabled="true"/></td>
+                <td style="width:4%"><button type='roll' value='/roll 1d3@{damage_bonus}' name='roll_unarmed_damage' /></td>
+                <td style="width:11%"><input style="width:100%;text-align:center;" type="text" value="-" disabled="true"/></td>
+                <td style="width:11%"><input style="width:100%;text-align:center;" type="text" value="1" disabled="true"/></td>
+                <td style="width:11%"><input style="width:100%;text-align:center;" type="text" value="-" disabled="true"/></td>
+                <td style="width:11%"><input style="width:100%;text-align:center;" type="text" value="-" disabled="true"/></td>
             </tr>
         </table>
         <fieldset class="repeating_weapons">
             <table style="width:100%">
                 <tr>
                     <td style="width:18%"><input style="width:100%" type="text" name="attr_weaponname"/></td>
-                    <td style="width:12%">
+                    <td style="width:15%">
                         <select style="width:100%" name="attr_weaponskill">
-                            <option value="@{fighting_brawl}">Brawl</option>
-                            <option value="@{firearms_handgun}">Handgun</option>
-                            <option value="@{firearms_handgun}">Rifle</option>
+                            <option value="@{fighting_brawl}">Fighting(Brawl)</option>
+                            <option value="@{firearms_handgun}">Firarms(Handgun)</option>
+                            <option value="@{firearms_handgun}">Firarms(Rifle/Shotgun)</option>
                             <option value="@{throw}">Throw</option>
-                            <option value="@{repeating_skills_0_skill}">repeating_skills_0</option>
-                            <option value="@{repeating_skills_1_skill}">repeating_skills_1</option>
-                            <option value="@{repeating_skills_2_skill}">repeating_skills_2</option>
-                            <option value="@{repeating_skills_3_skill}">repeating_skills_3</option>
-                            <option value="@{repeating_skills_4_skill}">repeating_skills_4</option>
-                            <option value="@{repeating_skills_5_skill}">repeating_skills_5</option>
-                            <option value="@{repeating_skills_6_skill}">repeating_skills_6</option>
-                            <option value="@{repeating_skills_7_skill}">repeating_skills_7</option>
-                            <option value="@{repeating_skills_8_skill}">repeating_skills_8</option>
-                            <option value="@{repeating_skills_9_skill}">repeating_skills_9</option>
+                            <option value="@{repeating_skills_0_skill}">Other Skill #1</option>
+                            <option value="@{repeating_skills_1_skill}">Other Skill #2</option>
+                            <option value="@{repeating_skills_2_skill}">Other Skill #3</option>
+                            <option value="@{repeating_skills_3_skill}">Other Skill #4</option>
+                            <option value="@{repeating_skills_4_skill}">Other Skill #5</option>
+                            <option value="@{repeating_skills_5_skill}">Other Skill #6</option>
+                            <option value="@{repeating_skills_6_skill}">Other Skill #7</option>
+                            <option value="@{repeating_skills_7_skill}">Other Skill #8</option>
+                            <option value="@{repeating_skills_8_skill}">Other Skill #9</option>
+                            <option value="@{repeating_skills_9_skill}">Other Skill #10</option>
                         </select>
                     </td>
-                    <td style="width:7%"><input style="width:100%" type="number" name="attr_weaponregular" value="@{weaponskill}" disabled="true"/></td>
-                    <td style="width:7%"><input style="width:100%" type="number" name="attr_weaponhard" value="floor(@{weaponskill}/2)" disabled="true"/></td>
-                    <td style="width:7%"><input style="width:100%" type="number" name="attr_weaponextreme" value="floor(@{weaponskill}/5)" disabled="true"/></td>
-                    <td style="width:9%"><input style="width:100%" type="text" name="attr_weapondamage"/></td>
-                    <td style="width:8%"><input style="width:100%" type="text" name="attr_weaponrange"/></td>
-                    <td style="width:8%"><input style="width:100%" type="number" name="attr_weaponattacks"/></td>
-                    <td style="width:6%"><input style="width:100%" type="text" name="attr_weaponammo"/></td>
-                    <td style="width:6%"><input style="width:100%" type="text" name="attr_weaponmalf"/></td>
+                    <td style="width:4%"><button type='roll' value='/roll 1d100 vs [[@{weaponskill}]]/[[floor(@{weaponskill}/2)]]/[[floor(@{weaponskill}/5)]]' name='roll_weaponskill_check' /></td>
+                    <td style="width:7%"><input style="width:100%;text-align:right;" type="text" name="attr_weapondamage"/></td>
+                    <td style="width:8%">
+                        <select style="width:100%;text-align:left;" name="attr_weapondb">
+                            <option value="0">+0</option>
+                            <option value="@{damage_bonus}">+db</option>
+                        </select>    
+                    </td>
+                    <td style="width:4%"><button type='roll' value='/roll @{weapondamage}@{weapondb}' name='roll_weapon_damage' /></td>
+                    <td style="width:11%"><input style="width:100%;text-align:center;" type="text" name="attr_weaponrange"/></td>
+                    <td style="width:11%"><input style="width:100%;text-align:center;" type="text" name="attr_weaponattacks"/></td>
+                    <td style="width:11%"><input style="width:100%;text-align:center;" type="text" name="attr_weaponammo"/></td>
+                    <td style="width:11%"><input style="width:100%;text-align:center;" type="text" name="attr_weaponmalf"/></td>
                 </tr>
             </table>
         </fieldset>
diff --git a/Call_of_Cthulhu_7th_Ed/coc_7th_ed.png b/Call_of_Cthulhu_7th_Ed/coc_7th_ed.png
index 93a73e2fc6..a1db6486dd 100644
Binary files a/Call_of_Cthulhu_7th_Ed/coc_7th_ed.png and b/Call_of_Cthulhu_7th_Ed/coc_7th_ed.png differ
diff --git a/Call_of_Cthulhu_7th_Ed/sheet.json b/Call_of_Cthulhu_7th_Ed/sheet.json
index 560d3f3f50..a6aaa8c892 100644
--- a/Call_of_Cthulhu_7th_Ed/sheet.json
+++ b/Call_of_Cthulhu_7th_Ed/sheet.json
@@ -1,8 +1,8 @@
 {
     "html": "coc_7th_ed.html",
     "css": "coc_7th_ed.css",
-    "authors": "Matthew Carpenter",
+    "authors": "Matthew Carpenter <",
     "roll20userid": "103705",
     "preview": "coc_7th_ed.png",
-    "instructions": "Nothing special to note."
+    "instructions": "You may note the absence of hard and extreme values.  These have been moved into the roll button itself.  When you use the roll button you will see, in the chat log, a roll \"vs standard value/hard value/extreme value.\"  Compare the appropriate threshold to your result to determine success.  For weapon skill select one of the listed skills to base your weapon skill check on.  You may select up to the tenth custom skill as the base skill.  For weapon damamges you may specify a \"+0\" or \"+db.\"  Use this to include your damage bonus in the damage roll or not."
 }