From b58fe43a9d076d47dc5f6e7daeb74ae66ea7c4a2 Mon Sep 17 00:00:00 2001
From: CoalPoweredPuppet <breederofpuppets@gmail.com>
Date: Tue, 17 Jan 2017 23:19:31 -0500
Subject: [PATCH] Revert "Mongoose Traveller 2e"

This reverts commit f525ca9fddf70b97112dc1edf25784cd873ff2d7.
---
 .../MongooseTraveller.css                     |  67 +-
 .../MongooseTraveller.html                    | 762 ++++++++++--------
 .../MongooseTraveller.png                     | Bin
 .../sheet.json                                |  10 +-
 4 files changed, 470 insertions(+), 369 deletions(-)
 rename Mongoose_Traveller2e/MongooseTraveller2e.css => Mongoose_Traveller/MongooseTraveller.css (92%)
 rename Mongoose_Traveller2e/MongooseTraveller2e.html => Mongoose_Traveller/MongooseTraveller.html (83%)
 rename Mongoose_Traveller2e/MongooseTraveller2e.png => Mongoose_Traveller/MongooseTraveller.png (100%)
 rename {Mongoose_Traveller2e => Mongoose_Traveller}/sheet.json (52%)

diff --git a/Mongoose_Traveller2e/MongooseTraveller2e.css b/Mongoose_Traveller/MongooseTraveller.css
similarity index 92%
rename from Mongoose_Traveller2e/MongooseTraveller2e.css
rename to Mongoose_Traveller/MongooseTraveller.css
index 165fccf352..0aab6545ae 100644
--- a/Mongoose_Traveller2e/MongooseTraveller2e.css
+++ b/Mongoose_Traveller/MongooseTraveller.css
@@ -3,9 +3,20 @@
     background-color:white;
 }
 
+.sheet-banner { 
+    background: url('http://www.mongoosepublishing.com/media/catalog/category/Traveller_front4_2.jpg'); 
+    background-size: 100%;
+    background-repeat: no-repeat;
+    background-position: right bottom;
+}
+
+.sheet-banner-content { 
+    margin: 0 auto; 
+    padding: 100px; 
+}
 /*====Tabs ====*/
-div.sheet-tab-content {
-    display: none;
+div.sheet-tab-content { 
+    display: none; 
 }
 
 input.sheet-tab1:checked ~ div.sheet-tab1,
@@ -30,15 +41,15 @@ input.sheet-tab {
 
 input.sheet-tab::before {
     content: attr(title);
-
+    
     border: solid 2px black;
     border-bottom-color: black;
     color: black;
     text-align: center;
     display: inline-block;
-
+    
     background: white;
-
+    
     width: 120px;
     height: 20px;
     font-size: 18px;
@@ -77,19 +88,19 @@ input[type="number"]:hover {
     border-left: none;
     border-right: none;
     margin: 0px;
-
+    
     background-color: transparent;
-
+    
     -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
     -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
     box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-
+    
     -webkit-transition: border linear .2s,box-shadow linear .2s;
     -moz-transition: border linear .2s,box-shadow linear .2s;
     -ms-transition: border linear .2s,box-shadow linear .2s;
     -o-transition: border linear .2s,box-shadow linear .2s;
     transition: border linear .2s,box-shadow linear .2s;
-
+    
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -99,19 +110,19 @@ input[type="number"].sheet-input_II {
     border: 1px dotted gray;
     margin: 0px;
     width:60px;
-
+    
     background-color: transparent;
-
+    
     -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
     -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
     box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-
+    
     -webkit-transition: border linear .2s,box-shadow linear .2s;
     -moz-transition: border linear .2s,box-shadow linear .2s;
     -ms-transition: border linear .2s,box-shadow linear .2s;
     -o-transition: border linear .2s,box-shadow linear .2s;
     transition: border linear .2s,box-shadow linear .2s;
-
+    
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -133,16 +144,16 @@ input[type="number"].sheet-input_II {
 }
 
     /*==== tables ====*/
+    
 
-
-table.sheet-characteristics,
+table.sheet-characteristics, 
 table.sheet-skilltable {
     margin-right:auto;
     margin-left:auto;
 }
 
-table.sheet-characteristics input[type="number"],
-table.sheet-armour input[type="number"],
+table.sheet-characteristics input[type="number"], 
+table.sheet-armour input[type="number"], 
 table.sheet-skilltable input[type="number"] {
     text-align:center;
 }
@@ -153,7 +164,7 @@ table.sheet-characteristics tr:nth-child(odd) {
 
 table.sheet-characteristics tr:nth-child(even) {
     background-color:silver;
-}
+}    
 
 table.sheet-weapontable {
     text-align:center;
@@ -161,16 +172,16 @@ table.sheet-weapontable {
     margin-left:auto;
 }
 
-table.sheet-weapontable tr:nth-child(even) {
+table.sheet-weapontable tr:nth-child(odd) {
     border-bottom: none;
 }
-table.sheet-weapontable tr:nth-child(odd) {
+table.sheet-weapontable tr:nth-child(even) {
     border-bottom: 5px ridge red;
 }
 
 table.sheet-weapontable tr:nth-child(1) {
     border: none;
-}
+}    
 
 
     /*==== headings ====*/
@@ -193,30 +204,30 @@ h2 {
 textarea {
     height: 2em;
     width: 97%;
-
+    
     display: inline-block;
     border-bottom: 1px dotted gray;
     border-top: none;
     border-left: none;
     border-right: none;
     margin:0px;
-
+    
     background-color: transparent;
-
+    
     -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
     -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
     box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-
+    
     -webkit-transition: border linear .2s,box-shadow linear .2s;
     -moz-transition: border linear .2s,box-shadow linear .2s;
     -ms-transition: border linear .2s,box-shadow linear .2s;
     -o-transition: border linear .2s,box-shadow linear .2s;
     transition: border linear .2s,box-shadow linear .2s;
-
+    
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
-
+    
     resize:vertical;
 }
 
@@ -346,4 +357,4 @@ input.sheet-arrow[type="checkbox"]:checked + span::before
     content: "▼";
 }
 
- /*-------sheet select---------*/
\ No newline at end of file
+ /*-------sheet select---------*/
diff --git a/Mongoose_Traveller2e/MongooseTraveller2e.html b/Mongoose_Traveller/MongooseTraveller.html
similarity index 83%
rename from Mongoose_Traveller2e/MongooseTraveller2e.html
rename to Mongoose_Traveller/MongooseTraveller.html
index 1617ae5532..d22908af36 100644
--- a/Mongoose_Traveller2e/MongooseTraveller2e.html
+++ b/Mongoose_Traveller/MongooseTraveller.html
@@ -1,4 +1,4 @@
-<input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Prime" checked="checked" />
+<input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Prime" checked="checked" /><span></span>
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" title="Skills" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab3" value="3" title="Inventory" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab4" value="4" title="Powers" />
@@ -8,15 +8,13 @@
 <div class="sheet-tab-content sheet-tab1">
     <div class="sheet-wrapper">
         <h1>Prime</h1>
-        <table class="sheet-bio" style="width:600px">
+        <table class="sheet-bio" >
             <tr>
-                <td style="width:10%"></td>
-                <td><div class="sheet-header" style="width:16%">Name</div><input type="text" class="sheet-input" style="width:74%" /></td>
-                <td><div class="sheet-header" style="width:16%">Rads</div><input type="number" class="sheet-input" name="attr_rads" style="width:72%"  /></td>
+                <td colspan="3"><div class="sheet-header" style="width:7%">Name</div><input type="text" class="sheet-input" style="width:88%" name="attr_character_name" /></td>
             </tr>
             <tr>
-                <td style="width:10%"></td>
-                <td><div class="sheet-header" style="width:10%">Age</div><input type="number" class="sheet-input" name="attr_character_age" style="width:80%"  /></td>
+                <td></td>
+                <td><div class="sheet-header" style="width:10%">Age</div><input type="text" class="sheet-input" name="attr_character_age" style="width:80%"  /></td>
                 <td><div class="sheet-header"style="width:13%">Race</div><input type="text" class="sheet-input" name="attr_character_race" style="width:75%"  /></td>
             </tr>
             <tr>
@@ -32,107 +30,88 @@
         </table>
         <div class='sheet-2colrow'>
             <div class='sheet-col'>
-                <br>
                 <div class="sheet-oval"><h2>Characteristics</h2></div>
                 <table class="sheet-characteristics">
                     <tr>
-                        <td colspan="2"><button name="roll_Strength" type="roll" value="&{template:default} {{name=Roll Strength}} {{result=[[(2d6 + @{mod-Strength}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Strength</div></button></td>
+                        <td colspan="2"><button name="roll_Strength" type="roll" value="/me rolls Strength [[(2d6 + @{mod-Strength}+?{Modifier|0})]]" ><div class="sheet-button_header">Strength</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Strength" /></td>
-                        <td colspan="2"><button name="roll_Intellect" type="roll" value="&{template:default} {{name=Roll Intellect}} {{result=[[(2d6 + @{mod-Intellect}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Intellect</div></button></td>
+                        <td colspan="2"><button name="roll_Intellect" type="roll" value="/me rolls Intellect [[(2d6 + @{mod-Intellect}+?{Modifier|0})]]" ><div class="sheet-button_header">Intellect</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Intellect" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Strength" disabled="true" value="[[round(-0.00350140056 * @{base-Strength}*@{base-Strength} + 0.4054621849 * @{base-Strength} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Strength" /></td>
                         <td></td>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Intellect" disabled="true" value="[[round(-0.00350140056 * @{base-Intellect}*@{base-Intellect} + 0.4054621849 * @{base-Intellect} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Intellect" /></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><button name="roll_Dexterity" type="roll" value="&{template:default} {{name=Roll Dexterity}} {{result=[[(2d6 + @{mod-Dexterity}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Dexterity</div></button></td>
+                        <td colspan="2"><button name="roll_Dexterity" type="roll" value="/me rolls Dexterity [[(2d6 + @{mod-Dexterity}+?{Modifier|0})]]" ><div class="sheet-button_header">Dexterity</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Dexterity" /></td>
-                        <td colspan="2"><button name="roll_Education" type="roll" value="&{template:default} {{name=Roll Education}} {{result=[[(2d6 + @{mod-Education}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Education</div></button></td>
+                        <td colspan="2"><button name="roll_Education" type="roll" value="/me rolls Education [[(2d6 + @{mod-Education}+?{Modifier|0})]]" ><div class="sheet-button_header">Education</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Education" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Dexterity" disabled="true" value="[[round(-0.00350140056 * @{base-Dexterity}*@{base-Dexterity} + 0.4054621849 * @{base-Dexterity} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Dexterity" /></td>
                         <td></td>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Education" disabled="true" value="[[round(-0.00350140056 * @{base-Education}*@{base-Education} + 0.4054621849 * @{base-Education} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Education" /></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><button name="roll_Endurance" type="roll" value="&{template:default} {{name=Roll Endurance}} {{result=[[(2d6 + @{mod-Endurance}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Endurance</div></button></td>
+                        <td colspan="2"><button name="roll_Endurance" type="roll" value="/me rolls Endurance [[(2d6 + @{mod-Endurance}+?{Modifier|0})]]" ><div class="sheet-button_header">Endurance</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Endurance" /></td>
-                        <td colspan="2"><button name="roll_Social" type="roll" value="&{template:default} {{name=Roll Social}} {{result=[[(2d6 + @{mod-Social}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Social</div></button></td>
+                        <td colspan="2"><button name="roll_Social" type="roll" value="/me rolls Social [[(2d6 + @{mod-Social}+?{Modifier|0})]]" ><div class="sheet-button_header">Social</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Social" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Endurance" disabled="true" value="[[round(-0.00350140056 * @{base-Endurance}*@{base-Endurance} + 0.4054621849 * @{base-Endurance} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Endurance" /></td>
                         <td></td>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Social" disabled="true" value="[[round(-0.00350140056 * @{base-Social}*@{base-Social} + 0.4054621849 * @{base-Social} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Social" /></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="2"><button name="roll_PsionicStrength" type="roll" value="&{template:default} {{name=Roll Psionic Strength}} {{result=[[(2d6 + @{mod-PsionicStrength}+?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}}" ><div class="sheet-button_header">Psionic Strength</div></button></td>
+                        <td colspan="2"><button name="roll_PsionicStrength" type="roll" value="/me rolls Psionic Strength [[(2d6 + @{mod-PsionicStrength}+?{Modifier|0})]]" ><div class="sheet-button_header">Psionic Strength</div></button></td>
                         <td><input type="number" class="sheet-input sheet-bold" name="attr_base-PsionicStrength" /></td>
                     </tr>
                     <tr>
                         <td><div class="sheet-mod">Mod</div></td>
-                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-PsionicStrength" disabled="true" value="[[round(-0.00350140056 * @{base-PsionicStrength}*@{base-PsionicStrength} + 0.4054621849 * @{base-PsionicStrength} - 2.644607843)]]"/></td>
+                        <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-PsionicStrength" /></td>
                     </tr>
                 </table>
             </div>
             <div class='sheet-col'>
-                <br>
                 <h3>Armour</h3>
-                <table class="sheet-armour" style="width:100%">
+                <table class="sheet-armour">
                     <tr>
                         <td><div class="sheet-header">Type</div></td>
                         <td><div class="sheet-header">Protection</div></td>
-                        <td><div class="sheet-header">KG</div></td>
-                        <td><div class="sheet-header">Rads</div></td>
                         <td><div class="sheet-header">Required Skill</div></td>
+                        <td><div class="sheet-header">Mass (kg)</div></td>
                     </tr>
                     <tr>
                         <td><input type="text" class="sheet-input" name="attr_armour-type" style="width:110px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_armour-protection" style="width:70px" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_armour-rads" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_armour-mass" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_armour-protection" /></td>
                         <td><select type="text" class="sheet-input" name="attr_armour-RequiredSkill" value="0" style="width:110px" />
                             <option value="0">None</option>
                             <option value="1">Vacc Suit 0</option>
                             <option value="2">Vacc Suit 1</option>
                             <option value="3">Vacc Suit 2</option>
-                            <option value="3">Vacc Suit 3</option>
-                            <option value="3">Vacc Suit 4</option>
+                            <option value="4">Battle Dress 1</option>
                             </select></td>
+                        <td><input type="number" class="sheet-input" name="attr_armour-mass" /></td>
                     </tr>
                     <tr>
-                        <td colspan="5" name="attr_armornotes" style="width:100%"><textarea></textarea></td>
-                    </tr>
-                </table>
-                <br>
-                <h3>Study Period</h3>
-                <table class="sheet-training" style="width:100%">
-                    <tr>
-                        <td><div class="sheet-header">Weeks</div></td>
-                        <td><div class="sheet-header">Periods</div></td>
-                        <td><div class="sheet-header">Skill</div></td>
-                    </tr>
-                    <tr>
-                        <td><input type="number" class="sheet-input" name="attr_study-weeks" value="0"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_study-periods" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_study-skill" style="width:100%" /></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3" name="attr_studynotes" style="width:100%"><textarea></textarea></td>
+                        <td colspan="5" name="attr_armornotes"><textarea></textarea></td>
                     </tr>
                 </table>
+                <div class="sheet-banner">
+                    <div class="sheet-banner-content"></div>
+                </div>
             </div>
         </div>
     </div>
@@ -153,7 +132,7 @@
             <th>Total</th>
         </tr>
         <tr>
-            <td><button name="roll_skill-Admin" type="roll" value="/me rolls Admin (@{skillSpeciality-Admin}) [[(2d6 + @{skilltotal-Admin} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Admin</div></button></td>
+            <td><button name="roll_skill-Admin" type="roll" value="/me rolls Admin (@{skillSpeciality-Admin}) [[(2d6 + @{skilltotal-Admin} + ?{Modifier|0})]]" ><div class="sheet-button_header">Admin</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Admin" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Admin" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -170,7 +149,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Admin" value="@{skillDM-Admin} + @{skilllevel-Admin} + @{skillmodifier-Admin} + @{untrained-Admin}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Advocate" type="roll" value="/me rolls Advocate (@{skillSpeciality-Advocate}) [[(2d6 + @{skilltotal-Advocate} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Advocate</div></button></td>
+            <td><button name="roll_skill-Advocate" type="roll" value="/me rolls Advocate (@{skillSpeciality-Advocate}) [[(2d6 + @{skilltotal-Advocate} + ?{Modifier|0})]]" ><div class="sheet-button_header">Advocate</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Advocate" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Advocate" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -187,7 +166,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Advocate" value="@{skillDM-Advocate} + @{skilllevel-Advocate} + @{skillmodifier-Advocate} + @{untrained-Advocate}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Animals" type="roll" value="/me rolls Animals (@{skillSpeciality-Animals}) [[(2d6 + @{skilltotal-Animals} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Animals</div></button></td>
+            <td><button name="roll_skill-Animals" type="roll" value="/me rolls Animals (@{skillSpeciality-Animals}) [[(2d6 + @{skilltotal-Animals} + ?{Modifier|0})]]" ><div class="sheet-button_header">Animals</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Animals" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Animals" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -204,7 +183,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Animals" value="@{skillDM-Animals} + @{skilllevel-Animals} + @{skillmodifier-Animals} + @{untrained-Animals}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Animals2" type="roll" value="/me rolls Animals (@{skillSpeciality-Animals2}) [[(2d6 + @{skilltotal-Animals2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Animals</div></button></td>
+            <td><button name="roll_skill-Animals2" type="roll" value="/me rolls Animals (@{skillSpeciality-Animals2}) [[(2d6 + @{skilltotal-Animals2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Animals</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Animals2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Animals2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -221,24 +200,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Animals2" value="@{skillDM-Animals2} + @{skilllevel-Animals2} + @{skillmodifier-Animals2} + @{untrained-Animals2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Animals3" type="roll" value="/me rolls Animals (@{skillSpeciality-Animals3}) [[(2d6 + @{skilltotal-Animals3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Animals</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Animals3" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Animals3" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Animals3" value="@{skillCharacteristicDM-Animals2}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Animals3" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Animals3" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Animals3" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Animals3" value="@{skillDM-Animals3} + @{skilllevel-Animals3} + @{skillmodifier-Animals3} + @{untrained-Animals3}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Athletics1" type="roll" value="/me rolls Athletics (@{skillSpeciality-Athletics1}) [[(2d6 + @{skilltotal-Athletics1} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Athletics</div></button></td>
+            <td><button name="roll_skill-Athletics1" type="roll" value="/me rolls Athletics (@{skillSpeciality-Athletics1}) [[(2d6 + @{skilltotal-Athletics1} + ?{Modifier|0})]]" ><div class="sheet-button_header">Athletics</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Athletics1" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Athletics1" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -255,7 +217,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Athletics1" value="@{skillDM-Athletics1} + @{skilllevel-Athletics1} + @{skillmodifier-Athletics1} + @{untrained-Athletics1}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Athletics2" type="roll" value="/me rolls Athletics (@{skillSpeciality-Athletics2}) [[(2d6 + @{skilltotal-Athletics2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Athletics</div></button></td>
+            <td><button name="roll_skill-Athletics2" type="roll" value="/me rolls Athletics (@{skillSpeciality-Athletics2}) [[(2d6 + @{skilltotal-Athletics2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Athletics</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Athletics2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Athletics2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -272,7 +234,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Athletics2" value="@{skillDM-Athletics2} + @{skilllevel-Athletics2} + @{skillmodifier-Athletics2} + @{untrained-Athletics2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Athletics3" type="roll" value="/me rolls Athletics (@{skillSpeciality-Athletics3}) [[(2d6 + @{skilltotal-Athletics3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Athletics</div></button></td>
+            <td><button name="roll_skill-Athletics3" type="roll" value="/me rolls Athletics (@{skillSpeciality-Athletics3}) [[(2d6 + @{skilltotal-Athletics3} + ?{Modifier|0})]]" ><div class="sheet-button_header">Athletics</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Athletics3" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Athletics3" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -289,7 +251,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Athletics3" value="@{skillDM-Athletics3} + @{skilllevel-Athletics3} + @{skillmodifier-Athletics3} + @{untrained-Athletics3}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Art" type="roll" value="/me rolls Art (@{skillSpeciality-Art}) [[(2d6 + @{skilltotal-Art} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Art</div></button></td>
+            <td><button name="roll_skill-Art" type="roll" value="/me rolls Art (@{skillSpeciality-Art}) [[(2d6 + @{skilltotal-Art} + ?{Modifier|0})]]" ><div class="sheet-button_header">Art</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Art" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Art" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -306,7 +268,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Art" value="@{skillDM-Art} + @{skilllevel-Art} + @{skillmodifier-Art} + @{untrained-Art}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Art2" type="roll" value="/me rolls Art (@{skillSpeciality-Art2}) [[(2d6 + @{skilltotal-Art2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Art</div></button></td>
+            <td><button name="roll_skill-Art2" type="roll" value="/me rolls Art (@{skillSpeciality-Art2}) [[(2d6 + @{skilltotal-Art2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Art</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Art2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Art2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -323,24 +285,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Art2" value="@{skillDM-Art2} + @{skilllevel-Art2} + @{skillmodifier-Art2} + @{untrained-Art2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Art3" type="roll" value="/me rolls Art (@{skillSpeciality-Art3}) [[(2d6 + @{skilltotal-Art3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Art</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Art3" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Art3" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Art3" value="@{skillCharacteristicDM-Art3}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Art3" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Art3" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Art3" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Art3" value="@{skillDM-Art3} + @{skilllevel-Art3} + @{skillmodifier-Art3} + @{untrained-Art3}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Astrogation" type="roll" value="/me rolls Astrogation (@{skillSpeciality-Astrogation}) [[(2d6 + @{skilltotal-Astrogation} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Astrogation</div></button></td>
+            <td><button name="roll_skill-Astrogation" type="roll" value="/me rolls Astrogation (@{skillSpeciality-Astrogation}) [[(2d6 + @{skilltotal-Astrogation} + ?{Modifier|0})]]" ><div class="sheet-button_header">Astrogation</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Astrogation" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Astrogation" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -357,7 +302,24 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Astrogation" value="@{skillDM-Astrogation} + @{skilllevel-Astrogation} + @{skillmodifier-Astrogation} + @{untrained-Astrogation}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Broker" type="roll" value="/me rolls Broker (@{skillSpeciality-Broker}) [[(2d6 + @{skilltotal-Broker} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Broker</div></button></td>
+            <td><button name="roll_skill-BattleDress" type="roll" value="/me rolls Battle Dress (@{skillSpeciality-BattleDress}) [[(2d6 + @{skilltotal-BattleDress} + ?{Modifier|0})]]" ><div class="sheet-button_header">Battle Dress</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-BattleDress" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-BattleDress" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-BattleDress" value="@{skillCharacteristicDM-BattleDress}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-BattleDress" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-BattleDress" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-BattleDress" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-BattleDress" value="@{skillDM-BattleDress} + @{skilllevel-BattleDress} + @{skillmodifier-BattleDress} + @{untrained-BattleDress}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Broker" type="roll" value="/me rolls Broker (@{skillSpeciality-Broker}) [[(2d6 + @{skilltotal-Broker} + ?{Modifier|0})]]" ><div class="sheet-button_header">Broker</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Broker" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Broker" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -374,7 +336,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Broker" value="@{skillDM-Broker} + @{skilllevel-Broker} + @{skillmodifier-Broker} + @{untrained-Broker}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Carouse" type="roll" value="/me rolls Carouse (@{skillSpeciality-Carouse}) [[(2d6 + @{skilltotal-Carouse} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Carouse</div></button></td>
+            <td><button name="roll_skill-Carouse" type="roll" value="/me rolls Carouse (@{skillSpeciality-Carouse}) [[(2d6 + @{skilltotal-Carouse} + ?{Modifier|0})]]" ><div class="sheet-button_header">Carouse</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Carouse" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Carouse" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -391,7 +353,41 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Carouse" value="@{skillDM-Carouse} + @{skilllevel-Carouse} + @{skillmodifier-Carouse} + @{untrained-Carouse}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Deception" type="roll" value="/me rolls Deception (@{skillSpeciality-Deception}) [[(2d6 + @{skilltotal-Deception} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Deception</div></button></td>
+            <td><button name="roll_skill-Comms" type="roll" value="/me rolls Comms (@{skillSpeciality-Comms}) [[(2d6 + @{skilltotal-Comms} + ?{Modifier|0})]]" ><div class="sheet-button_header">Comms</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Comms" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Comms" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-Comms" value="@{skillCharacteristicDM-Comms}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-Comms" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Comms" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Comms" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-Comms" value="@{skillDM-Comms} + @{skilllevel-Comms} + @{skillmodifier-Comms} + @{untrained-Comms}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Computers" type="roll" value="/me rolls Computers (@{skillSpeciality-Computers}) [[(2d6 + @{skilltotal-Computers} + ?{Modifier|0})]]" ><div class="sheet-button_header">Computers</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Computers" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Computers" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-Computers" value="@{skillCharacteristicDM-Computers}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-Computers" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Computers" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Computers" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-Computers" value="@{skillDM-Computers} + @{skilllevel-Computers} + @{skillmodifier-Computers} + @{untrained-Computers}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Deception" type="roll" value="/me rolls Deception (@{skillSpeciality-Deception}) [[(2d6 + @{skilltotal-Deception} + ?{Modifier|0})]]" ><div class="sheet-button_header">Deception</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Deception" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Deception" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -408,7 +404,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Deception" value="@{skillDM-Deception} + @{skilllevel-Deception} + @{skillmodifier-Deception} + @{untrained-Deception}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Diplomat" type="roll" value="/me rolls Diplomat (@{skillSpeciality-Diplomat}) [[(2d6 + @{skilltotal-Diplomat} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Diplomat</div></button></td>
+            <td><button name="roll_skill-Diplomat" type="roll" value="/me rolls Diplomat (@{skillSpeciality-Diplomat}) [[(2d6 + @{skilltotal-Diplomat} + ?{Modifier|0})]]" ><div class="sheet-button_header">Diplomat</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Diplomat" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Diplomat" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -435,7 +431,7 @@
             <th>Total</th>
         </tr>
         <tr>
-            <td><button name="roll_skill-Drive" type="roll" value="/me rolls Drive (@{skillSpeciality-Drive}) [[(2d6 + @{skilltotal-Drive} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Drive</div></button></td>
+            <td><button name="roll_skill-Drive" type="roll" value="/me rolls Drive (@{skillSpeciality-Drive}) [[(2d6 + @{skilltotal-Drive} + ?{Modifier|0})]]" ><div class="sheet-button_header">Drive</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Drive" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Drive" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -452,7 +448,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Drive" value="@{skillDM-Drive} + @{skilllevel-Drive} + @{skillmodifier-Drive} + @{untrained-Drive}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Drive2" type="roll" value="/me rolls Drive (@{skillSpeciality-Drive2}) [[(2d6 + @{skilltotal-Drive2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Drive</div></button></td>
+            <td><button name="roll_skill-Drive2" type="roll" value="/me rolls Drive (@{skillSpeciality-Drive2}) [[(2d6 + @{skilltotal-Drive2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Drive</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Drive2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Drive2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -469,75 +465,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Drive2" value="@{skillDM-Drive2} + @{skilllevel-Drive2} + @{skillmodifier-Drive2} + @{untrained-Drive2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Drive3" type="roll" value="/me rolls Drive (@{skillSpeciality-Drive3}) [[(2d6 + @{skilltotal-Drive3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Drive</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Drive3" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Drive3" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Drive3" value="@{skillCharacteristicDM-Drive3}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Drive3" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Drive3" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Drive3" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Drive3" value="@{skillDM-Drive3} + @{skilllevel-Drive3} + @{skillmodifier-Drive3} + @{untrained-Drive3}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Electronics" type="roll" value="/me rolls Electronics (@{skillSpeciality-Electronics}) [[(2d6 + @{skilltotal-Electronics} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Electronics</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Electronics" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Electronics" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Electronics" value="@{skillCharacteristicDM-Electronics}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Electronics" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Electronics" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Electronics" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Electronics" value="@{skillDM-Electronics} + @{skilllevel-Electronics} + @{skillmodifier-Electronics} + @{untrained-Electronics}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Electronics2" type="roll" value="/me rolls Electronics (@{skillSpeciality-Electronics2}) [[(2d6 + @{skilltotal-Electronics2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Electronics</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Electronics2" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Electronics2" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Electronics2" value="@{skillCharacteristicDM-Electronics2}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Electronics2" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Electronics2" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Electronics2" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Electronics2" value="@{skillDM-Electronics2} + @{skilllevel-Electronics2} + @{skillmodifier-Electronics2} + @{untrained-Electronics2}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Electronics3" type="roll" value="/me rolls Electronics (@{skillSpeciality-Electronics3}) [[(2d6 + @{skilltotal-Electronics3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Electronics</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Electronics3" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Electronics3" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Electronics3" value="@{skillCharacteristicDM-Electronics3}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Electronics3" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Electronics3" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Electronics3" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Electronics3" value="@{skillDM-Electronics3} + @{skilllevel-Electronics3} + @{skillmodifier-Electronics3} + @{untrained-Electronics3}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Engineer" type="roll" value="/me rolls Engineer (@{skillSpeciality-Engineer}) [[(2d6 + @{skilltotal-Engineer} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Engineer</div></button></td>
+            <td><button name="roll_skill-Engineer" type="roll" value="/me rolls Engineer (@{skillSpeciality-Engineer}) [[(2d6 + @{skilltotal-Engineer} + ?{Modifier|0})]]" ><div class="sheet-button_header">Engineer</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Engineer" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Engineer" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -554,7 +482,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Engineer" value="@{skillDM-Engineer} + @{skilllevel-Engineer} + @{skillmodifier-Engineer} + @{untrained-Engineer}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Engineer2" type="roll" value="/me rolls Engineer (@{skillSpeciality-Engineer2}) [[(2d6 + @{skilltotal-Engineer2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Engineer</div></button></td>
+            <td><button name="roll_skill-Engineer2" type="roll" value="/me rolls Engineer (@{skillSpeciality-Engineer2}) [[(2d6 + @{skilltotal-Engineer2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Engineer</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Engineer2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Engineer2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -571,7 +499,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Engineer2" value="@{skillDM-Engineer2} + @{skilllevel-Engineer2} + @{skillmodifier-Engineer2} + @{untrained-Engineer2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Explosives" type="roll" value="/me rolls Explosives (@{skillSpeciality-Explosives}) [[(2d6 + @{skilltotal-Explosives} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Explosives</div></button></td>
+            <td><button name="roll_skill-Explosives" type="roll" value="/me rolls Explosives (@{skillSpeciality-Explosives}) [[(2d6 + @{skilltotal-Explosives} + ?{Modifier|0})]]" ><div class="sheet-button_header">Explosives</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Explosives" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Explosives" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -588,7 +516,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Explosives" value="@{skillDM-Explosives} + @{skilllevel-Explosives} + @{skillmodifier-Explosives} + @{untrained-Explosives}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Flyer" type="roll" value="/me rolls Flyer (@{skillSpeciality-Flyer}) [[(2d6 + @{skilltotal-Flyer} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Flyer</div></button></td>
+            <td><button name="roll_skill-Flyer" type="roll" value="/me rolls Flyer (@{skillSpeciality-Flyer}) [[(2d6 + @{skilltotal-Flyer} + ?{Modifier|0})]]" ><div class="sheet-button_header">Flyer</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Flyer" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Flyer" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -605,7 +533,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Flyer" value="@{skillDM-Flyer} + @{skilllevel-Flyer} + @{skillmodifier-Flyer} + @{untrained-Flyer}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Flyer2" type="roll" value="/me rolls Flyer (@{skillSpeciality-Flyer2}) [[(2d6 + @{skilltotal-Flyer2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Flyer</div></button></td>
+            <td><button name="roll_skill-Flyer2" type="roll" value="/me rolls Flyer (@{skillSpeciality-Flyer2}) [[(2d6 + @{skilltotal-Flyer2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Flyer</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Flyer2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Flyer2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -622,7 +550,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Flyer2" value="@{skillDM-Flyer2} + @{skilllevel-Flyer2} + @{skillmodifier-Flyer2} + @{untrained-Flyer2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Gambler" type="roll" value="/me rolls Gambler (@{skillSpeciality-Gambler}) [[(2d6 + @{skilltotal-Gambler} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Gambler</div></button></td>
+            <td><button name="roll_skill-Gambler" type="roll" value="/me rolls Gambler (@{skillSpeciality-Gambler}) [[(2d6 + @{skilltotal-Gambler} + ?{Modifier|0})]]" ><div class="sheet-button_header">Gambler</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Gambler" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gambler" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -639,7 +567,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Gambler" value="@{skillDM-Gambler} + @{skilllevel-Gambler} + @{skillmodifier-Gambler} + @{untrained-Gambler}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Gunner" type="roll" value="/me rolls Gunner (@{skillSpeciality-Gunner}) [[(2d6 + @{skilltotal-Gunner} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Gunner</div></button></td>
+            <td><button name="roll_skill-Gunner" type="roll" value="/me rolls Gunner (@{skillSpeciality-Gunner}) [[(2d6 + @{skilltotal-Gunner} + ?{Modifier|0})]]" ><div class="sheet-button_header">Gunner</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Gunner" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gunner" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -656,7 +584,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Gunner" value="@{skillDM-Gunner} + @{skilllevel-Gunner} + @{skillmodifier-Gunner} + @{untrained-Gunner}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Gunner2" type="roll" value="/me rolls Gunner (@{skillSpeciality-Gunner2}) [[(2d6 + @{skilltotal-Gunner2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Gunner</div></button></td>
+            <td><button name="roll_skill-Gunner2" type="roll" value="/me rolls Gunner (@{skillSpeciality-Gunner2}) [[(2d6 + @{skilltotal-Gunner2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Gunner</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Gunner2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gunner2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -673,7 +601,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Gunner2" value="@{skillDM-Gunner2} + @{skilllevel-Gunner2} + @{skillmodifier-Gunner2} + @{untrained-Gunner2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-GunCombat" type="roll" value="/me rolls Gun Combat (@{skillSpeciality-GunCombat}) [[(2d6 + @{skilltotal-GunCombat} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Gun Combat</div></button></td>
+            <td><button name="roll_skill-GunCombat" type="roll" value="/me rolls Gun Combat (@{skillSpeciality-GunCombat}) [[(2d6 + @{skilltotal-GunCombat} + ?{Modifier|0})]]" ><div class="sheet-button_header">Gun Combat</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-GunCombat" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-GunCombat" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -690,7 +618,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-GunCombat" value="@{skillDM-GunCombat} + @{skilllevel-GunCombat} + @{skillmodifier-GunCombat} + @{untrained-GunCombat}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-GunCombat2" type="roll" value="/me rolls Gun Combat (@{skillSpeciality-GunCombat2}) [[(2d6 + @{skilltotal-GunCombat2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Gun Combat</div></button></td>
+            <td><button name="roll_skill-GunCombat2" type="roll" value="/me rolls Gun Combat (@{skillSpeciality-GunCombat2}) [[(2d6 + @{skilltotal-GunCombat2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Gun Combat</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-GunCombat2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-GunCombat2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -707,7 +635,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-GunCombat2" value="@{skillDM-GunCombat2} + @{skilllevel-GunCombat2} + @{skillmodifier-GunCombat2} + @{untrained-GunCombat2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-GunCombat3" type="roll" value="/me rolls Gun Combat (@{skillSpeciality-GunCombat3}) [[(2d6 + @{skilltotal-GunCombat3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Gun Combat</div></button></td>
+            <td><button name="roll_skill-GunCombat3" type="roll" value="/me rolls Gun Combat (@{skillSpeciality-GunCombat3}) [[(2d6 + @{skilltotal-GunCombat3} + ?{Modifier|0})]]" ><div class="sheet-button_header">Gun Combat</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-GunCombat3" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-GunCombat3" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -724,7 +652,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-GunCombat3" value="@{skillDM-GunCombat3} + @{skilllevel-GunCombat3} + @{skillmodifier-GunCombat3} + @{untrained-GunCombat3}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-HeavyWeapons" type="roll" value="/me rolls Heavy Weapons (@{skillSpeciality-HeavyWeapons}) [[(2d6 + @{skilltotal-HeavyWeapons} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Heavy Weapons</div></button></td>
+            <td><button name="roll_skill-HeavyWeapons" type="roll" value="/me rolls Heavy Weapons (@{skillSpeciality-HeavyWeapons}) [[(2d6 + @{skilltotal-HeavyWeapons} + ?{Modifier|0})]]" ><div class="sheet-button_header">Heavy Weapons</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-HeavyWeapons" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-HeavyWeapons" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -741,7 +669,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-HeavyWeapons" value="@{skillDM-HeavyWeapons} + @{skilllevel-HeavyWeapons} + @{skillmodifier-HeavyWeapons} + @{untrained-HeavyWeapons}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-HeavyWeapons2" type="roll" value="/me rolls Heavy Weapons (@{skillSpeciality-HeavyWeapons2}) [[(2d6 + @{skilltotal-HeavyWeapons2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Heavy Weapons</div></button></td>
+            <td><button name="roll_skill-HeavyWeapons2" type="roll" value="/me rolls Heavy Weapons (@{skillSpeciality-HeavyWeapons2}) [[(2d6 + @{skilltotal-HeavyWeapons2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Heavy Weapons</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-HeavyWeapons2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-HeavyWeapons2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -758,7 +686,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-HeavyWeapons2" value="@{skillDM-HeavyWeapons2} + @{skilllevel-HeavyWeapons2} + @{skillmodifier-HeavyWeapons2} + @{untrained-HeavyWeapons2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Investigate" type="roll" value="/me rolls Investigate (@{skillSpeciality-Investigate}) [[(2d6 + @{skilltotal-Investigate} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Investigate</div></button></td>
+            <td><button name="roll_skill-Investigate" type="roll" value="/me rolls Investigate (@{skillSpeciality-Investigate}) [[(2d6 + @{skilltotal-Investigate} + ?{Modifier|0})]]" ><div class="sheet-button_header">Investigate</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Investigate" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Investigate" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -775,7 +703,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Investigate" value="@{skillDM-Investigate} + @{skilllevel-Investigate} + @{skillmodifier-Investigate} + @{untrained-Investigate}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-JackOfAllTrades" type="roll" value="/me rolls Jack Of All Trades (@{skillSpeciality-JackOfAllTrades}) [[(2d6 + @{skilltotal-JackOfAllTrades} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Jack Of All Trades</div></button></td>
+            <td><button name="roll_skill-JackOfAllTrades" type="roll" value="/me rolls Jack Of All Trades (@{skillSpeciality-JackOfAllTrades}) [[(2d6 + @{skilltotal-JackOfAllTrades} + ?{Modifier|0})]]" ><div class="sheet-button_header">Jack Of All Trades</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-JackOfAllTrades" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-JackOfAllTrades" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -802,7 +730,7 @@
             <th>Total</th>
         </tr>
         <tr>
-            <td><button name="roll_skill-Language" type="roll" value="/me rolls Language (@{skillSpeciality-Language}) [[(2d6 + @{skilltotal-Language} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Language</div></button></td>
+            <td><button name="roll_skill-Language" type="roll" value="/me rolls Language (@{skillSpeciality-Language}) [[(2d6 + @{skilltotal-Language} + ?{Modifier|0})]]" ><div class="sheet-button_header">Language</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Language" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Language" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -819,7 +747,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Language" value="@{skillDM-Language} + @{skilllevel-Language} + @{skillmodifier-Language} + @{untrained-Language}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Language2" type="roll" value="/me rolls Language (@{skillSpeciality-Language2}) [[(2d6 + @{skilltotal-Language2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Language</div></button></td>
+            <td><button name="roll_skill-Language2" type="roll" value="/me rolls Language (@{skillSpeciality-Language2}) [[(2d6 + @{skilltotal-Language2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Language</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Language2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Language2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -836,7 +764,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Language2" value="@{skillDM-Language2} + @{skilllevel-Language2} + @{skillmodifier-Language2} + @{untrained-Language2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Leadership" type="roll" value="/me rolls Leadership (@{skillSpeciality-Leadership}) [[(2d6 + @{skilltotal-Leadership} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Leadership</div></button></td>
+            <td><button name="roll_skill-Leadership" type="roll" value="/me rolls Leadership (@{skillSpeciality-Leadership}) [[(2d6 + @{skilltotal-Leadership} + ?{Modifier|0})]]" ><div class="sheet-button_header">Leadership</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Leadership" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Leadership" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -853,7 +781,41 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Leadership" value="@{skillDM-Leadership} + @{skilllevel-Leadership} + @{skillmodifier-Leadership} + @{untrained-Leadership}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Mechanic" type="roll" value="/me rolls Mechanic (@{skillSpeciality-Mechanic}) [[(2d6 + @{skilltotal-Mechanic} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Mechanic</div></button></td>
+            <td><button name="roll_skill-LifeSciences" type="roll" value="/me rolls Life Sciences (@{skillSpeciality-LifeSciences}) [[(2d6 + @{skilltotal-LifeSciences} + ?{Modifier|0})]]" ><div class="sheet-button_header">Life Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-LifeSciences" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-LifeSciences" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-LifeSciences" value="@{skillCharacteristicDM-LifeSciences}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-LifeSciences" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-LifeSciences" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-LifeSciences" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-LifeSciences" value="@{skillDM-LifeSciences} + @{skilllevel-LifeSciences} + @{skillmodifier-LifeSciences} + @{untrained-LifeSciences}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-LifeSciences2" type="roll" value="/me rolls Life Sciences (@{skillSpeciality-LifeSciences2}) [[(2d6 + @{skilltotal-LifeSciences2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Life Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-LifeSciences2" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-LifeSciences2" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-LifeSciences2" value="@{skillCharacteristicDM-LifeSciences2}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-LifeSciences2" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-LifeSciences2" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-LifeSciences2" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-LifeSciences2" value="@{skillDM-LifeSciences2} + @{skilllevel-LifeSciences2} + @{skillmodifier-LifeSciences2} + @{untrained-LifeSciences2}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Mechanic" type="roll" value="/me rolls Mechanic (@{skillSpeciality-Mechanic}) [[(2d6 + @{skilltotal-Mechanic} + ?{Modifier|0})]]" ><div class="sheet-button_header">Mechanic</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Mechanic" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Mechanic" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -870,7 +832,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Mechanic" value="@{skillDM-Mechanic} + @{skilllevel-Mechanic} + @{skillmodifier-Mechanic} + @{untrained-Mechanic}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Medic" type="roll" value="/me rolls Medic (@{skillSpeciality-Medic}) [[(2d6 + @{skilltotal-Medic} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Medic</div></button></td>
+            <td><button name="roll_skill-Medic" type="roll" value="/me rolls Medic (@{skillSpeciality-Medic}) [[(2d6 + @{skilltotal-Medic} + ?{Modifier|0})]]" ><div class="sheet-button_header">Medic</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Medic" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Medic" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -887,7 +849,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Medic" value="@{skillDM-Medic} + @{skilllevel-Medic} + @{skillmodifier-Medic} + @{untrained-Medic}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Melee" type="roll" value="/me rolls Melee (@{skillSpeciality-Melee}) [[(2d6 + @{skilltotal-Melee} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Melee</div></button></td>
+            <td><button name="roll_skill-Melee" type="roll" value="/me rolls Melee (@{skillSpeciality-Melee}) [[(2d6 + @{skilltotal-Melee} + ?{Modifier|0})]]" ><div class="sheet-button_header">Melee</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Melee" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Melee" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -904,7 +866,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Melee" value="@{skillDM-Melee} + @{skilllevel-Melee} + @{skillmodifier-Melee} + @{untrained-Melee}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Melee2" type="roll" value="/me rolls Melee (@{skillSpeciality-Melee2}) [[(2d6 + @{skilltotal-Melee2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Melee</div></button></td>
+            <td><button name="roll_skill-Melee2" type="roll" value="/me rolls Melee (@{skillSpeciality-Melee2}) [[(2d6 + @{skilltotal-Melee2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Melee</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Melee2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Melee2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -921,7 +883,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Melee2" value="@{skillDM-Melee2} + @{skilllevel-Melee2} + @{skillmodifier-Melee2} + @{untrained-Melee2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Navigation" type="roll" value="/me rolls Navigation (@{skillSpeciality-Navigation}) [[(2d6 + @{skilltotal-Navigation} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Navigation</div></button></td>
+            <td><button name="roll_skill-Navigation" type="roll" value="/me rolls Navigation (@{skillSpeciality-Navigation}) [[(2d6 + @{skilltotal-Navigation} + ?{Modifier|0})]]" ><div class="sheet-button_header">Navigation</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Navigation" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Navigation" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -938,7 +900,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Navigation" value="@{skillDM-Navigation} + @{skilllevel-Navigation} + @{skillmodifier-Navigation} + @{untrained-Navigation}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Persuade" type="roll" value="/me rolls Persuade (@{skillSpeciality-Persuade}) [[(2d6 + @{skilltotal-Persuade} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Persuade</div></button></td>
+            <td><button name="roll_skill-Persuade" type="roll" value="/me rolls Persuade (@{skillSpeciality-Persuade}) [[(2d6 + @{skilltotal-Persuade} + ?{Modifier|0})]]" ><div class="sheet-button_header">Persuade</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Persuade" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Persuade" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -955,7 +917,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Persuade" value="@{skillDM-Persuade} + @{skilllevel-Persuade} + @{skillmodifier-Persuade} + @{untrained-Persuade}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Pilot" type="roll" value="/me rolls Pilot (@{skillSpeciality-Pilot}) [[(2d6 + @{skilltotal-Pilot} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Pilot</div></button></td>
+            <td><button name="roll_skill-Pilot" type="roll" value="/me rolls Pilot (@{skillSpeciality-Pilot}) [[(2d6 + @{skilltotal-Pilot} + ?{Modifier|0})]]" ><div class="sheet-button_header">Pilot</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Pilot" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Pilot" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -972,7 +934,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Pilot" value="@{skillDM-Pilot} + @{skilllevel-Pilot} + @{skillmodifier-Pilot} + @{untrained-Pilot}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Pilot2" type="roll" value="/me rolls Pilot (@{skillSpeciality-Pilot2}) [[(2d6 + @{skilltotal-Pilot2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Pilot</div></button></td>
+            <td><button name="roll_skill-Pilot2" type="roll" value="/me rolls Pilot (@{skillSpeciality-Pilot2}) [[(2d6 + @{skilltotal-Pilot2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Pilot</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Pilot2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Pilot2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -989,9 +951,9 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Pilot2" value="@{skillDM-Pilot2} + @{skilllevel-Pilot2} + @{skillmodifier-Pilot2} + @{untrained-Pilot2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Profession" type="roll" value="/me rolls Profession (@{skillSpeciality-Profession}) [[(2d6 + @{skilltotal-Profession} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Profession</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Profession" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Profession" value="0" style="width:95px" />
+            <td><button name="roll_skill-PhysicalSciences" type="roll" value="/me rolls Physical Sciences (@{skillSpeciality-PhysicalSciences}) [[(2d6 + @{skilltotal-PhysicalSciences} + ?{Modifier|0})]]" ><div class="sheet-button_header">Physical Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-PhysicalSciences" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-PhysicalSciences" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
                 <option value="@{mod-Intellect}">Intellect</option>
                 <option value="@{mod-Dexterity}">Dexterity</option>
@@ -999,14 +961,31 @@
                 <option value="@{mod-Endurance}">Endurance</option>
                 <option value="@{mod-Social}">Social</option>
                 </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Profession" value="@{skillCharacteristicDM-Profession}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Profession" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Profession" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Profession" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Profession" value="@{skillDM-Profession} + @{skilllevel-Profession} + @{skillmodifier-Profession} + @{untrained-Profession}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-PhysicalSciences" value="@{skillCharacteristicDM-PhysicalSciences}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-PhysicalSciences" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-PhysicalSciences" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-PhysicalSciences" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-PhysicalSciences" value="@{skillDM-PhysicalSciences} + @{skilllevel-PhysicalSciences} + @{skillmodifier-PhysicalSciences} + @{untrained-PhysicalSciences}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Recon" type="roll" value="/me rolls Recon (@{skillSpeciality-Recon}) [[(2d6 + @{skilltotal-Recon} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Recon</div></button></td>
+            <td><button name="roll_skill-PhysicalSciences2" type="roll" value="/me rolls Physical Sciences (@{skillSpeciality-PhysicalSciences2}) [[(2d6 + @{skilltotal-PhysicalSciences2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Physical Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-PhysicalSciences2" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-PhysicalSciences2" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-PhysicalSciences2" value="@{skillCharacteristicDM-PhysicalSciences2}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-PhysicalSciences2" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-PhysicalSciences2" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-PhysicalSciences2" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-PhysicalSciences2" value="@{skillDM-PhysicalSciences2} + @{skilllevel-PhysicalSciences2} + @{skillmodifier-PhysicalSciences2} + @{untrained-PhysicalSciences2}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Recon" type="roll" value="/me rolls Recon (@{skillSpeciality-Recon}) [[(2d6 + @{skilltotal-Recon} + ?{Modifier|0})]]" ><div class="sheet-button_header">Recon</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Recon" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Recon" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1022,6 +1001,23 @@
             <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Recon" value="-3"/></td>
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Recon" value="@{skillDM-Recon} + @{skilllevel-Recon} + @{skillmodifier-Recon} + @{untrained-Recon}" disabled="true"/></td>
         </tr>
+        <tr>
+            <td><button name="roll_skill-RemoteOps" type="roll" value="/me rolls Remote Ops (@{skillSpeciality-RemoteOps}) [[(2d6 + @{skilltotal-RemoteOps} + ?{Modifier|0})]]" ><div class="sheet-button_header">Remote Ops</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-RemoteOps" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-RemoteOps" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-RemoteOps" value="@{skillCharacteristicDM-RemoteOps}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-RemoteOps" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-RemoteOps" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-RemoteOps" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-RemoteOps" value="@{skillDM-RemoteOps} + @{skilllevel-RemoteOps} + @{skillmodifier-RemoteOps} + @{untrained-RemoteOps}" disabled="true"/></td>
+        </tr>
         <tr>
             <th>Skill</th>
             <th>Speciality</th>
@@ -1033,58 +1029,7 @@
             <th>Total</th>
         </tr>
         <tr>
-            <td><button name="roll_skill-Science" type="roll" value="/me rolls Science (@{skillSpeciality-Science}) [[(2d6 + @{skilltotal-Science} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Science</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Science" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Science" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Science" value="@{skillCharacteristicDM-Science}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Science" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Science" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Science" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Science" value="@{skillDM-Science} + @{skilllevel-Science} + @{skillmodifier-Science} + @{untrained-Science}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Science2" type="roll" value="/me rolls Science (@{skillSpeciality-Science2}) [[(2d6 + @{skilltotal-Science2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Science</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Science2" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Science2" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Science2" value="@{skillCharacteristicDM-Science2}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Science2" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Science2" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Science2" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Science2" value="@{skillDM-Science2} + @{skilllevel-Science2} + @{skillmodifier-Science2} + @{untrained-Science2}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Science3" type="roll" value="/me rolls Science (@{skillSpeciality-Science3}) [[(2d6 + @{skilltotal-Science3} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Science</div></button></td>
-            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Science3" value="" /></td>
-            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Science3" value="0" style="width:95px" />
-                <option value="@{mod-Strength}">Strength</option>
-                <option value="@{mod-Intellect}">Intellect</option>
-                <option value="@{mod-Dexterity}">Dexterity</option>
-                <option value="@{mod-Education}">Education</option>
-                <option value="@{mod-Endurance}">Endurance</option>
-                <option value="@{mod-Social}">Social</option>
-                </select></td>
-            <td><input type="number" class="sheet-input" name="attr_skillDM-Science3" value="@{skillCharacteristicDM-Science3}" disabled="true"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilllevel-Science3" value="0" /></td>
-            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Science3" value="0" /></td>
-            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Science3" value="-3"/></td>
-            <td><input type="number" class="sheet-input" name="attr_skilltotal-Science3" value="@{skillDM-Science3} + @{skilllevel-Science3} + @{skillmodifier-Science3} + @{untrained-Science3}" disabled="true"/></td>
-        </tr>
-        <tr>
-            <td><button name="roll_skill-Seafarer" type="roll" value="/me rolls Seafarer (@{skillSpeciality-Seafarer}) [[(2d6 + @{skilltotal-Seafarer} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Seafarer</div></button></td>
+            <td><button name="roll_skill-Seafarer" type="roll" value="/me rolls Seafarer (@{skillSpeciality-Seafarer}) [[(2d6 + @{skilltotal-Seafarer} + ?{Modifier|0})]]" ><div class="sheet-button_header">Seafarer</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Seafarer" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Seafarer" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1101,7 +1046,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Seafarer" value="@{skillDM-Seafarer} + @{skilllevel-Seafarer} + @{skillmodifier-Seafarer} + @{untrained-Seafarer}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Seafarer1" type="roll" value="/me rolls Seafarer (@{skillSpeciality-Seafarer1}) [[(2d6 + @{skilltotal-Seafarer1} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Seafarer</div></button></td>
+            <td><button name="roll_skill-Seafarer1" type="roll" value="/me rolls Seafarer (@{skillSpeciality-Seafarer1}) [[(2d6 + @{skilltotal-Seafarer1} + ?{Modifier|0})]]" ><div class="sheet-button_header">Seafarer</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Seafarer1" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Seafarer1" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1118,7 +1063,92 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Seafarer1" value="@{skillDM-Seafarer1} + @{skilllevel-Seafarer1} + @{skillmodifier-Seafarer1} + @{untrained-Seafarer1}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Stealth" type="roll" value="/me rolls Stealth (@{skillSpeciality-Stealth}) [[(2d6 + @{skilltotal-Stealth} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Stealth</div></button></td>
+            <td><button name="roll_skill-Sensors" type="roll" value="/me rolls Sensors (@{skillSpeciality-Sensors}) [[(2d6 + @{skilltotal-Sensors} + ?{Modifier|0})]]" ><div class="sheet-button_header">Sensors</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Sensors" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Sensors" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-Sensors" value="@{skillCharacteristicDM-Sensors}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-Sensors" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Sensors" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Sensors" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-Sensors" value="@{skillDM-Sensors} + @{skilllevel-Sensors} + @{skillmodifier-Sensors} + @{untrained-Sensors}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-SocialSciences" type="roll" value="/me rolls Social Sciences (@{skillSpeciality-SocialSciences}) [[(2d6 + @{skilltotal-SocialSciences} + ?{Modifier|0})]]" ><div class="sheet-button_header">Social Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-SocialSciences" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-SocialSciences" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-SocialSciences" value="@{skillCharacteristicDM-SocialSciences}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-SocialSciences" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-SocialSciences" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-SocialSciences" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-SocialSciences" value="@{skillDM-SocialSciences} + @{skilllevel-SocialSciences} + @{skillmodifier-SocialSciences} + @{untrained-SocialSciences}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-SocialSciences2" type="roll" value="/me rolls Social Sciences (@{skillSpeciality-SocialSciences2}) [[(2d6 + @{skilltotal-SocialSciences2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Social Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-SocialSciences2" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-SocialSciences2" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-SocialSciences2" value="@{skillCharacteristicDM-SocialSciences2}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-SocialSciences2" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-SocialSciences2" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-SocialSciences2" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-SocialSciences2" value="@{skillDM-SocialSciences2} + @{skilllevel-SocialSciences2} + @{skillmodifier-SocialSciences2} + @{untrained-SocialSciences2}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-SpaceSciences" type="roll" value="/me rolls Space Sciences (@{skillSpeciality-SpaceSciences}) [[(2d6 + @{skilltotal-SpaceSciences} + ?{Modifier|0})]]" ><div class="sheet-button_header">Space Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-SpaceSciences" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-SpaceSciences" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-SpaceSciences" value="@{skillCharacteristicDM-SpaceSciences}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-SpaceSciences" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-SpaceSciences" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-SpaceSciences" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-SpaceSciences" value="@{skillDM-SpaceSciences} + @{skilllevel-SpaceSciences} + @{skillmodifier-SpaceSciences} + @{untrained-SpaceSciences}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-SpaceSciences2" type="roll" value="/me rolls Space Sciences (@{skillSpeciality-SpaceSciences2}) [[(2d6 + @{skilltotal-SpaceSciences2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Space Sciences</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-SpaceSciences2" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-SpaceSciences2" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-SpaceSciences2" value="@{skillCharacteristicDM-SpaceSciences2}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-SpaceSciences2" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-SpaceSciences2" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-SpaceSciences2" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-SpaceSciences2" value="@{skillDM-SpaceSciences2} + @{skilllevel-SpaceSciences2} + @{skillmodifier-SpaceSciences2} + @{untrained-SpaceSciences2}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Stealth" type="roll" value="/me rolls Stealth (@{skillSpeciality-Stealth}) [[(2d6 + @{skilltotal-Stealth} + ?{Modifier|0})]]" ><div class="sheet-button_header">Stealth</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Stealth" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Stealth" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1135,7 +1165,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Stealth" value="@{skillDM-Stealth} + @{skilllevel-Stealth} + @{skillmodifier-Stealth} + @{untrained-Stealth}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Steward" type="roll" value="/me rolls Steward (@{skillSpeciality-Steward}) [[(2d6 + @{skilltotal-Steward} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Steward</div></button></td>
+            <td><button name="roll_skill-Steward" type="roll" value="/me rolls Steward (@{skillSpeciality-Steward}) [[(2d6 + @{skilltotal-Steward} + ?{Modifier|0})]]" ><div class="sheet-button_header">Steward</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Steward" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Steward" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1152,7 +1182,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Steward" value="@{skillDM-Steward} + @{skilllevel-Steward} + @{skillmodifier-Steward} + @{untrained-Steward}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Streetwise" type="roll" value="/me rolls Streetwise (@{skillSpeciality-Streetwise}) [[(2d6 + @{skilltotal-Streetwise} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Streetwise</div></button></td>
+            <td><button name="roll_skill-Streetwise" type="roll" value="/me rolls Streetwise (@{skillSpeciality-Streetwise}) [[(2d6 + @{skilltotal-Streetwise} + ?{Modifier|0})]]" ><div class="sheet-button_header">Streetwise</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Streetwise" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Streetwise" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1169,7 +1199,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Streetwise" value="@{skillDM-Streetwise} + @{skilllevel-Streetwise} + @{skillmodifier-Streetwise} + @{untrained-Streetwise}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Survival" type="roll" value="/me rolls Survival (@{skillSpeciality-Survival}) [[(2d6 + @{skilltotal-Survival} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Survival</div></button></td>
+            <td><button name="roll_skill-Survival" type="roll" value="/me rolls Survival (@{skillSpeciality-Survival}) [[(2d6 + @{skilltotal-Survival} + ?{Modifier|0})]]" ><div class="sheet-button_header">Survival</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Survival" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Survival" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1186,7 +1216,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Survival" value="@{skillDM-Survival} + @{skilllevel-Survival} + @{skillmodifier-Survival} + @{untrained-Survival}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Tactics" type="roll" value="/me rolls Tactics (@{skillSpeciality-Tactics}) [[(2d6 + @{skilltotal-Tactics} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Tactics</div></button></td>
+            <td><button name="roll_skill-Tactics" type="roll" value="/me rolls Tactics (@{skillSpeciality-Tactics}) [[(2d6 + @{skilltotal-Tactics} + ?{Modifier|0})]]" ><div class="sheet-button_header">Tactics</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Tactics" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Tactics" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1203,7 +1233,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Tactics" value="@{skillDM-Tactics} + @{skilllevel-Tactics} + @{skillmodifier-Tactics} + @{untrained-Tactics}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-Tactics2" type="roll" value="/me rolls Tactics (@{skillSpeciality-Tactics2}) [[(2d6 + @{skilltotal-Tactics2} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Tactics</div></button></td>
+            <td><button name="roll_skill-Tactics2" type="roll" value="/me rolls Tactics (@{skillSpeciality-Tactics2}) [[(2d6 + @{skilltotal-Tactics2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Tactics</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Tactics2" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Tactics2" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1220,7 +1250,41 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Tactics2" value="@{skillDM-Tactics2} + @{skilllevel-Tactics2} + @{skillmodifier-Tactics2} + @{untrained-Tactics2}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-VaccSuit" type="roll" value="/me rolls Vacc Suit (@{skillSpeciality-VaccSuit}) [[(2d6 + @{skilltotal-VaccSuit} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">VaccSuit</div></button></td>
+            <td><button name="roll_skill-Trade" type="roll" value="/me rolls Trade (@{skillSpeciality-Trade}) [[(2d6 + @{skilltotal-Trade} + ?{Modifier|0})]]" ><div class="sheet-button_header">Trade</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Trade" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Trade" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-Trade" value="@{skillCharacteristicDM-Trade}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-Trade" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Trade" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Trade" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-Trade" value="@{skillDM-Trade} + @{skilllevel-Trade} + @{skillmodifier-Trade} + @{untrained-Trade}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-Trade2" type="roll" value="/me rolls Trade (@{skillSpeciality-Trade2}) [[(2d6 + @{skilltotal-Trade2} + ?{Modifier|0})]]" ><div class="sheet-button_header">Trade</div></button></td>
+            <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Trade2" value="" /></td>
+            <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Trade2" value="0" style="width:95px" />
+                <option value="@{mod-Strength}">Strength</option>
+                <option value="@{mod-Intellect}">Intellect</option>
+                <option value="@{mod-Dexterity}">Dexterity</option>
+                <option value="@{mod-Education}">Education</option>
+                <option value="@{mod-Endurance}">Endurance</option>
+                <option value="@{mod-Social}">Social</option>
+                </select></td>
+            <td><input type="number" class="sheet-input" name="attr_skillDM-Trade2" value="@{skillCharacteristicDM-Trade2}" disabled="true"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilllevel-Trade2" value="0" /></td>
+            <td><input type="number" class="sheet-input" name="attr_skillmodifier-Trade2" value="0" /></td>
+            <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Trade2" value="-3"/></td>
+            <td><input type="number" class="sheet-input" name="attr_skilltotal-Trade2" value="@{skillDM-Trade2} + @{skilllevel-Trade2} + @{skillmodifier-Trade2} + @{untrained-Trade2}" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><button name="roll_skill-VaccSuit" type="roll" value="/me rolls Vacc Suit (@{skillSpeciality-VaccSuit}) [[(2d6 + @{skilltotal-VaccSuit} + ?{Modifier|0})]]" ><div class="sheet-button_header">VaccSuit</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-VaccSuit" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-VaccSuit" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1237,7 +1301,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-VaccSuit" value="@{skillDM-VaccSuit} + @{skilllevel-VaccSuit} + @{skillmodifier-VaccSuit} + @{untrained-VaccSuit}" disabled="true"/></td>
         </tr>
         <tr>
-            <td><button name="roll_skill-ZeroG" type="roll" value="/me rolls Zero-G (@{skillSpeciality-ZeroG}) [[(2d6 + @{skilltotal-ZeroG} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">ZeroG</div></button></td>
+            <td><button name="roll_skill-ZeroG" type="roll" value="/me rolls Zero-G (@{skillSpeciality-ZeroG}) [[(2d6 + @{skilltotal-ZeroG} + ?{Modifier|0})]]" ><div class="sheet-button_header">ZeroG</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-ZeroG" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-ZeroG" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1267,7 +1331,7 @@
             <th>Total</th>
         </tr>
         <tr>
-            <td><button name="roll_skill-Other" type="roll" value="/me rolls Other (@{skillSpeciality-Other}) [[(2d6 + @{skilltotal-Other} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Other</div></button></td>
+            <td><button name="roll_skill-Other" type="roll" value="/me rolls Other (@{skillSpeciality-Other}) [[(2d6 + @{skilltotal-Other} + ?{Modifier|0})]]" ><div class="sheet-button_header">Other</div></button></td>
             <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Other" value="" /></td>
             <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Other" value="0" style="width:95px" />
                 <option value="@{mod-Strength}">Strength</option>
@@ -1284,7 +1348,7 @@
             <td><input type="number" class="sheet-input" name="attr_skilltotal-Other" value="@{skillDM-Other} + @{skilllevel-Other} + @{skillmodifier-Other} + @{untrained-Other}" disabled="true"/></td>
         </tr>
     </table>
-    <fieldset class="repeating_otherskills">
+    <fieldset class="repeating_otherskills"> 
         <table class="sheet-skilltable" style="width:90%">
             <tr>
                 <th>Skill</th>
@@ -1297,7 +1361,7 @@
                 <th>Total</th>
             </tr>
             <tr>
-                <td><button name="roll_skill-Other" type="roll" value="/me rolls Other (@{skillSpeciality-Other}) [[(2d6 + @{skilltotal-Other} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Other</div></button></td>
+                <td><button name="roll_skill-Other" type="roll" value="/me rolls Other (@{skillSpeciality-Other}) [[(2d6 + @{skilltotal-Other} + ?{Modifier|0})]]" ><div class="sheet-button_header">Other</div></button></td>
                 <td><input type="text" class="sheet-input" name="attr_skillSpeciality-Other" value="" /></td>
                 <td><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Other" value="0" style="width:95px" />
                     <option value="@{mod-Strength}">Strength</option>
@@ -1313,7 +1377,7 @@
                 <td><input type="checkbox" class="sheet-untrained" name="attr_untrained-Other" value="-3"/></td>
                 <td><input type="number" class="sheet-input" name="attr_skilltotal-Other" value="@{skillDM-Other} + @{skilllevel-Other} + @{skillmodifier-Other} + @{untrained-Other}" disabled="true"/></td>
             </tr>
-        </table>
+        </table>    
     </fieldset>
 </div>
 <!--    Inventory  -->
@@ -1331,7 +1395,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-1" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-1" /></th>
                             </tr>
                             <tr>
@@ -1340,7 +1404,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-2" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-2" /></th>
                             </tr>
                             <tr>
@@ -1349,7 +1413,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-3" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-3" /></th>
                             </tr>
                             <tr>
@@ -1358,7 +1422,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-4" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-4" /></th>
                             </tr>
                             <tr>
@@ -1367,7 +1431,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-5" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-5" /></th>
                             </tr>
                             <tr>
@@ -1376,7 +1440,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-6" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-6" /></th>
                             </tr>
                             <tr>
@@ -1389,7 +1453,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-7" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-7" /></th>
                             </tr>
                             <tr>
@@ -1398,7 +1462,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-8" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-8" /></th>
                             </tr>
                             <tr>
@@ -1407,7 +1471,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-9" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-9" /></th>
                             </tr>
                             <tr>
@@ -1416,7 +1480,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-10" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-10" /></th>
                             </tr>
                             <tr>
@@ -1425,7 +1489,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-11" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-11" /></th>
                             </tr>
                             <tr>
@@ -1434,7 +1498,7 @@
                             <tr>
                                 <th>Gear</th>
                                 <th><input type="text" class="sheet-input" name="attr_gear_name-12" /></th>
-                                <th>KG</th>
+                                <th>Mass</th>
                                 <th><input type="number" class="sheet-input" name="attr_gear_mass-12" /></th>
                             </tr>
                             <tr>
@@ -1450,7 +1514,7 @@
                                 <tr>
                                     <th>Gear</th>
                                     <th><input type="text" class="sheet-input" name="attr_gear_name-6" /></th>
-                                    <th>KG</th>
+                                    <th>Mass</th>
                                     <th><input type="number" class="sheet-input" name="attr_gear_mass-6" /></th>
                                 </tr>
                                 <tr>
@@ -1463,7 +1527,7 @@
                                 <tr>
                                     <th>Gear</th>
                                     <th><input type="text" class="sheet-input" name="attr_gear_name-7" /></th>
-                                    <th>KG</th>
+                                    <th>Mass</th>
                                     <th><input type="number" class="sheet-input" name="attr_gear_mass-7" /></th>
                                 </tr>
                                 <tr>
@@ -1482,20 +1546,28 @@
             <h3>Weapons</h3>
             <div class="body">
                 <table class="sheet-weapontable" style="width:100%">
-
+                    <tr>
+                        <th></th>
+                        <th colspan="2">---- Attack ----</th>
+                        <th></th>
+                        <th colspan="8">---- Range ----</th>
+                    </tr>
                     <tr>
                         <th>Roll</th>
                         <th>Weapon</th>
                         <th>Skill Total</th>
                         <th>DM</th>
                         <th>Damage</th>
-                        <th>TL</th>
-                        <th>Range</th>
-                        <th>KG</th>
-                        <th>Magazine</th>
+                        <th>P</th>
+                        <th>C</th>
+                        <th>S</th>
+                        <th>M</th>
+                        <th>L</th>
+                        <th>VL</th>
+                        <th>D</th>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-1" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-1}}}  {{attack=[[(2d6 + @{weapon_DM-1} + @{weapon_skill-1} + ?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-1}]]}}" ></button></td>
+                        <td><button name="roll_weapon-1" type="roll" value="/me attacks with @{weapon_name-1} [[(2d6 + @{weapon_DM-1} + @{weapon_skill-1} + ?{Modifier|0})]] and deals [[@{weapon_damage-1}]] damage" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-1" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-1" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-1" value="0" style="width:85px" />
@@ -1503,17 +1575,20 @@
                             <option value="@{mod-Dexterity}">Dexterity</option>
                             </select></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_damage-1" value="" style="width:70px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_tl-1" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_range-1" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_weight-1" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_weapon_magazine-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-p-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-c-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-s-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-m-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-l-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-vl-1" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-d-1" value="0" /></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-1" ></textarea></td>
+                        <td colspan="11"><textarea class="sheet-input" name="attr_weapon_note-1" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-2" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-2}}}  {{attack=[[(2d6 + @{weapon_DM-2} + @{weapon_skill-2} + ?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-2}]]}}" ></button></td>
+                        <td><button name="roll_weapon-2" type="roll" value="/me attacks with @{weapon_name-2} [[(2d6 + @{weapon_DM-2} + @{weapon_skill-2} + ?{Modifier|0})]] and deals [[@{weapon_damage-2}]] damage" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-2" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-2" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-2" value="0" style="width:85px" />
@@ -1521,17 +1596,20 @@
                             <option value="@{mod-Dexterity}">Dexterity</option>
                             </select></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_damage-2" value="" style="width:70px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_tl-2" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_range-2" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_weight-2" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_weapon_magazine-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-p-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-c-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-s-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-m-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-l-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-vl-2" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-d-2" value="0" /></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-2" ></textarea></td>
+                        <td colspan="11"><textarea class="sheet-input" name="attr_weapon_note-2" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-3" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-3}}}  {{attack=[[(2d6 + @{weapon_DM-3} + @{weapon_skill-3} + ?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-3}]]}}" ></button></td>
+                        <td><button name="roll_weapon-3" type="roll" value="/me attacks with @{weapon_name-3} [[(2d6 + @{weapon_DM-3} + @{weapon_skill-3} + ?{Modifier|0})]] and deals [[@{weapon_damage-3}]] damage" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-3" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-3" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-3" value="0" style="width:85px" />
@@ -1539,17 +1617,20 @@
                             <option value="@{mod-Dexterity}">Dexterity</option>
                             </select></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_damage-3" value="" style="width:70px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_tl-3" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_range-3" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_weight-3" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_weapon_magazine-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-p-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-c-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-s-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-m-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-l-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-vl-3" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-d-3" value="0" /></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-3" ></textarea></td>
+                        <td colspan="11"><textarea class="sheet-input" name="attr_weapon_note-3" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-4" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-4}}}  {{attack=[[(2d6 + @{weapon_DM-4} + @{weapon_skill-4} + ?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-4}]]}}" ></button></td>
+                        <td><button name="roll_weapon-4" type="roll" value="/me attacks with @{weapon_name-4} [[(2d6 + @{weapon_DM-4} + @{weapon_skill-4} + ?{Modifier|0})]] and deals [[@{weapon_damage-4}]] damage" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-4" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-4" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-4" value="0" style="width:85px" />
@@ -1557,17 +1638,20 @@
                             <option value="@{mod-Dexterity}">Dexterity</option>
                             </select></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_damage-4" value="" style="width:70px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_tl-4" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_range-4" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_weight-4" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_weapon_magazine-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-p-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-c-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-s-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-m-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-l-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-vl-4" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-d-4" value="0" /></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-4" ></textarea></td>
+                        <td colspan="11"><textarea class="sheet-input" name="attr_weapon_note-4" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-5" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-5}}}  {{attack=[[(2d6 + @{weapon_DM-5} + @{weapon_skill-5} + ?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-5}]]}}" ></button></td>
+                        <td><button name="roll_weapon-5" type="roll" value="/me attacks with @{weapon_name-5} [[(2d5 + @{weapon_DM-5} + @{weapon_skill-5} + ?{Modifier|0})]] and deals [[@{weapon_damage-5}]] damage" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-5" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-5" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-5" value="0" style="width:85px" />
@@ -1575,17 +1659,20 @@
                             <option value="@{mod-Dexterity}">Dexterity</option>
                             </select></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_damage-5" value="" style="width:70px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_tl-5" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_range-5" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_weight-5" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_weapon_magazine-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-p-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-c-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-s-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-m-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-l-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-vl-5" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-d-5" value="0" /></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-5" ></textarea></td>
+                        <td colspan="11"><textarea class="sheet-input" name="attr_weapon_note-5" ></textarea></td>
                     </tr>
                     <tr>
-                        <td><button name="roll_weapon-6" type="roll" value="&{template:default} {{name=Attack with @{weapon_name-6}}}  {{attack=[[(2d6 + @{weapon_DM-6} + @{weapon_skill-6} + ?{Modifier|0})]]}} {{Boon/Bane Die=[[1d6]]}} {{damage=[[@{weapon_damage-6}]]}}" ></button></td>
+                        <td><button name="roll_weapon-6" type="roll" value="/me attacks with @{weapon_name-6} [[(2d6 + @{weapon_DM-6} + @{weapon_skill-6} + ?{Modifier|0})]] and deals [[@{weapon_damage-6}]] damage" ></button></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_name-6" value="" /></td>
                         <td><input type="number" class="sheet-input" name="attr_weapon_skill-6" value="0" /></td>
                         <td><select type="text" class="sheet-input" name="attr_weapon_DM-6" value="0" style="width:85px" />
@@ -1593,14 +1680,17 @@
                             <option value="@{mod-Dexterity}">Dexterity</option>
                             </select></td>
                         <td><input type="text" class="sheet-input" name="attr_weapon_damage-6" value="" style="width:70px"/></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_tl-6" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_range-6" value="0" /></td>
-                        <td><input type="number" class="sheet-input" name="attr_weapon_weight-6" value="0" /></td>
-                        <td><input type="text" class="sheet-input" name="attr_weapon_magazine-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-p-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-c-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-s-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-m-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-l-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-vl-6" value="0" /></td>
+                        <td><input type="number" class="sheet-input" name="attr_weapon_range-d-6" value="0" /></td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td colspan="8"><textarea class="sheet-input" name="attr_weapon_note-6" ></textarea></td>
+                        <td colspan="11"><textarea class="sheet-input" name="attr_weapon_note-6" ></textarea></td>
                     </tr>
                 </table>
             </div>
@@ -1639,7 +1729,7 @@
                         <td colspan="3"><textarea wrap="soft" class="sheet-input" value="" name="attr_otherwealth_item_note" placeholder="Item Details" /></textarea></td>
                     </tr>
                 </table>
-                <fieldset class="repeating_otherweath">
+                <fieldset class="repeating_otherweath"> 
                     <table class="sheet-skilltable" style="width:70%">
                         <tr>
                             <td><div class="sheet-header">Item</div></td>
@@ -1676,7 +1766,7 @@
 			<th style="width:60px">Total</th>
 		</tr>
 		<tr>
-			<td style="width:60px"><button name="roll_skill-power" type="roll" value="/me rolls power (@{skillSpeciality-power}) [[(2d6 + @{skilltotal-power} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Powers</div></button></td>
+			<td style="width:60px"><button name="roll_skill-power" type="roll" value="/me rolls power (@{skillSpeciality-power}) [[(2d6 + @{skilltotal-power} + ?{Modifier|0})]]" ><div class="sheet-button_header">Powers</div></button></td>
 			<td style="width:110px"><input type="text" class="sheet-input" name="attr_skillSpeciality-power" value="" /></td>
 			<td style="width:100px"><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-power" value="0" style="width:95px" />
 				<option value="@{mod-Strength}">Strength</option>
@@ -1693,11 +1783,11 @@
 			<th style="width:80px"><input type="checkbox" class="sheet-untrained" name="attr_untrained-power" value="-3"/></th>
 			<td style="width:60px"><input type="number" class="sheet-input" name="attr_skilltotal-power" value="@{skillDM-power} + @{skilllevel-power} + @{skillmodifier-power} + @{untrained-power}" disabled="true"/></td>
 		</tr>
-	</table>
-    <fieldset class="repeating_powers">
+	</table>    
+    <fieldset class="repeating_powers"> 
         <table class="sheet-skilltable" style="width:800px">
             <tr>
-                <td style="width:60px"><button name="roll_skill-power" type="roll" value="/me rolls power (@{skillSpeciality-power}) [[(2d6 + @{skilltotal-power} + ?{Modifier|0})]]  Boon/Bane Die: [[1d6]]" ><div class="sheet-button_header">Powers</div></button></td>
+                <td style="width:60px"><button name="roll_skill-power" type="roll" value="/me rolls power (@{skillSpeciality-power}) [[(2d6 + @{skilltotal-power} + ?{Modifier|0})]]" ><div class="sheet-button_header">Powers</div></button></td>
                 <td style="width:110px"><input type="text" class="sheet-input" name="attr_skillSpeciality-power" value="" /></td>
                 <td style="width:100px"><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-power" value="0" style="width:95px" />
                     <option value="@{mod-Strength}">Strength</option>
@@ -1714,9 +1804,9 @@
                 <th style="width:80px"><input type="checkbox" class="sheet-untrained" name="attr_untrained-power" value="-3"/></th>
                 <td style="width:60px"><input type="number" class="sheet-input" name="attr_skilltotal-power" value="@{skillDM-power} + @{skilllevel-power} + @{skillmodifier-power} + @{untrained-power}" disabled="true"/></td>
             </tr>
-        </table>
+        </table>    
     </fieldset>
-
+    
 </div>
 <!--    History  -->
 <div class="sheet-tab-content sheet-tab5">
@@ -1729,7 +1819,7 @@
             <div class="body">
                 <textarea name="attr_character_history" placeholder="Character History" ></textarea>
                 <h3>Recent History</h3>
-                <fieldset class="repeating_history">
+                <fieldset class="repeating_history"> 
                     <table class="sheet-skilltable">
                         <tr>
                             <td>Event Name</td>
@@ -1763,7 +1853,7 @@
                         <td colspan="2"><textarea wrap="soft" class="sheet-input" value="" name="attr_note-allies" style="width:100%" placeholder="Allies Notes" /></textarea></td>
                     </tr>
                 </table>
-                <fieldset class="repeating_allies">
+                <fieldset class="repeating_allies"> 
                     <table class="sheet-skilltable">
                         <tr>
                             <td><h5>Name</h5></td>
@@ -1799,7 +1889,7 @@
                         <td colspan="2"><textarea wrap="soft" class="sheet-input" value="" name="attr_note-contact" style="width:100%" placeholder="contact Notes" /></textarea></td>
                     </tr>
                 </table>
-                <fieldset class="repeating_contact">
+                <fieldset class="repeating_contact"> 
                     <table class="sheet-skilltable">
                         <tr>
                             <td><h5>Name</h5></td>
@@ -1835,7 +1925,7 @@
                         <td colspan="2"><textarea wrap="soft" class="sheet-input" value="" name="attr_note-enemies" style="width:100%" placeholder="Enemy Notes" /></textarea></td>
                     </tr>
                 </table>
-                <fieldset class="repeating_enemies">
+                <fieldset class="repeating_enemies"> 
                     <table class="sheet-skilltable">
                         <tr>
                             <td><h5>Name</h5></td>
@@ -1871,7 +1961,7 @@
                         <td colspan="2"><textarea wrap="soft" class="sheet-input" value="" name="attr_note-rivals" style="width:100%" placeholder="Rival Notes" /></textarea></td>
                     </tr>
                 </table>
-                <fieldset class="repeating_rivals">
+                <fieldset class="repeating_rivals"> 
                     <table class="sheet-skilltable">
                         <tr>
                             <td><h5>Name</h5></td>
@@ -1889,7 +1979,7 @@
             </div>
         </div>
     </div>
-</div>
+</div> 
 <!--    Robotics  -->
 <div class="sheet-tab-content sheet-tab6">
     <br>
@@ -2218,4 +2308,4 @@
             </table>
         </fieldset>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Mongoose_Traveller2e/MongooseTraveller2e.png b/Mongoose_Traveller/MongooseTraveller.png
similarity index 100%
rename from Mongoose_Traveller2e/MongooseTraveller2e.png
rename to Mongoose_Traveller/MongooseTraveller.png
diff --git a/Mongoose_Traveller2e/sheet.json b/Mongoose_Traveller/sheet.json
similarity index 52%
rename from Mongoose_Traveller2e/sheet.json
rename to Mongoose_Traveller/sheet.json
index 05e7d7d615..e2429a2a49 100644
--- a/Mongoose_Traveller2e/sheet.json
+++ b/Mongoose_Traveller/sheet.json
@@ -1,8 +1,8 @@
 {
-    "html": "MongooseTraveller2e.html",
-    "css": "MongooseTraveller2e.css",
+    "html": "MongooseTraveller.html",
+    "css": "MongooseTraveller.css",
     "authors": "John W.",
-    "roll20userID": "492849,869232",
-    "preview": "MongooseTraveller2e.png",
-    "instructions": "You can roll skills directly from the sheet, by clicking on the corresponding name or the roll button at the beginning of the row. All questions concerning this sheet should be addressed to Coal Powered Puppet."
+    "roll20userID": "492849",
+    "preview": "MongooseTraveller.png",
+    "instructions": "You can roll skills directly from the sheet, by clicking on the corresponding name or the roll button at the beginning of the row. All questions concerning this sheet should be addressed to John W."
 }
\ No newline at end of file