diff --git a/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html b/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html
index eefb39b031..7fb93e1145 100644
--- a/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html
+++ b/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html
@@ -517,44 +517,102 @@
       </div>
     </div>
     <h3>Skills</h3>
-    <div class="sheet-row">
+    <div class="sheet-2colrow sheet-skills">
+        <div class="sheet-col">
         <div class="sheet-2colrow">
-            <div class="sheet-col"></div>
             <div class="sheet-col">
-                <label class="sheet-skill-label" for="attr_skill_administer">Level:</label>
-            <label class="sheet-skill-label" for="attr_skill_administer_specialist">Normal:   Specialist-1:   Specialist-2:</label>
-            <label class="sheet-skill-label" for="roll_skill_administer">Roll:</label>
+                <div class="sheet-2colrow">
+                    <div class="sheet-col">
+                        <label class="sheet-skill-label">Skill:</label>
+                    </div>
+                    <div class="sheet-col">
+                        <label class="sheet-skill-label">Level:</label>
+                    </div>
+                </div>
+            </div>
+            <div class="sheet-col">
+                <label class="sheet-skill-label">2d6</label>
+                <label class="sheet-skill-label">3d6</label>
+                <label class="sheet-skill-label">4d6</label>
             </div>
         </div>
+        </div>
+        <div class="sheet-col">
+        <div class="sheet-2colrow">
+            <div class="sheet-col">
+                <div class="sheet-2colrow">
+                    <div class="sheet-col">
+                        <label class="sheet-skill-label">Skill:</label>
+                    </div>
+                    <div class="sheet-col">
+                        <label class="sheet-skill-label">Level:</label>
+                    </div>
+                </div>
+            </div>
+            <div class="sheet-col">
+                <label class="sheet-skill-label">2d6</label>
+                <label class="sheet-skill-label">3d6</label>
+                <label class="sheet-skill-label">4d6</label>
+            </div>
+        </div>
+        </div>
     </div>
-    <div class="sheet-row sheet-skills">
+    <div class="sheet-2colrow sheet-skills">
       <div class="sheet-col">
         <div class="sheet-2colrow">
           <div class="sheet-col">
-            <br><label for="attr_skill_artist">Administer</label>
-          </div>
-          <div class="sheet-col">
-
-            <input  type="number" min="-1" value="-1" name="attr_skill_administer">
-            <input style="width: 60px" type="radio" name="attr_skill_administer_specialist" value="2d6" checked>
-            <input style="width: 60px" type="radio" name="attr_skill_administer_specialist" value="3d6d1">
-            <input style="width: 60px" type="radio" name="attr_skill_administer_specialist" value="4d6d2">
+            <label for="attr_skill_administer">Administer</label>
+              <input  type="number" min="-1" value="-1" name="attr_skill_administer">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_administer_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_administer_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_administer_specialist" value="4d6d2">
             <button name="roll_skill_administer" type="roll" value="/me &{template:skill} {{type=Administer}} {{characterName=@{name}}} {{rollValue=[[@{skill_administer_specialist} + @{skill_administer} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
-    </div>
-    <div class="sheet-row sheet-skills">
       <div class="sheet-col">
         <div class="sheet-2colrow">
           <div class="sheet-col">
-            <br><label for="attr_skill_connect">Connect</label>
+            <label for="attr_skill_program">Program</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_program">
           </div>
           <div class="sheet-col">
-              Level:    Roll:   Specialist:
-            <input type="number" min="-1" value="-1" name="attr_skill_connect">
-            <button name="roll_skill_connect" type="roll" value="/me &{template:skill} {{type=Connect}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_connect} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_connect_specialist" type="roll" value="/me &{template:skill} {{type=Connect}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_connect} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input style="width: 30px" type="radio" name="attr_skill_program_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_program_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_program_specialist" value="4d6d2">
+            <button name="roll_skill_program" type="roll" value="/me &{template:skill} {{type=Program}} {{characterName=@{name}}} {{rollValue=[[@{skill_program_specialist} + @{skill_program} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-2colrow sheet-skills">
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_connect">Connect</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_connect">
+          </div>
+          <div class="sheet-col">
+              <input style="width: 30px" type="radio" name="attr_skill_connect_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_connect_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_connect_specialist" value="4d6d2">
+            <button name="roll_skill_connect" type="roll" value="/me &{template:skill} {{type=Connect}} {{characterName=@{name}}} {{rollValue=[[@{skill_connect_specialist} + @{skill_connect} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_punch">Punch</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_punch">
+          </div>
+          <div class="sheet-col">
+              <input style="width: 30px" type="radio" name="attr_skill_punch_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_punch_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_punch_specialist" value="4d6d2">
+            <button name="roll_skill_punch" type="roll" value="/me &{template:skill} {{type=Punch}} {{characterName=@{name}}} {{rollValue=[[@{skill_punch_specialist} + @{skill_punch} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
@@ -564,23 +622,57 @@
         <div class="sheet-2colrow">
           <div class="sheet-col">
             <label for="attr_skill_exert">Exert</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_exert">
-            <button name="roll_skill_exert" type="roll" value="/me &{template:skill} {{type=Exert}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_exert} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_exert_specialist" type="roll" value="/me &{template:skill} {{type=Exert}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_exert} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input  type="number" min="-1" value="-1" name="attr_skill_exert">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_exert_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_exert_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_exert_specialist" value="4d6d2">
+            <button name="roll_skill_exert" type="roll" value="/me &{template:skill} {{type=Exert}} {{characterName=@{name}}} {{rollValue=[[@{skill_exert_specialist} + @{skill_exert} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
       <div class="sheet-col">
         <div class="sheet-2colrow">
           <div class="sheet-col">
-            <label for="attr_skill_fix">Fix</label>
+            <label for="attr_skill_shoot">Shoot</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_shoot">
           </div>
           <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_fix">
-            <button name="roll_skill_fix" type="roll" value="/me &{template:skill} {{type=Fix}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_fix} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_fix_specialist" type="roll" value="/me &{template:skill} {{type=Fix}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_fix} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input style="width: 30px" type="radio" name="attr_skill_shoot_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_shoot_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_shoot_specialist" value="4d6d2">
+            <button name="roll_skill_shoot" type="roll" value="/me &{template:skill} {{type=Shoot}} {{characterName=@{name}}} {{rollValue=[[@{skill_shoot_specialist} + @{skill_shoot} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-2colrow sheet-skills">
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_fix">Fix</label>
+              <input  type="number" min="-1" value="-1" name="attr_skill_fix">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_fix_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_fix_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_fix_specialist" value="4d6d2">
+            <button name="roll_skill_fix" type="roll" value="/me &{template:skill} {{type=Fix}} {{characterName=@{name}}} {{rollValue=[[@{skill_fix_specialist} + @{skill_fix} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_sneak">Sneak</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_sneak">
+          </div>
+          <div class="sheet-col">
+              <input style="width: 30px" type="radio" name="attr_skill_sneak_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_sneak_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_sneak_specialist" value="4d6d2">
+            <button name="roll_skill_sneak" type="roll" value="/me &{template:skill} {{type=Sneak}} {{characterName=@{name}}} {{rollValue=[[@{skill_sneak_specialist} + @{skill_sneak} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
@@ -590,23 +682,57 @@
         <div class="sheet-2colrow">
           <div class="sheet-col">
             <label for="attr_skill_heal">Heal</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_heal">
-            <button name="roll_skill_heal" type="roll" value="/me &{template:skill} {{type=Heal}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_heal} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_heal_specialist" type="roll" value="/me &{template:skill} {{type=Heal}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_heal} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input  type="number" min="-1" value="-1" name="attr_skill_heal">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_heal_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_heal_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_heal_specialist" value="4d6d2">
+            <button name="roll_skill_heal" type="roll" value="/me &{template:skill} {{type=Heal}} {{characterName=@{name}}} {{rollValue=[[@{skill_heal_specialist} + @{skill_heal} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
       <div class="sheet-col">
         <div class="sheet-2colrow">
           <div class="sheet-col">
-            <label for="attr_skill_know">Know</label>
+            <label for="attr_skill_stab">Stab</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_stab">
           </div>
           <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_know">
-            <button name="roll_skill_know" type="roll" value="/me &{template:skill} {{type=Know}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_know} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_know_specialist" type="roll" value="/me &{template:skill} {{type=Know}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_know} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input style="width: 30px" type="radio" name="attr_skill_stab_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_stab_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_stab_specialist" value="4d6d2">
+            <button name="roll_skill_stab" type="roll" value="/me &{template:skill} {{type=Stab}} {{characterName=@{name}}} {{rollValue=[[@{skill_stab_specialist} + @{skill_stab} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-2colrow sheet-skills">
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_know">Know</label>
+              <input  type="number" min="-1" value="-1" name="attr_skill_know">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_know_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_know_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_know_specialist" value="4d6d2">
+            <button name="roll_skill_know" type="roll" value="/me &{template:skill} {{type=Know}} {{characterName=@{name}}} {{rollValue=[[@{skill_know_specialist} + @{skill_know} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_survive">Survive</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_survive">
+          </div>
+          <div class="sheet-col">
+              <input style="width: 30px" type="radio" name="attr_skill_survive_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_survive_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_survive_specialist" value="4d6d2">
+            <button name="roll_skill_survive" type="roll" value="/me &{template:skill} {{type=Survive}} {{characterName=@{name}}} {{rollValue=[[@{skill_survive_specialist} + @{skill_survive} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
@@ -616,23 +742,57 @@
         <div class="sheet-2colrow">
           <div class="sheet-col">
             <label for="attr_skill_lead">Lead</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_lead">
-            <button name="roll_skill_lead" type="roll" value="/me &{template:skill} {{type=Lead}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_lead} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_lead_specialist" type="roll" value="/me &{template:skill} {{type=Lead}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_lead} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input  type="number" min="-1" value="-1" name="attr_skill_lead">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_lead_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_lead_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_lead_specialist" value="4d6d2">
+            <button name="roll_skill_lead" type="roll" value="/me &{template:skill} {{type=Lead}} {{characterName=@{name}}} {{rollValue=[[@{skill_lead_specialist} + @{skill_lead} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
       <div class="sheet-col">
         <div class="sheet-2colrow">
           <div class="sheet-col">
-            <label for="attr_skill_notice">Notice</label>
+            <label for="attr_skill_talk">Talk</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_talk">
           </div>
           <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_notice">
-            <button name="roll_skill_notice" type="roll" value="/me &{template:skill} {{type=Notice}}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_notice} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_notice_specialist" type="roll" value="/me &{template:skill} {{type=Notice}}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_notice} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input style="width: 30px" type="radio" name="attr_skill_talk_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_talk_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_talk_specialist" value="4d6d2">
+            <button name="roll_skill_talk" type="roll" value="/me &{template:skill} {{type=Talk}} {{characterName=@{name}}} {{rollValue=[[@{skill_talk_specialist} + @{skill_talk} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-2colrow sheet-skills">
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_notice">Notice</label>
+              <input  type="number" min="-1" value="-1" name="attr_skill_notice">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_notice_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_notice_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_notice_specialist" value="4d6d2">
+            <button name="roll_skill_notice" type="roll" value="/me &{template:skill} {{type=Notice}} {{characterName=@{name}}} {{rollValue=[[@{skill_notice_specialist} + @{skill_notice} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_trade">Trade</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_trade">
+          </div>
+          <div class="sheet-col">
+              <input style="width: 30px" type="radio" name="attr_skill_trade_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_trade_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_trade_specialist" value="4d6d2">
+            <button name="roll_skill_trade" type="roll" value="/me &{template:skill} {{type=Trade}} {{characterName=@{name}}} {{rollValue=[[@{skill_trade_specialist} + @{skill_trade} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
@@ -642,141 +802,43 @@
         <div class="sheet-2colrow">
           <div class="sheet-col">
             <label for="attr_skill_perform">Perform</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_perform">
-            <button name="roll_skill_perform" type="roll" value="/me &{template:skill} {{type=Perform}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_perform} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_perform_specialist" type="roll" value="/me &{template:skill} {{type=Perform}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_perform} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input  type="number" min="-1" value="-1" name="attr_skill_perform">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_perform_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_perform_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_perform_specialist" value="4d6d2">
+            <button name="roll_skill_perform" type="roll" value="/me &{template:skill} {{type=Perform}} {{characterName=@{name}}} {{rollValue=[[@{skill_perform_specialist} + @{skill_perform} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_pilot">Pilot</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_pilot">
-            <button name="roll_skill_pilot" type="roll" value="/me &{template:skill} {{type=Pilot}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_pilot} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_pilot_specialist" type="roll" value="/me &{template:skill} {{type=Pilot}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_pilot} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="sheet-2colrow sheet-skills">
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_program">Program</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_program">
-            <button name="roll_skill_program" type="roll" value="/me &{template:skill} {{type=Program}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_program} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_program_specialist" type="roll" value="/me &{template:skill} {{type=Program}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_program} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_punch">Punch</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_punch">
-            <button name="roll_skill_punch" type="roll" value="/me &{template:skill} {{type=Punch}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_punch} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_punch_specialist" type="roll" value="/me &{template:skill} {{type=Punch}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_punch} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="sheet-2colrow sheet-skills">
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_shoot">Shoot</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_shoot">
-            <button name="roll_skill_shoot" type="roll" value="/me &{template:skill} {{type=Shoot}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_shoot} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_shoot_specialist" type="roll" value="/me &{template:skill} {{type=Shoot}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_shoot} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_sneak">Sneak</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_sneak">
-            <button name="roll_skill_sneak" type="roll" value="/me &{template:skill} {{type=Sneak}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_sneak} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_sneak_specialist" type="roll" value="/me &{template:skill} {{type=Sneak}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_sneak} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="sheet-2colrow sheet-skills">
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_stab">Stab</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_stab">
-            <button name="roll_skill_stab" type="roll" value="/me &{template:skill} {{type=Stab}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_stab} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_stab_specialist" type="roll" value="/me &{template:skill} {{type=Stab}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_stab} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_survive">Survive</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_survive">
-            <button name="roll_skill_survive" type="roll" value="/me &{template:skill} {{type=Survive}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_survive} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_survive_specialist" type="roll" value="/me &{template:skill} {{type=Survive}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_survive} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="sheet-2colrow sheet-skills">
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_talk">Talk</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_psitech">
-            <button name="roll_skill_talk" type="roll" value="/me &{template:skill} {{type=Talk}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_talk} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_talk_specialist" type="roll" value="/me &{template:skill} {{type=Talk}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_talk} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-      <div class="sheet-col">
-        <div class="sheet-2colrow">
-          <div class="sheet-col">
-            <label for="attr_skill_trade">Trade</label>
-          </div>
-          <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_trade">
-            <button name="roll_skill_trade" type="roll" value="/me &{template:skill} {{type=Trade}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_trade} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_trade_specialist" type="roll" value="/me &{template:skill} {{type=Trade}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_trade} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="sheet-2colrow sheet-skills">
       <div class="sheet-col">
         <div class="sheet-2colrow">
           <div class="sheet-col">
             <label for="attr_skill_work">Work</label>
+              <input type="number" min="-1" value="-1" name="attr_skill_work">
           </div>
           <div class="sheet-col">
-            <input type="number" value="-1" min="-1" name="attr_skill_work">
-            <button name="roll_skill_work" type="roll" value="/me &{template:skill} {{type=Work}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_work} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
-            <button name="roll_skill_work_specialist" type="roll" value="/me &{template:skill} {{type=Work}} {{characterName=@{name}}} {{rollValue=[[ 3d6d1+@{skill_work} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0} ]]}}"></button>
+              <input style="width: 30px" type="radio" name="attr_skill_work_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_work_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_work_specialist" value="4d6d2">
+            <button name="roll_skill_work" type="roll" value="/me &{template:skill} {{type=Work}} {{characterName=@{name}}} {{rollValue=[[@{skill_work_specialist} + @{skill_work} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-2colrow sheet-skills">
+      <div class="sheet-col">
+        <div class="sheet-2colrow">
+          <div class="sheet-col">
+            <label for="attr_skill_pilot">Pilot</label>
+              <input  type="number" min="-1" value="-1" name="attr_skill_pilot">
+        </div>
+        <div class="sheet-col">
+                <input style="width: 30px" type="radio" name="attr_skill_pilot_specialist" value="2d6" checked>
+                <input style="width: 30px" type="radio" name="attr_skill_pilot_specialist" value="3d6d1">
+                <input style="width: 30px" type="radio" name="attr_skill_pilot_specialist" value="4d6d2">
+            <button name="roll_skill_pilot" type="roll" value="/me &{template:skill} {{type=Pilot}} {{characterName=@{name}}} {{rollValue=[[@{skill_pilot_specialist} + @{skill_pilot} + ?{Attribute|Str,@{str_bonus}|Int,@{int_bonus}|Dex,@{dex_bonus}|Wis,@{wis_bonus}|Con,@{con_bonus}|Cha,@{cha_bonus}|None,0} + ?{Assisted?|0}]]}}"></button>
           </div>
         </div>
       </div>