diff --git a/Stars_Without_Number/ReadMe.md b/Stars_Without_Number/ReadMe.md
index bee431d386..7ef03f5052 100644
--- a/Stars_Without_Number/ReadMe.md
+++ b/Stars_Without_Number/ReadMe.md
@@ -28,6 +28,16 @@ Report any problems, suggestions, or features by [creating an issue](https://git
 
 ### Changelog
 
+#### 0.1.7
+
+* Revamped and made consistent all roll templates for:
+ * Saves
+ * Weapon Attacks
+ * Basic Attacks
+ * Skills
+* Initiative now using roll templates
+* Removed unused Morale roll template
+
 #### 0.1.6
 
 * Removed damage message from missed weapon attacks
diff --git a/Stars_Without_Number/Stars_Without_Number.css b/Stars_Without_Number/Stars_Without_Number.css
index 35080ac671..cc896dd27d 100644
--- a/Stars_Without_Number/Stars_Without_Number.css
+++ b/Stars_Without_Number/Stars_Without_Number.css
@@ -300,130 +300,85 @@ div.sheet-tab-input
 }
 
 /* Roll templates */
-
+.sheet-rolltemplate-initiative .sheet-swn-template-container,
+.sheet-rolltemplate-save .sheet-swn-template-container,
 .sheet-rolltemplate-skill .sheet-swn-template-container,
 .sheet-rolltemplate-attack .sheet-swn-template-container,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container,
-.sheet-rolltemplate-save .sheet-swn-template-container,
-.sheet-rolltemplate-morale .sheet-swn-template-container {
+.sheet-rolltemplate-basicattack .sheet-swn-template-container {
     width:100%;
-    height: 100px;
-    background: url(https://i.imgur.com/rTZq7C5.jpg) top left;
-    background-size: cover;
+    -moz-border-radius-bottomright: 10px;
+    -webkit-border-bottom-right-radius: 10px;
+    border-bottom-right-radius: 10px;
+    -moz-border-radius-bottomleft: 10px;
+    -webkit-border-bottom-left-radius: 10px;
+    border-bottom-left-radius: 10px;
+    border-width: 3px;
+    border-color: #000000;
+    background: #000000 url(https://i.imgur.com/rTZq7C5.jpg) top left;
     background-repeat: no-repeat;
-    color: white;
-    border-radius: 5px 5px 5px 5px;
-    -moz-border-radius: 5px 5px 5px 5px;
-    -webkit-border-radius: 5px 5px 5px 5px;
-    border: 0px solid #000000;
+    background-size: cover;
+    color: #ffffff;
 }
 
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-title,
+.sheet-rolltemplate-initiative .sheet-swn-template-container .sheet-swn-template-title,
+.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-title,
 .sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-title,
-.sheet-rolltemplate-morale .sheet-swn-template-container .sheet-swn-template-title {
-    text-align: center;
-    height: 25%;
-    font-size: 1.0em;
-    vertical-align: middle;
-    font-weight: bold;
-    padding-top:15px;
-}
-
 .sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-title,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-title {
-    text-align: center;
-    height: 25%;
-    font-size: 1.0em;
-    vertical-align: middle;
-    font-weight: bold;
-    padding-top:5px;
+.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-title {
+  padding-top:15px;
+  vertical-align: middle;
+  text-align: center;
+  font-weight: bold;
 }
 
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-title-character,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-title-character {
-  font-size: 1.5em;
+.sheet-rolltemplate-initiative .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-name,
+.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-name,
+.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-name,
+.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-name,
+.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-name {
+  border-bottom-width: 3px;
+  border-style: solid;
+  border-color: #000000;
+  background-color: #848482;
+  color: #000000;
+  font-size: 1.0em;
 }
 
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-title-action,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-title-action {
+.sheet-rolltemplate-initiative .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-type,
+.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-type,
+.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-type,
+.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-type,
+.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-title .sheet-swn-template-type {
+  border-bottom-width: 3px;
+  border-style: solid;
+  border-color: #000000;
+  background-color: #d3d3d3;
+  color: #000000;
   font-size: 0.8em;
 }
 
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-results-row,
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-results-row,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-results-row,
-.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-results-row,
-.sheet-rolltemplate-morale .sheet-swn-template-container .sheet-swn-template-results-row {
-    width: 100%;
-    height: 75%;
-}
+.sheet-rolltemplate-initiative .sheet-swn-template-container .sheet-swn-template-result,
+.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-result,
+.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-result,
+.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-result,
+.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-result {
+   padding-top: 15px;
+   padding-bottom: 15px;
+   text-align: center;
+ }
 
-.sheet-rolltemplate-skill .sheet-swn,
-.sheet-rolltemplate-attack .sheet-swn,
-.sheet-rolltemplate-basicattack .sheet-swn,
-.sheet-rolltemplate-save .sheet-swn,
-.sheet-rolltemplate-morale .sheet-swn {
-    opacity: 0.9;
-    vertical-align: middle;
-    padding-top: 10px;
-}
-
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-results-row .sheet-results-element,
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-results-element,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-results-element,
-.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-results-row .sheet-results-element,
-.sheet-rolltemplate-morale .sheet-swn-template-container .sheet-swn-template-results-row .sheet-results-element {
-    font-size: 0.9em;
-    text-align: center;
-    vertical-align: middle;
-    height: 30px;
-}
-
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-results-row .sheet-success,
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-success,
-.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-results-row .sheet-success,
-.sheet-rolltemplate-morale .sheet-swn-template-container .sheet-swn-template-results-row .sheet-success {
-    width: 50%;
-    background-color: green;
-    color: white;
-    float: left;
-}
-
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-success {
-    width: 100%;
-    background-color: green;
-    color: white;
-    float: left;
-}
-
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-results-row .sheet-fail,
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-fail,
-.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-fail,
-.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-results-row .sheet-fail,
-.sheet-rolltemplate-morale .sheet-swn-template-container .sheet-swn-template-results-row .sheet-fail {
-    width: 100%;
-    background-color: red;
-    color: white;
-    float: left;
-}
+.sheet-rolltemplate-initiative .sheet-swn-template-container .sheet-fail-tabstyle,
+.sheet-rolltemplate-basicattack .sheet-swn-template-container .sheet-fail-tabstyle,
+.sheet-rolltemplate-save .sheet-swn-template-container .sheet-fail-tabstyle,
+.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-fail-tabstyle,
+.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-fail-tabstyle {
+   color: #ff0000;
+ }
 
+.sheet-rolltemplate-initiative .sheet-black-text,
+.sheet-rolltemplate-basicattack .sheet-black-text,
+.sheet-rolltemplate-save .sheet-black-text,
 .sheet-rolltemplate-attack .sheet-black-text,
-.sheet-rolltemplate-basicattack .sheet-black-text {
-    color: black;
-}
-
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-results-row .sheet-roll-output,
-.sheet-rolltemplate-attack .sheet-swn-template-container .sheet-swn-template-results-row .sheet-roll-output,
-.sheet-rolltemplate-save .sheet-swn-template-container .sheet-swn-template-results-row .sheet-roll-output,
-.sheet-rolltemplate-morale .sheet-swn-template-container .sheet-swn-template-results-row .sheet-roll-output {
-    width: 50%;
-    background-color: #dcdcdc;
-    color: black;
-    float: right;
-}
-
-.sheet-rolltemplate-skill .sheet-swn-template-container .sheet-swn-template-results-row .sheet-roll-neutral {
-    background-color: #dcdcdc;
-    color: black;
-    float: left;
+.sheet-rolltemplate-skill .sheet-black-text {
+  color: #000000;
 }
diff --git a/Stars_Without_Number/Stars_Without_Number.html b/Stars_Without_Number/Stars_Without_Number.html
index 8ed5a079af..5d85b5f28f 100644
--- a/Stars_Without_Number/Stars_Without_Number.html
+++ b/Stars_Without_Number/Stars_Without_Number.html
@@ -1,131 +1,186 @@
-<rolltemplate class="sheet-rolltemplate-basicattack">
-  <div class="sheet-swn-template-container">
-      <div class="sheet-swn sheet-swn-template-title">
-        <div class="sheet-swn-template-title-character">
+<rolltemplate class="sheet-rolltemplate-initiative">
+  <table class="sheet-swn-template-container">
+    <thead>
+      <tr class="sheet-swn-template-title">
+        <th class="sheet-swn-template-name">
           {{characterName}}
-        </div>
-        <div class="sheet-swn-template-title-action">
-          {{#attackType}}
-            Basic {{attackType}} Attack
-          {{/attackType}}
-        </div>
-      </div>
-      <div class="sheet-swn sheet-swn-template-results-row">
-          {{#rollGreater() rollValue 19}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-success">
-              Rolls <span class="black-text">{{rollValue}}</span>, Hit!
-            </span>
-          {{/rollGreater() rollValue 19}}
-          {{#rollLess() rollValue 20}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-fail">
-              Rolls <span class="black-text">{{rollValue}}</span>, Miss!
-            </span>
-          {{/rollLess() rollValue 20}}
-      </div>
+        </th>
+      </tr>
+      <tr class="sheet-swn-template-title">
+        <th class="sheet-swn-template-type">
+          Initiative
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td class="sheet-swn-template-result">
+          <span class="sheet-black-text">{{rollValue}}</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</rolltemplate>
+
+<rolltemplate class="sheet-rolltemplate-basicattack">
+  <table class="sheet-swn-template-container">
+    <thead>
+      <tr class="sheet-swn-template-title">
+        <th colspan="2" class="sheet-swn-template-name">
+          {{characterName}}
+        </th>
+      </tr>
+      <tr class="sheet-swn-template-title">
+        <th colspan="2" class="sheet-swn-template-type">
+          {{attackType}} Attack
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        {{#rollGreater() rollValue 19}}
+          <td class="sheet-swn-template-result">
+            Hit!
+          </td>
+        {{/rollGreater() rollValue 19}}
+        {{#rollLess() rollValue 20}}
+          <td class="sheet-swn-template-result sheet-fail-tabstyle">
+            Miss!
+          </td>
+        {{/rollLess() rollValue 20}}
+        <td class="sheet-swn-template-result">
+          <span class="sheet-black-text">{{rollValue}}</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</rolltemplate>
+
+<rolltemplate class="sheet-rolltemplate-save">
+  <table class="sheet-swn-template-container">
+    <thead>
+      <tr class="sheet-swn-template-title">
+        <th colspan="2" class="sheet-swn-template-name">
+          {{characterName}}
+        </th>
+      </tr>
+      <tr class="sheet-swn-template-title">
+        <th colspan="2" class="sheet-swn-template-type">
+          {{type}} Save
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        {{#^rollLess() rollValue save}}
+          <td class="sheet-swn-template-result">
+            Success!
+          </td>
+        {{/^rollLess() rollValue save}}
+        {{#rollLess() rollValue save}}
+          <td class="sheet-swn-template-result sheet-fail-tabstyle">
+            Fail!
+          </td>
+        {{/rollLess() rollValue save}}
+        <td class="sheet-swn-template-result">
+          <span class="sheet-black-text">{{rollValue}}</span>
+           vs
+          <span class="sheet-black-text">{{save}}</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </rolltemplate>
 
 <rolltemplate class="sheet-rolltemplate-attack">
-  <div class="sheet-swn-template-container">
-      <div class="sheet-swn sheet-swn-template-title">
-        <div class="sheet-swn-template-title-character">
+  <table class="sheet-swn-template-container">
+    <thead>
+      <tr class="sheet-swn-template-title">
+        <th colspan="2" class="sheet-swn-template-name">
           {{characterName}}
-        </div>
-        <div class="sheet-swn-template-title-action">
+        </th>
+      </tr>
+      <tr class="sheet-swn-template-title">
+        <th colspan="2" class="sheet-swn-template-type">
           {{#name}}
-            Attack using {{name}}
+            {{name}}
+          {{/name}}
+          {{#name}}
+            {{#attackType}}
+              <br>
+            {{/attackType}}
           {{/name}}
           {{#attackType}}
             {{attackType}} Attack
           {{/attackType}}
-        </div>
-      </div>
-      <div class="sheet-swn sheet-swn-template-results-row">
-          {{#rollGreater() rollValue 19}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-success">
-              Rolls <span class="black-text">{{rollValue}}</span>, Hit!
-            </span>
-          {{/rollGreater() rollValue 19}}
-          {{#rollLess() rollValue 20}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-fail">
-              Rolls <span class="black-text">{{rollValue}}</span>, Miss!
-            </span>
-          {{/rollLess() rollValue 20}}
-
-          {{#damage}}
-            {{#rollGreater() rollValue 19}}
-              <span class="sheet-swn sheet-results-element sheet-roll-output">
-                 <span class="black-text">{{damage}}</span> damage!
-              </span>
-            {{/rollGreater() rollValue 19}}
-          {{/damage}}
-      </div>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        {{#rollGreater() rollValue 19}}
+          <td class="sheet-swn-template-result">
+            Hit!
+          </td>
+        {{/rollGreater() rollValue 19}}
+        {{#rollLess() rollValue 20}}
+          <td class="sheet-swn-template-result sheet-fail-tabstyle">
+            Miss!
+          </td>
+        {{/rollLess() rollValue 20}}
+        <td class="sheet-swn-template-result">
+          <span class="sheet-black-text">{{rollValue}}</span>
+        </td>
+      </tr>
+      {{#rollGreater() rollValue 19}}
+        {{#damage}}
+          <tr>
+            <td class="sheet-swn-template-result" colspan="2">
+              {{#rollGreater() rollValue 19}}
+                <span class="sheet-swn sheet-results-element sheet-roll-output">
+                   <span class="black-text">{{damage}}</span> damage!
+                </span>
+              {{/rollGreater() rollValue 19}}
+            </td>
+          </tr>
+        {{/damage}}
+      {{/rollGreater() rollValue 19}}
+    </tbody>
+  </table>
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-save">
-  <div class="sheet-swn-template-container">
-      <div class="sheet-swn sheet-swn-template-title">
-          {{type}} Save
-      </div>
-      <div class="sheet-swn sheet-swn-template-results-row">
-          {{#^rollLess() rollValue save}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-success">
-                Success!
-            </span>
-          {{/^rollLess() rollValue save}}
-          {{#rollLess() rollValue save}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-fail">
-              Fail!
-            </span>
-          {{/rollLess() rollValue save}}
-          <span class="sheet-swn sheet-results-element sheet-roll-output">
-            {{rollValue}} vs {{save}}
-          </span>
-      </div>
-  </div>
-</rolltemplate>
-<rolltemplate class="sheet-rolltemplate-morale">
-  <div class="sheet-swn-template-container">
-      <div class="sheet-swn sheet-swn-template-title">
-          {{type}} Morale
-      </div>
-      <div class="sheet-swn sheet-swn-template-results-row">
-          {{#rollLess() rollValue morale}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-success">
-                Success!
-            </span>
-          {{/rollLess() rollValue morale}}
-          {{#rollGreater() rollValue morale}}
-            <span class="sheet-swn sheet-results-element sheet-roll-status sheet-fail">
-              Fail!
-            </span>
-          {{/rollGreater() rollValue morale}}
-          <span class="sheet-swn sheet-results-element sheet-roll-output">
-            {{rollValue}} vs {{morale}}
-          </span>
-      </div>
-  </div>
-</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-skill">
-  <div class="sheet-swn-template-container">
-      <div class="sheet-swn sheet-swn-template-title">
-          {{type}} Skillcheck
-      </div>
-      <div class="sheet-swn sheet-swn-template-results-row">
-          <span class="sheet-swn sheet-results-element sheet-roll-status sheet-roll-neutral">
-            Check result:
-          </span>
-          <span class="sheet-swn sheet-results-element sheet-roll-output">
-            {{rollValue}}
-          </span>
-      </div>
-  </div>
+  <table class="sheet-swn-template-container">
+    <thead>
+      <tr class="sheet-swn-template-title">
+        <th class="sheet-swn-template-name" colspan="2">
+          {{characterName}}
+        </th>
+      </tr>
+      <tr class="sheet-swn-template-title">
+        <th class="sheet-swn-template-type" colspan="2">
+          {{type}}
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td class="sheet-swn-template-result">
+          Check Result
+        </td>
+        <td class="sheet-swn-template-result">
+          <span class="sheet-black-text">{{rollValue}}</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </rolltemplate>
 
 <div class="sheet-logo">
   <img src="http://i.imgur.com/3U3Ibb7.png" alt="Stars Without Number">
 </div>
-
-<div class="sheet-version">Version 0.1.6</div>
+7
+<div class="sheet-version">Version 0.1.7</div>
 
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab-character" value="1" title="Character" checked="checked" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab-ship" value="2" title="Ship" />
@@ -449,7 +504,7 @@
     <div class="sheet-5colrow">
       <div class="sheet-col">
         <label for="roll_initiative">Roll Initiative (Select your token first)</label>
-        <button type="roll" name="roll_initiative" value="/me rolls initiative: [[1d8+@{dex_bonus} &{tracker}]]" ></button>
+        <button type="roll" name="roll_initiative" value="&{template:initiative} {{characterName=@{name}}} {{rollValue=[[1d8+@{dex_bonus} &{tracker}]]}}" ></button>
       </div>
       <div class="sheet-col">
         <label for="roll_basic_melee_attack">Basic Melee Attack Roll</label>
@@ -481,23 +536,23 @@
     <div class="sheet-5colrow sheet-saves">
       <div class="sheet-col">
         <input type="number" min="0" name="attr_save_physical" class="sheet-stats-save">
-        <button name="roll_save_physical" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_physical}]]}} {{type=Physical}}"></button>
+        <button name="roll_save_physical" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_physical}]]}} {{characterName=@{name}}} {{type=Physical}}"></button>
       </div>
       <div class="sheet-col">
         <input type="number" min="0" name="attr_save_mental" class="sheet-stats-save">
-        <button name="roll_save_mental" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_mental}]]}} {{type=Mental}}"></button>
+        <button name="roll_save_mental" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_mental}]]}} {{characterName=@{name}}} {{type=Mental}}"></button>
       </div>
       <div class="sheet-col">
         <input type="number" min="0" name="attr_save_evasion" class="sheet-stats-save">
-        <button name="roll_save_evasion" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_evasion}]]}} {{type=Evasion}}"></button>
+        <button name="roll_save_evasion" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_evasion}]]}} {{characterName=@{name}}} {{type=Evasion}}"></button>
       </div>
       <div class="sheet-col">
         <input type="number" min="0" name="attr_save_tech" class="sheet-stats-save">
-        <button name="roll_save_tech" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_tech}]]}} {{type=Tech}}"></button>
+        <button name="roll_save_tech" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_tech}]]}} {{characterName=@{name}}} {{type=Tech}}"></button>
       </div>
       <div class="sheet-col">
         <input type="number" min="0" name="attr_save_luck" class="sheet-stats-save">
-        <button name="roll_save_luck" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_luck}]]}} {{type=Luck}}"></button>
+        <button name="roll_save_luck" type="roll" value="/me &{template:save} {{rollValue=[[1d20]]}} {{save=[[@{save_luck}]]}} {{characterName=@{name}}} {{type=Luck}}"></button>
       </div>
     </div>
     <h3>Skills</h3>
@@ -509,7 +564,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" min="-1" value="-1" name="attr_skill_artist">
-            <button name="roll_skill_artist" type="roll" value="/me &{template:skill} {{type=Artist}} {{rollValue=[[2d6 + @{skill_artist} + ?{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_artist" type="roll" value="/me &{template:skill} {{type=Artist}} {{characterName=@{name}}} {{rollValue=[[2d6 + @{skill_artist} + ?{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>
@@ -520,7 +575,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" min="-1" value="-1" name="attr_skill_navigation">
-            <button name="roll_skill_navigation" type="roll" value="/me &{template:skill} {{type=Navigation}} {{rollValue=[[ 2d6+@{skill_navigation} + ?{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_navigation" type="roll" value="/me &{template:skill} {{type=Navigation}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_navigation} + ?{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>
@@ -533,7 +588,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_athletics">
-            <button name="roll_skill_athletics" type="roll" value="/me &{template:skill} {{type=Athletics}} {{rollValue=[[ 2d6+@{skill_athletics} + ?{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_athletics" type="roll" value="/me &{template:skill} {{type=Athletics}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_athletics} + ?{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>
@@ -544,7 +599,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_perception">
-            <button name="roll_skill_perception" type="roll" value="/me &{template:skill} {{type=Perception}} {{rollValue=[[ 2d6+@{skill_perception} + ?{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_perception" type="roll" value="/me &{template:skill} {{type=Perception}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_perception} + ?{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>
@@ -557,7 +612,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_bureaucracy">
-            <button name="roll_skill_bureaucracy" type="roll" value="/me &{template:skill} {{type=Bureaucracy}} {{rollValue=[[ 2d6+@{skill_bureaucracy} + ?{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_bureaucracy" type="roll" value="/me &{template:skill} {{type=Bureaucracy}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_bureaucracy} + ?{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>
@@ -568,7 +623,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_persuade">
-            <button name="roll_skill_persuade" type="roll" value="/me &{template:skill} {{type=Persuade}} {{rollValue=[[ 2d6+@{skill_persuade} + ?{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_persuade" type="roll" value="/me &{template:skill} {{type=Persuade}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_persuade} + ?{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>
@@ -581,7 +636,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_business">
-            <button name="roll_skill_business" type="roll" value="/me &{template:skill} {{type=Business}} {{rollValue=[[ 2d6+@{skill_business} + ?{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_business" type="roll" value="/me &{template:skill} {{type=Business}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_business} + ?{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>
@@ -592,7 +647,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_profession">
-            <button name="roll_skill_profession" type="roll" value="/me &{template:skill} {{type=Profession}} {{rollValue=[[ 2d6+@{skill_profession} + ?{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_profession" type="roll" value="/me &{template:skill} {{type=Profession/@{profession_type}}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_profession} + ?{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>
@@ -605,7 +660,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_combat_energy">
-            <button name="roll_skill_combat_energy" type="roll" value="/me &{template:skill} {{type=Combat_energy}} {{rollValue=[[ 2d6+@{skill_combat_energy} + ?{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_combat_energy" type="roll" value="/me &{template:skill} {{type=Combat/Energy Weapons}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_combat_energy} + ?{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,7 +671,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_religion">
-            <button name="roll_skill_religion" type="roll" value="/me &{template:skill} {{type=Religion}} {{rollValue=[[ 2d6+@{skill_religion} + ?{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_religion" type="roll" value="/me &{template:skill} {{type=Religion}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_religion} + ?{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>
@@ -629,7 +684,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_combat_gunnery">
-            <button name="roll_skill_combat_gunnery" type="roll" value="/me &{template:skill} {{type=Combat_gunnery}} {{rollValue=[[ 2d6+@{skill_combat_gunnery} + ?{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_combat_gunnery" type="roll" value="/me &{template:skill} {{type=Combat/Gunnery}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_combat_gunnery} + ?{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>
@@ -640,7 +695,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_science">
-            <button name="roll_skill_science" type="roll" value="/me &{template:skill} {{type=Science}} {{rollValue=[[ 2d6+@{skill_science} + ?{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_science" type="roll" value="/me &{template:skill} {{type=Science}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_science} + ?{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>
@@ -653,7 +708,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_primitive">
-            <button name="roll_skill_primitive" type="roll" value="/me &{template:skill} {{type=Primitive}} {{rollValue=[[ 2d6+@{skill_primitive} + ?{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_primitive" type="roll" value="/me &{template:skill} {{type=Combat/Primitive Weapons}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_primitive} + ?{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>
@@ -664,7 +719,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_security">
-            <button name="roll_skill_security" type="roll" value="/me &{template:skill} {{type=Security}} {{rollValue=[[ 2d6+@{skill_security} + ?{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_security" type="roll" value="/me &{template:skill} {{type=Security}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_security} + ?{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>
@@ -677,7 +732,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_projectile">
-            <button name="roll_skill_projectile" type="roll" value="/me &{template:skill} {{type=Projectile}} {{rollValue=[[ 2d6+@{skill_projectile} + ?{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_projectile" type="roll" value="/me &{template:skill} {{type=Combat/Projectile Weapons}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_projectile} + ?{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>
@@ -688,7 +743,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_stealth">
-            <button name="roll_skill_stealth" type="roll" value="/me &{template:skill} {{type=Stealth}} {{rollValue=[[ 2d6+@{skill_stealth} + ?{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_stealth" type="roll" value="/me &{template:skill} {{type=Stealth}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_stealth} + ?{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>
@@ -701,7 +756,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_psitech">
-            <button name="roll_skill_psitech" type="roll" value="/me &{template:skill} {{type=Psitech}} {{rollValue=[[ 2d6+@{skill_psitech} + ?{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_psitech" type="roll" value="/me &{template:skill} {{type=Combat/Psitech}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_psitech} + ?{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>
@@ -712,7 +767,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_steward">
-            <button name="roll_skill_steward" type="roll" value="/me &{template:skill} {{type=Steward}} {{rollValue=[[ 2d6+@{skill_steward} + ?{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_steward" type="roll" value="/me &{template:skill} {{type=Steward}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_steward} + ?{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>
@@ -725,7 +780,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_unarmed">
-            <button name="roll_skill_unarmed" type="roll" value="/me &{template:skill} {{type=Unarmed}} {{rollValue=[[ 2d6+@{skill_unarmed} + ?{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_unarmed" type="roll" value="/me &{template:skill} {{type=Combat/Unarmed}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_unarmed} + ?{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>
@@ -736,7 +791,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_survival">
-            <button name="roll_skill_survival" type="roll" value="/me &{template:skill} {{type=Survival}} {{rollValue=[[ 2d6+@{skill_survival} + ?{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_survival" type="roll" value="/me &{template:skill} {{type=Survival}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_survival} + ?{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>
@@ -749,7 +804,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_computer">
-            <button name="roll_skill_computer" type="roll" value="/me &{template:skill} {{type=Computer}} {{rollValue=[[ 2d6+@{skill_computer} + ?{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_computer" type="roll" value="/me &{template:skill} {{type=Computer}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_computer} + ?{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>
@@ -760,7 +815,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tactics">
-            <button name="roll_skill_tactics" type="roll" value="/me &{template:skill} {{type=Tactics}} {{rollValue=[[ 2d6+@{skill_tactics} + ?{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_tactics" type="roll" value="/me &{template:skill} {{type=Tactics}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tactics} + ?{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>
@@ -773,7 +828,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_alien">
-            <button name="roll_skill_culture_alien" type="roll" value="/me &{template:skill} {{type=Culture/Alien}} {{rollValue=[[ 2d6+@{skill_culture_alien} + ?{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_culture_alien" type="roll" value="/me &{template:skill} {{type=Culture/Alien/@{culture_alien_type}}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_alien} + ?{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>
@@ -784,7 +839,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tech_astronautic">
-            <button name="roll_skill_tech_astronautic" type="roll" value="/me &{template:skill} {{type=Tech/Astronautic}} {{rollValue=[[ 2d6+@{skill_tech_astronautic} + ?{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_tech_astronautic" type="roll" value="/me &{template:skill} {{type=Tech/Astronautic}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tech_astronautic} + ?{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>
@@ -797,7 +852,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_criminal">
-            <button name="roll_skill_culture_criminal" type="roll" value="/me &{template:skill} {{type=Culture/Criminal}} {{rollValue=[[ 2d6+@{skill_culture_criminal} + ?{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_culture_criminal" type="roll" value="/me &{template:skill} {{type=Culture/Criminal}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_criminal} + ?{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>
@@ -808,7 +863,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tech_maltech">
-            <button name="roll_skill_tech_maltech" type="roll" value="/me &{template:skill} {{type=Tech/Maltech}} {{rollValue=[[ 2d6+@{skill_tech_maltech} + ?{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_tech_maltech" type="roll" value="/me &{template:skill} {{type=Tech/Maltech}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tech_maltech} + ?{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>
@@ -821,7 +876,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_spacer">
-            <button name="roll_skill_culture_spacer" type="roll" value="/me &{template:skill} {{type=Culture/Spacer}} {{rollValue=[[ 2d6+@{skill_culture_spacer} + ?{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_culture_spacer" type="roll" value="/me &{template:skill} {{type=Culture/Spacer}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_spacer} + ?{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>
@@ -832,7 +887,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tech_medical">
-            <button name="roll_skill_tech_medical" type="roll" value="/me &{template:skill} {{type=Tech/Medical}} {{rollValue=[[ 2d6+@{skill_tech_medical} + ?{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_tech_medical" type="roll" value="/me &{template:skill} {{type=Tech/Medical}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tech_medical} + ?{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>
@@ -845,7 +900,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_traveller">
-            <button name="roll_skill_culture_traveller" type="roll" value="/me &{template:skill} {{type=Culture/Traveller}} {{rollValue=[[ 2d6+@{skill_culture_traveller} + ?{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_culture_traveller" type="roll" value="/me &{template:skill} {{type=Culture/Traveller}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_traveller} + ?{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>
@@ -856,7 +911,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tech_postech">
-            <button name="roll_skill_tech_postech" type="roll" value="/me &{template:skill} {{type=Tech/Postech}} {{rollValue=[[ 2d6+@{skill_tech_postech} + ?{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_tech_postech" type="roll" value="/me &{template:skill} {{type=Tech/Postech}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tech_postech} + ?{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>
@@ -869,7 +924,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_one">
-            <button name="roll_skill_culture_one" type="roll" value="/me &{template:skill} {{type=Culture}} {{rollValue=[[ 2d6+@{skill_culture_one} + ?{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_culture_one" type="roll" value="/me &{template:skill} {{type=Culture/@{skill_culture_one_value}}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_one} + ?{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>
@@ -880,7 +935,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tech_pretech">
-            <button name="roll_skill_tech_pretech" type="roll" value="/me &{template:skill} {{type=Tech/Pretech}} {{rollValue=[[ 2d6+@{skill_tech_pretech} + ?{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_tech_pretech" type="roll" value="/me &{template:skill} {{type=Tech/Pretech}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tech_pretech} + ?{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>
@@ -893,7 +948,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_two">
-            <button name="roll_skill_culture_two" type="roll" value="/me &{template:skill} {{type=Culture}} {{rollValue=[[ 2d6+@{skill_culture_two} + ?{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_culture_two" type="roll" value="/me &{template:skill} {{type=Culture/@{skill_culture_two_value}}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_two} + ?{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>
@@ -904,7 +959,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_tech_psitech">
-            <button name="roll_skill_tech_psitech" type="roll" value="/me &{template:skill} {{type=Tech/Psitech}} {{rollValue=[[ 2d6+@{skill_tech_psitech} + ?{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_tech_psitech" type="roll" value="/me &{template:skill} {{type=Tech/Psitech}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_tech_psitech} + ?{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>
@@ -917,7 +972,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_culture_three">
-            <button name="roll_skill_culture_three" type="roll" value="/me &{template:skill} {{type=Culture}} {{rollValue=[[ 2d6+@{skill_culture_three} + ?{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_culture_three" type="roll" value="/me &{template:skill} {{type=Culture/@{skill_culture_three_value}}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_culture_three} + ?{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>
@@ -928,7 +983,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_vehicle_air">
-            <button name="roll_skill_vehicle_air" type="roll" value="/me &{template:skill} {{type=Vehicle/Air}} {{rollValue=[[ 2d6+@{skill_vehicle_air} + ?{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_vehicle_air" type="roll" value="/me &{template:skill} {{type=Vehicle/Air}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_vehicle_air} + ?{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>
@@ -941,7 +996,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_exosuit">
-            <button name="roll_skill_exosuit" type="roll" value="/me &{template:skill} {{type=Exosuit}} {{rollValue=[[ 2d6+@{skill_exosuit} + ?{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_exosuit" type="roll" value="/me &{template:skill} {{type=Exosuit}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_exosuit} + ?{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>
@@ -952,7 +1007,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_vehicle_grav">
-            <button name="roll_skill_vehicle_grav" type="roll" value="/me &{template:skill} {{type=Vehicle_grav}} {{rollValue=[[ 2d6+@{skill_vehicle_grav} + ?{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_vehicle_grav" type="roll" value="/me &{template:skill} {{type=Vehicle/Grav}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_vehicle_grav} + ?{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>
@@ -965,7 +1020,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_gambling">
-            <button name="roll_skill_gambling" type="roll" value="/me &{template:skill} {{type=Gambling}} {{rollValue=[[ 2d6+@{skill_gambling} + ?{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_gambling" type="roll" value="/me &{template:skill} {{type=Gambling}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_gambling} + ?{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>
@@ -976,7 +1031,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_vehicle_land">
-            <button name="roll_skill_vehicle_land" type="roll" value="/me &{template:skill} {{type=Vehicle_land}} {{rollValue=[[ 2d6+@{skill_vehicle_land} + ?{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_vehicle_land" type="roll" value="/me &{template:skill} {{type=Vehicle/Land}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_vehicle_land} + ?{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>
@@ -989,7 +1044,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_history">
-            <button name="roll_skill_history" type="roll" value="/me &{template:skill} {{type=History}} {{rollValue=[[ 2d6+@{skill_history} + ?{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_history" type="roll" value="/me &{template:skill} {{type=History}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_history} + ?{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>
@@ -1000,7 +1055,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_vehicle_space">
-            <button name="roll_skill_vehicle_space" type="roll" value="/me &{template:skill} {{type=Vehicle_space}} {{rollValue=[[ 2d6+@{skill_vehicle_space} + ?{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_vehicle_space" type="roll" value="/me &{template:skill} {{type=Vehicle/Space}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_vehicle_space} + ?{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>
@@ -1013,7 +1068,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_instructor">
-            <button name="roll_skill_instructor" type="roll" value="/me &{template:skill} {{type=Instructor}} {{rollValue=[[ 2d6+@{skill_instructor} + ?{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_instructor" type="roll" value="/me &{template:skill} {{type=Instructor}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_instructor} + ?{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>
@@ -1024,7 +1079,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_vehicle_water">
-            <button name="roll_skill_vehicle_water" type="roll" value="/me &{template:skill} {{type=Vehicle_water}} {{rollValue=[[ 2d6+@{skill_vehicle_water} + ?{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_vehicle_water" type="roll" value="/me &{template:skill} {{type=Vehicle/Water}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_vehicle_water} + ?{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>
@@ -1037,7 +1092,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_language">
-            <button name="roll_skill_language" type="roll" value="/me &{template:skill} {{type=Language}} {{rollValue=[[ 2d6+@{skill_language} + ?{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_language" type="roll" value="/me &{template:skill} {{type=Language}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_language} + ?{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>
@@ -1060,7 +1115,7 @@
           </div>
           <div class="sheet-col">
             <input type="number" value="-1" min="-1" name="attr_skill_leadership">
-            <button name="roll_skill_leadership" type="roll" value="/me &{template:skill} {{type=Leadership}} {{rollValue=[[ 2d6+@{skill_leadership} + ?{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_leadership" type="roll" value="/me &{template:skill} {{type=Leadership}} {{characterName=@{name}}} {{rollValue=[[ 2d6+@{skill_leadership} + ?{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>
diff --git a/Stars_Without_Number/sheet.json b/Stars_Without_Number/sheet.json
index 4f9ea4300b..2718035b56 100644
--- a/Stars_Without_Number/sheet.json
+++ b/Stars_Without_Number/sheet.json
@@ -1,8 +1,8 @@
 {
     "html": "Stars_Without_Number.html",
     "css": "Stars_Without_Number.css",
-    "authors": ["Kevin Searle (@kevinsearle)","Joe Fredette (@jfredett)"],
+    "authors": ["Kevin Searle (@kevinsearle)"],
     "roll20userid": ["565104","161749"],
     "preview": "Stars_Without_Number.png",
-    "instructions": "Updated and maintained by Kevin the Barbarian. Additional changes by jfredett (jfredett at gmail dot com). Originally created by Kevin the Barbarian based on the character sheet design by OneSevenDesign at http://www.onesevendesign.com/swn_charsheets_oneseven.pdf.\r\r\r"
+    "instructions": "Originally based on the character sheet design by OneSevenDesign at http://www.onesevendesign.com/swn_charsheets_oneseven.pdf.\r\r\r"
 }