diff --git a/Star Wars FFG API-Compatible/Character Sheet Preview.png b/Star Wars FFG API-Compatible/Character Sheet Preview.png
index a494255228..c0a7992466 100644
Binary files a/Star Wars FFG API-Compatible/Character Sheet Preview.png and b/Star Wars FFG API-Compatible/Character Sheet Preview.png differ
diff --git a/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.css b/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.css
index 12a9d5c2c5..b5a5596b82 100644
--- a/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.css	
+++ b/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.css	
@@ -1,44 +1,103 @@
 /*
 Version Info:
-Verion 4.0.4.6
+Version 6.3.0
 */
+.sheet-clear {
+    clear: both
+}
 
-.sheet-clear  {clear:both}
-.sheet-divider {border-top:1px solid #e3e3e3}
+.sheet-divider {
+    border-top: 1px solid #e3e3e3
+}
 
 /* GRID
  * ----------------------------------------------------------------- */
- 
-.sheet-row                      {padding: 1% 0%; clear: both}
-.sheet-column                   {margin:0 1%; float:left;}
-.sheet-column .sheet-column     {margin:0 0%; float:left;}
 
-.sheet-row .sheet-column:last-child {float:right}
+.sheet-row {
+    padding: 1% 0%;
+    clear: both
+}
 
-.sheet-small-1    {width: 6.3%}
-.sheet-small-2    {width: 14.6%}
-.sheet-small-3    {width: 23%}/* 25% */
-.sheet-small-4    {width: 31.3%}
-.sheet-small-5    {width: 39.6%}
-.sheet-small-6    {width: 48%}/* 50% */
-.sheet-small-7    {width: 56.3%}
-.sheet-small-8    {width: 64.6%}
-.sheet-small-9    {width: 73%}/* 75% */
-.sheet-small-10   {width: 81.3%}
-.sheet-small-11   {width: 91.6%}
-.sheet-small-12   {width: 98%}/* 100% */
+.sheet-column {
+    margin: 0 1%;
+    float: left;
+}
+
+.sheet-column .sheet-column {
+    margin: 0 0%;
+    float: left;
+}
+
+.sheet-row .sheet-column:last-child {
+    float: right
+}
+
+.sheet-small-1 {
+    width: 6.3%
+}
+
+.sheet-small-2 {
+    width: 14.6%
+}
+
+.sheet-small-3 {
+    width: 23%
+}
+
+/* 25% */
+.sheet-small-4 {
+    width: 31.3%
+}
+
+.sheet-small-5 {
+    width: 39.6%
+}
+
+.sheet-small-6 {
+    width: 48%
+}
+
+/* 50% */
+.sheet-small-7 {
+    width: 56.3%
+}
+
+.sheet-small-8 {
+    width: 64.6%
+}
+
+.sheet-small-9 {
+    width: 73%
+}
+
+/* 75% */
+.sheet-small-10 {
+    width: 81.3%
+}
+
+.sheet-small-11 {
+    width: 91.6%
+}
+
+.sheet-small-12 {
+    width: 98%
+}
+
+/* 100% */
 
 /* Dice input reset
  *-------------------------------------- */
 .sheet-dice-pool [type=roll] {
-    padding:2px 4px !important;
-    margin:0 !important;
-    font-size:28px !important;
-    line-height:28px !important;
+    padding: 2px 4px !important;
+    margin: 0 !important;
+    font-size: 28px !important;
+    line-height: 28px !important;
 }
 
 .sheet-dice-pool [name='roll_ResetDicePool'],
-.sheet-dice-pool [name='roll_ResetGMDicePool'] {padding-bottom:3px !important}
+.sheet-dice-pool [name='roll_ResetGMDicePool'] {
+    padding-bottom: 3px !important
+}
 
 .sheet-dice-pool [name='roll_ResetDicePool']:before,
 .sheet-dice-pool [name='roll_ResetGMDicePool']:before {
@@ -51,59 +110,128 @@ Verion 4.0.4.6
  *----------------------------------------- */
 
 .sheet-yd + span {
-    background-image:url('http://i.imgur.com/Ntq77sk.png');/* Yellow - Proficiency Die */
-    background-position:left top;
-    background-repeat:repeat-x;
-    height:20px;
-    display:block;
-    float:left;
+    background-image: url('http://i.imgur.com/Ntq77sk.png'); /* Yellow - Proficiency Die */
+    background-position: left top;
+    background-repeat: repeat-x;
+    height: 20px;
+    display: block;
+    float: left;
 }
 
 .sheet-gd + span {
-    background-image:url('http://i.imgur.com/cqkTp2t.png');/* Green - Ability Die */
-    background-position:left top;
-    background-repeat:repeat-x;
-    height:20px;
-    display:block;
-    float:left;
+    background-image: url('http://i.imgur.com/cqkTp2t.png'); /* Green - Ability Die */
+    background-position: left top;
+    background-repeat: repeat-x;
+    height: 20px;
+    display: block;
+    float: left;
 }
 
 .sheet-pd + span {
-    background-image:url('http://i.imgur.com/afj6fxH.png');/* Purple - Difficulty Die */
-    background-position:left top;
-    background-repeat:repeat-x;
-    height:20px;
-    display:block;
-    float:left;
+    background-image: url('http://i.imgur.com/afj6fxH.png'); /* Purple - Difficulty Die */
+    background-position: left top;
+    background-repeat: repeat-x;
+    height: 20px;
+    display: block;
+    float: left;
 }
 
-.sheet-gd[value="0"] + span {width:0;}
-.sheet-gd[value="1"] + span {width: 17px}
-.sheet-gd[value="2"] + span {width: 34px}
-.sheet-gd[value="3"] + span {width: 51px}
-.sheet-gd[value="4"] + span {width: 68px}
-.sheet-gd[value="5"] + span {width: 85px}
-.sheet-gd[value="6"] + span {width: 102px}
-.sheet-gd[value="7"] + span {width: 124px}
+.sheet-gd[value="0"] + span {
+    width: 0;
+}
 
-.sheet-yd[value="0"] + span {width:0;}
-.sheet-yd[value="1"] + span {width: 17px}
-.sheet-yd[value="2"] + span {width: 34px}
-.sheet-yd[value="3"] + span {width: 51px}
-.sheet-yd[value="4"] + span {width: 68px}
-.sheet-yd[value="5"] + span {width: 85px}
-.sheet-yd[value="6"] + span {width: 102px}
-.sheet-yd[value="7"] + span {width: 124px}
+.sheet-gd[value="1"] + span {
+    width: 17px
+}
+
+.sheet-gd[value="2"] + span {
+    width: 34px
+}
+
+.sheet-gd[value="3"] + span {
+    width: 51px
+}
+
+.sheet-gd[value="4"] + span {
+    width: 68px
+}
+
+.sheet-gd[value="5"] + span {
+    width: 85px
+}
+
+.sheet-gd[value="6"] + span {
+    width: 102px
+}
+
+.sheet-gd[value="7"] + span {
+    width: 124px
+}
+
+.sheet-yd[value="0"] + span {
+    width: 0;
+}
+
+.sheet-yd[value="1"] + span {
+    width: 17px
+}
+
+.sheet-yd[value="2"] + span {
+    width: 34px
+}
+
+.sheet-yd[value="3"] + span {
+    width: 51px
+}
+
+.sheet-yd[value="4"] + span {
+    width: 68px
+}
+
+.sheet-yd[value="5"] + span {
+    width: 85px
+}
+
+.sheet-yd[value="6"] + span {
+    width: 102px
+}
+
+.sheet-yd[value="7"] + span {
+    width: 124px
+}
 
 /*used for crit section*/
-.sheet-pd[value="0"] + span {width:0;}
-.sheet-pd[value="1"] + span {width: 20px}
-.sheet-pd[value="2"] + span {width: 40px}
-.sheet-pd[value="3"] + span {width: 60px}
-.sheet-pd[value="4"] + span {width: 80px}
-.sheet-pd[value="5"] + span {width: 100px}
-.sheet-pd[value="6"] + span {width: 120px}
-.sheet-pd[value="7"] + span {width: 140px}
+.sheet-pd[value="0"] + span {
+    width: 0;
+}
+
+.sheet-pd[value="1"] + span {
+    width: 20px
+}
+
+.sheet-pd[value="2"] + span {
+    width: 40px
+}
+
+.sheet-pd[value="3"] + span {
+    width: 60px
+}
+
+.sheet-pd[value="4"] + span {
+    width: 80px
+}
+
+.sheet-pd[value="5"] + span {
+    width: 100px
+}
+
+.sheet-pd[value="6"] + span {
+    width: 120px
+}
+
+.sheet-pd[value="7"] + span {
+    width: 140px
+}
 
 /* Switch
  * ------------------------------------ */
@@ -119,14 +247,14 @@ Verion 4.0.4.6
 }
 
 .sheet-switch [type=radio] {
-    width:60px;
-    height:27px;
-    float:left;
-    display:block;
-    -webkit-appearance:none;
-    -moz-appearance:none;
-    border:none;
-    outline:none;
+    width: 60px;
+    height: 27px;
+    float: left;
+    display: block;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    border: none;
+    outline: none;
     position: relative;
     cursor: pointer;
     z-index: 2;
@@ -134,26 +262,26 @@ Verion 4.0.4.6
 
 .sheet-switch [type=radio]::before {
     content: attr(title);
-    display:block;
-    width:60px;
-    height:27px;
-    line-height:27px;
-    text-align:center;
+    display: block;
+    width: 60px;
+    height: 27px;
+    line-height: 27px;
+    text-align: center;
 }
 
 .sheet-switch [type=radio]:checked,
-.sheet-switch [type=radio]:active, 
+.sheet-switch [type=radio]:active,
 .sheet-switch [type=radio]:focus {
     font-weight: normal;
-    background:transparent;
+    background: transparent;
     color: #fff;
 }
 
-.sheet-switch-input-on:checked  ~ .sheet-switch-selection {
+.sheet-switch-input-on:checked ~ .sheet-switch-selection {
     left: 2px;
 }
 
-.sheet-switch-input-off:checked  ~ .sheet-switch-selection {
+.sheet-switch-input-off:checked ~ .sheet-switch-selection {
     left: 60px;
 }
 
@@ -182,8 +310,8 @@ Verion 4.0.4.6
 /* Form Options
  * ------------------------------------ */
 
-table .sheet-opt-content { 
-    display: none; 
+table .sheet-opt-content {
+    display: none;
 }
 
 /* Old Vehicle Tabs */
@@ -192,25 +320,38 @@ input.sheet-opt-ship:checked ~ table tr.sheet-opt-ship,
 input.sheet-tab-v-details:checked ~ div.sheet-tab-v-details,
 input.sheet-tab-v-weapons:checked ~ div.sheet-tab-v-weapons,
 input.sheet-tab-older:checked ~ div.sheet-tab-older,
-/* New Vehicle Tabs */
+    /* New Vehicle Tabs */
 input.sheet-tab-transport-space:checked ~ table tr.sheet-tab-transport-space,
 input.sheet-tab-transport-planetary:checked ~ table tr.sheet-tab-transport-planetary,
 input.sheet-tab-transport-beast:checked ~ table tr.sheet-tab-transport-beast,
-/* Base of Operations Tabs */
+input.sheet-tab-transport-space-general:checked ~ table tr.sheet-tab-transport-space-general,
+input.sheet-tab-transport-space-critical:checked ~ table tr.sheet-tab-transport-space-critical,
+input.sheet-tab-transport-planetary-general:checked ~ table tr.sheet-tab-transport-planetary-general,
+input.sheet-tab-transport-planetary-critical:checked ~ table tr.sheet-tab-transport-planetary-critical,
+input.sheet-tab-transport-beast-general:checked ~ table tr.sheet-tab-transport-beast-general,
+input.sheet-tab-transport-beast-critical:checked ~ table tr.sheet-tab-transport-beast-critical,
+    /* Base of Operations Tabs */
 input.sheet-opt-rebel:checked ~ table tr td.sheet-opt-rebel,
 input.sheet-opt-business:checked ~ table tr td.sheet-opt-business,
 input.sheet-opt-homestead:checked ~ table tr td.sheet-opt-homestead,
-/* Companion Tabs */
+    /* Companion Tabs */
 input.sheet-tab-companion-info:checked ~ table tr td.sheet-tab-companion-info,
 input.sheet-tab-companion-combat:checked ~ table tr td.sheet-tab-companion-combat,
+input.sheet-tab-companion-critical:checked ~ table tr td.sheet-tab-companion-critical,
 input.sheet-tab-companion-inventory:checked ~ table tr td.sheet-tab-companion-inventory,
-/* GM Tabs */
+    /* NPC Tabs */
+input.sheet-tab-npc-info:checked ~ table tr td.sheet-tab-npc-info,
+input.sheet-tab-npc-combat:checked ~ table tr td.sheet-tab-npc-combat,
+input.sheet-tab-npc-critical:checked ~ table tr td.sheet-tab-npc-critical,
+input.sheet-tab-npc-inventory:checked ~ table tr td.sheet-tab-npc-inventory,
+    /* GM Tabs */
 input.sheet-tab-gm-combat:checked ~ table tr td.input.sheet-tab-gm-combat,
+input.sheet-tab-gm-settings:checked ~ table tr td.input.sheet-tab-gm-settings,
 input.sheet-tab-gm-weapons:checked ~ table tr td.sheet-tab-gm-weapons,
+input.sheet-tab-npc:checked ~ table tr td.sheet-tab-npc,
 input.sheet-tab-group-base-details:checked ~ table tr td.sheet-tab-group-base-details,
 input.sheet-tab-group-shared:checked ~ table tr td.sheet-tab-group-shared,
-input.sheet-tab-gm-adversaries:checked ~ table tr td.sheet-tab-gm-adversaries
-{
+input.sheet-tab-gm-adversaries:checked ~ table tr td.sheet-tab-gm-adversaries {
     display: table-row;
 }
 
@@ -220,34 +361,48 @@ input.sheet-opt-ship:checked ~ table tr td.sheet-opt-ship,
 input.sheet-tab-v-details:checked ~ div.sheet-tab-v-details,
 input.sheet-tab-v-weapons:checked ~ div.sheet-tab-v-weapons,
 input.sheet-tab-older:checked ~ div.sheet-tab-older,
-/* New Vehicle Tabs */
+    /* New Vehicle Tabs */
 input.sheet-tab-transport-space:checked ~ table tr.sheet-tab-transport-space,
 input.sheet-tab-transport-planetary:checked ~ table tr.sheet-tab-transport-planetary,
 input.sheet-tab-transport-beast:checked ~ table tr.sheet-tab-transport-beast,
-/* Base of Operations Tabs */
+input.sheet-tab-transport-space-general:checked ~ table tr.sheet-tab-transport-space-general,
+input.sheet-tab-transport-space-critical:checked ~ table tr.sheet-tab-transport-space-critical,
+input.sheet-tab-transport-planetary-general:checked ~ table tr.sheet-tab-transport-planetary-general,
+input.sheet-tab-transport-planetary-critical:checked ~ table tr.sheet-tab-transport-planetary-critical,
+input.sheet-tab-transport-beast-general:checked ~ table tr.sheet-tab-transport-beast-general,
+input.sheet-tab-transport-beast-critical:checked ~ table tr.sheet-tab-transport-beast-critical,
+    /* Base of Operations Tabs */
 input.sheet-opt-rebel:checked ~ table tr td.sheet-opt-rebel,
 input.sheet-opt-business:checked ~ table tr td.sheet-opt-business,
 input.sheet-opt-homestead:checked ~ table tr td.sheet-opt-homestead,
-/* Companion Tabs */
+    /* Companion Tabs */
 input.sheet-tab-companion-info:checked ~ table tr td.sheet-tab-companion-info,
 input.sheet-tab-companion-stp:checked ~ table tr td.sheet-tab-companion-stp,
 input.sheet-tab-companion-combat:checked ~ table tr td.sheet-tab-companion-combat,
+input.sheet-tab-companion-critical:checked ~ table tr td.sheet-tab-companion-critical,
 input.sheet-tab-companion-inventory:checked ~ table tr td.sheet-tab-companion-inventory,
-/* GM Tabs */
+    /* NPC Tabs */
+input.sheet-tab-npc-info:checked ~ table tr td.sheet-tab-npc-info,
+input.sheet-tab-npc-stp:checked ~ table tr td.sheet-tab-npc-stp,
+input.sheet-tab-npc-combat:checked ~ table tr td.sheet-tab-npc-combat,
+input.sheet-tab-npc-critical:checked ~ table tr td.sheet-tab-npc-critical,
+input.sheet-tab-npc-inventory:checked ~ table tr td.sheet-tab-npc-inventory,
+    /* GM Tabs */
 input.sheet-tab-gm-combat:checked ~ table tr td.input.sheet-tab-gm-combat,
+input.sheet-tab-gm-settings:checked ~ table tr td.input.sheet-tab-gm-settings,
 input.sheet-tab-gm-weapons:checked ~ table tr td.sheet-tab-gm-weapons,
+input.sheet-tab-npc:checked ~ table tr td.sheet-tab-npc,
 input.sheet-tab-group-base-details:checked ~ table tr td.sheet-tab-group-base-details,
 input.sheet-tab-group-shared:checked ~ table tr td.sheet-tab-group-shared,
-input.sheet-tab-gm-adversaries:checked ~ table tr td.sheet-tab-gm-adversaries
-{
+input.sheet-tab-gm-adversaries:checked ~ table tr td.sheet-tab-gm-adversaries {
     display: table-cell;
 }
 
 input.sheet-opt {
     height: 30px;
-    margin-right:120px;
-    border:none;
-    outline:none;
+    margin-right: 120px;
+    border: none;
+    outline: none;
     position: relative;
     cursor: pointer;
     z-index: 1;
@@ -257,20 +412,20 @@ input.sheet-opt::after {
     content: attr(title);
     text-align: left;
     display: block;
-    color:#444;
+    color: #444;
     width: 120px;
-    padding-left:20px;
+    padding-left: 20px;
     line-height: 30px;
     font-size: 16px;
 }
 
 input.sheet-opt-vehicle {
-    margin-left:10px;    
+    margin-left: 10px;
 }
 
 input.sheet-opt:active,
 input.sheet-op:focus {
-    outline:none;
+    outline: none;
 }
 
 /* START TAB CODE */
@@ -285,9 +440,10 @@ input.sheet-tab-new {
 }
 
 span.sheet-tab-new {
-    background: #ff0b02 none repeat scroll 0 0;
+    border: 1px solid #e01009;
+    background-color: white;
     border-radius: 4px;
-    color: white;
+    color: #e01009;
     cursor: pointer;
     font-size: 13px;
     font-weight: bold;
@@ -295,103 +451,175 @@ span.sheet-tab-new {
     margin-left: -122px;
     position: relative;
     text-align: center;
-    line-height:20px;
+    line-height: 20px;
     width: 120px;
 }
 
 input.sheet-tab-new:checked + span {
-    background: #dea710 none repeat scroll 0 0;
+    background: #e01009 none repeat scroll 0 0;
+    /*background: #b5aa8d none repeat scroll 0 0;*/
+    /*background-image: -webkit-linear-gradient(top, #b5aa8d, #e3d8ba);*/
+    /*background-image: -moz-linear-gradient(top, #b5aa8d, #e3d8ba);*/
+    /*background-image: -o-linear-gradient(top, #b5aa8d, #e3d8ba);*/
+    /*background-image: linear-gradient(to bottom, #b5aa8d, #e3d8ba);*/
     border-radius: 4px;
-    color: black;
+    font-weight: bold;
+    color: white;
+    /*color: #692927;*/
 }
 
 /* END TAB CODE */
 
-div.sheet-tab-content { 
-    display: none; 
-    border-top:1px solid #444;
-    margin-top:2px;
+div.sheet-tab-content {
+    display: none;
+    border-top: 1px solid #444;
+    margin-top: 2px;
+}
+
+div.sheet-separator {
+    border-top: 1px solid #444;
+    margin-top: 5px;
 }
 
 /* Top Level Tabs */
 input.sheet-tab-character-sheet:checked ~ div.sheet-tab-character-sheet,
 input.sheet-tab-ship-sheet:checked ~ div.sheet-tab-ship-sheet,
 input.sheet-tab-base-sheet:checked ~ div.sheet-tab-base-sheet,
-input.sheet-tab-gm-dice:checked ~ div.sheet-tab-gm-dice,
 input.sheet-tab-companion-sheet:checked ~ div.sheet-tab-companion-sheet,
-
-/* Character Sheet Tab SubTabs */
+input.sheet-tab-npc-sheet:checked ~ div.sheet-tab-npc-sheet, /* NPC Short Sheet*/
+input.sheet-tab-gm-dice:checked ~ div.sheet-tab-gm-dice,
+    /* Character Sheet Tab SubTabs */
 input.sheet-tab-character:checked ~ div.sheet-tab-character,
 input.sheet-tab-skills:checked ~ div.sheet-tab-skills,
 input.sheet-tab-talents:checked ~ div.sheet-tab-talents,
 input.sheet-tab-weapons:checked ~ div.sheet-tab-weapons,
 input.sheet-tab-notes:checked ~ div.sheet-tab-notes,
-
-/* Vehicle Sheet Tab SubTabs */
+input.sheet-tab-critical:checked ~ div.sheet-tab-critical,
+    /* Vehicle Sheet Tab SubTabs */
 input.sheet-tab-v-details:checked ~ div.sheet-tab-v-details,
 input.sheet-tab-v-weapons:checked ~ div.sheet-tab-v-weapons,
 input.sheet-tab-older:checked ~ div.sheet-tab-older,
 input.sheet-tab-transport-space:checked ~ div.sheet-tab-transport-space,
 input.sheet-tab-transport-planetary:checked ~ div.sheet-tab-transport-planetary,
 input.sheet-tab-transport-beast:checked ~ div.sheet-tab-transport-beast,
-
-/* Group Sheet Tab*/
+input.sheet-tab-transport-space-general:checked ~ div.sheet-tab-transport-space-general,
+input.sheet-tab-transport-space-critical:checked ~ div.sheet-tab-transport-space-critical,
+input.sheet-tab-transport-planetary-general:checked ~ div.sheet-tab-transport-planetary-general,
+input.sheet-tab-transport-planetary-critical:checked ~ div.sheet-tab-transport-planetary-critical,
+input.sheet-tab-transport-beast-general:checked ~ div.sheet-tab-transport-beast-general,
+input.sheet-tab-transport-beast-critical:checked ~ div.sheet-tab-transport-beast-critical,
+    /* Group Sheet Tab*/
 input.sheet-tab-base-details:checked ~ div.sheet-tab-base-details,
 input.sheet-tab-base-shared:checked ~ div.sheet-tab-base-shared,
-
-/* Group Sheet Tab SubTabs */
+    /* Group Sheet Tab SubTabs */
 input.sheet-tab-groupshared:checked ~ div.sheet-tab-groupshared,
-
-/* Group Sheet Tab Radio Buttons */
+    /* Group Sheet Tab Radio Buttons */
 input.sheet-opt-rebel:checked ~ div.sheet-opt-rebel,
 input.sheet-opt-business:checked ~ div.sheet-opt-business,
 input.sheet-opt-homestead:checked ~ div.sheet-opt-homestead,
-
-/* Companion Sub Tabs */
+    /* Companion Sub Tabs */
 input.sheet-tab-companion-info:checked ~ div.sheet-tab-companion-info,
 input.sheet-tab-companion-combat:checked ~ div.sheet-tab-companion-combat,
+input.sheet-tab-companion-critical:checked ~ div.sheet-tab-companion-critical,
 input.sheet-tab-companion-inventory:checked ~ div.sheet-tab-companion-inventory,
-
-/* gmdice Sheet Tab SubTabs */
+    /* Companion Sub Tabs */
+input.sheet-tab-npc-info:checked ~ div.sheet-tab-npc-info,
+input.sheet-tab-npc-combat:checked ~ div.sheet-tab-npc-combat,
+input.sheet-tab-npc-critical:checked ~ div.sheet-tab-npc-critical,
+input.sheet-tab-npc-inventory:checked ~ div.sheet-tab-npc-inventory,
+    /* gmdice Sheet Tab SubTabs */
 input.sheet-tab-gm-combat:checked ~ div.sheet-tab-gm-combat,
+input.sheet-tab-gm-settings:checked ~ div.sheet-tab-gm-settings,
 input.sheet-tab-gm-weapons:checked ~ div.sheet-tab-gm-weapons, /* Currently used for Group Mechanics sheet */
 input.sheet-tab-group-base-details:checked ~ div.sheet-tab-group-base-details, /* Group Base of Operations Copy*/
 input.sheet-tab-group-shared:checked ~ div.sheet-tab-group-shared, /* Group Shared Resources Copy*/
 input.sheet-tab-gm-adversaries:checked ~ div.sheet-tab-gm-adversaries /* Currently used for Campaign Details sheet */
-{
+ {
     display: block;
 }
 
-/* Roll Template Formatting */
+/* Roll Template Formatting - Critical */
 
-.sheet-rolltemplate-base table {
+.sheet-rolltemplate-critical table {
     width: 100%;
     border: 1px solid;
     color: black;
-	font-size: 1em;
-	font-family: "Helvetica Neue", Helvetica, sans-serif; 
+    font-size: 1em;
+    font-family: "Helvetica Neue", Helvetica, sans-serif;
 }
 
-.sheet-rolltemplate-base th {
+.sheet-rolltemplate-critical th {
     border-radius: 3px;
-    background-image: -webkit-linear-gradient(top, #485a6d, #2c3947);
-    background-image: -moz-linear-gradient(top, #485a6d, #2c3947);
-    background-image: -o-linear-gradient(top, #485a6d, #2c3947);
-    background-image: linear-gradient(to bottom, #485a6d, #2c3947);
+    background-image: -webkit-linear-gradient(top, #ff0505, #000000);
+    background-image: -moz-linear-gradient(top, #ff0505, #000000);
+    background-image: -o-linear-gradient(top, #ff0505, #000000);
+    background-image: linear-gradient(to bottom, #ff0505, #000000);
     -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
-	color: #ffffff;
-	padding: 2px;
-	line-height: 1.6em;
-	font-size: 1.2em;
+    color: #ffffff;
+    padding: 2px;
+    line-height: 1.6em;
+    font-size: 1.2em;
 }
 
-.sheet-rolltemplate-base .sheet-subheader {
-    font-size:0.8em;
-    padding:2px;
+.sheet-rolltemplate-critical .sheet-subheader {
+    font-size: 0.8em;
+    padding: 2px;
 }
 
-.sheet-rolltemplate-base .sheet-tcat-header {
+.sheet-rolltemplate-critical .sheet-tcat-header {
+    background-image: -webkit-linear-gradient(top, #ff0505, #000000);
+    background-image: -moz-linear-gradient(top, #ff0505, #000000);
+    background-image: -o-linear-gradient(top, #ff0505, #000000);
+    background-image: linear-gradient(to bottom, #ff0505, #000000);
+    -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
+    color: #ffffff;
+    padding: 2px;
+    line-height: 1.2em;
+    font-size: 0.8em;
+}
+
+.sheet-rolltemplate-critical td {
+    padding: 2px;
+}
+
+.sheet-rolltemplate-critical .sheet-tcat {
+    font-weight: bold;
+    padding: 2px;
+}
+
+.sheet-rolltemplate-critical .sheet-flavor {
+    font-style: italic;
+    padding: 2px;
+}
+
+.sheet-rolltemplate-critical tr:nth-child(odd) {
+    background-color: rgba(217, 217, 214, 1);
+    padding: 2px;
+}
+
+.sheet-rolltemplate-critical tr:nth-child(even) {
+    background-color: rgba(233, 233, 233, 1);
+    padding: 2px;
+}
+
+/* End Roll Template Formatting - Critical */
+
+/* Roll Template Formatting */
+
+.sheet-rolltemplate-base table, .sheet-rolltemplate-suggestion table {
+    width: 100%;
+    border: 1px solid;
+    color: black;
+    font-size: 1em;
+    font-family: "Helvetica Neue", Helvetica, sans-serif;
+}
+
+.sheet-rolltemplate-base th, .sheet-rolltemplate-suggestion th {
+    border-radius: 3px;
+    /* background: url(http://i.imgur.com/H8YkiDQ.jpg); */
+    /* Starfield */
     background-image: -webkit-linear-gradient(top, #485a6d, #2c3947);
     background-image: -moz-linear-gradient(top, #485a6d, #2c3947);
     background-image: -o-linear-gradient(top, #485a6d, #2c3947);
@@ -399,273 +627,328 @@ input.sheet-tab-gm-adversaries:checked ~ div.sheet-tab-gm-adversaries /* Current
     -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
     color: #ffffff;
-	padding: 2px;
-	line-height: 1.2em;
-	font-size: 0.8em; 
+    padding: 2px;
+    line-height: 1.6em;
+    font-size: 1.2em;
 }
 
-.sheet-rolltemplate-base td {
-   padding:2px;   
+.sheet-rolltemplate-base .sheet-subheader, .sheet-rolltemplate-suggestion .sheet-subheader {
+    font-size: 0.8em;
+    padding: 2px;
 }
 
-.sheet-rolltemplate-base .sheet-tcat {
+.sheet-rolltemplate-base .sheet-tcat-header, .sheet-rolltemplate-suggestion .sheet-tcat-header {
+    /* background: url(http://i.imgur.com/H8YkiDQ.jpg); */
+    /* Starfield */
+    background-image: -webkit-linear-gradient(top, #485a6d, #2c3947);
+    background-image: -moz-linear-gradient(top, #485a6d, #2c3947);
+    background-image: -o-linear-gradient(top, #485a6d, #2c3947);
+    background-image: linear-gradient(to bottom, #485a6d, #2c3947);
+    -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
+    color: #ffffff;
+    padding: 2px;
+    line-height: 1.2em;
+    font-size: 0.8em;
+}
+
+.sheet-rolltemplate-base td, .sheet-rolltemplate-suggestion td {
+    padding: 2px;
+}
+
+.sheet-rolltemplate-suggestion td {
+    width: 71px;
+}
+
+.sheet-rolltemplate-base .sheet-tcat, .sheet-rolltemplate-suggestion .sheet-tcat {
     font-weight: bold;
-    padding:2px;
+    padding: 2px;
 }
 
-.sheet-rolltemplate-base .sheet-flavor {
+.sheet-rolltemplate-base .sheet-flavor, .sheet-rolltemplate-suggestion .sheet-flavor {
     font-style: italic;
-    padding:2px;
+    padding: 2px;
 }
 
-.sheet-rolltemplate-base tr:nth-child(odd) {
-    background-color: rgba(217, 217, 214,1);
-    padding:2px;
+.sheet-rolltemplate-base tr:nth-child(odd), .sheet-rolltemplate-suggestion tr:nth-child(odd) {
+    background-color: rgba(217, 217, 214, 1);
+    padding: 2px;
 }
 
-.sheet-rolltemplate-base tr:nth-child(even) {
-	background-color: rgba(233, 233, 233,1);
-    padding:2px;
+.sheet-rolltemplate-base tr:nth-child(even), .sheet-rolltemplate-suggestion tr:nth-child(even) {
+    background-color: rgba(233, 233, 233, 1);
+    padding: 2px;
 }
 
+/* End Roll Template Formatting - Base */
+
 /* Custom Show Hide
  * ------------------------------------ */
+.sheet-player-dice,
 .sheet-player-sheet,
 .sheet-gm-sheet {
-    display: none; 
+    display: none;
 }
 
 input.sheet-player:checked ~ .sheet-player-sheet,
-input.sheet-gm:checked ~ .sheet-gm-sheet{
-    display: inline-block;  
+input.sheet-gm:checked ~ .sheet-gm-sheet {
+    display: inline-block;
 }
- 
+
+input.sheet-player:checked ~ .sheet-player-dice {
+    display: block;
+}
+
 input.sheet-gm:checked ~ div.sheet-tab-content {
-    display: none;  
+    display: none;
 }
- 
+
 input.sheet-gm:checked ~ div.sheet-tab-gm-dice {
-    display: block;  
+    display: block;
 }
 
 /* ------------------------------------ */
 
 .charsheet {
-    padding:0px !important;
-    margin:0px !important;    
+    padding: 0px !important;
+    margin: 0px !important;
 }
 
 .charsheet input[type=number] {
-    text-align:right;
-    cursor:pointer;
+    text-align: right;
+    cursor: pointer;
 }
 
-.charsheet input[type=text], 
-.charsheet textarea, 
+.charsheet input[type=text],
+.charsheet textarea,
 .charsheet select {
-    width:100%;
-    height:auto;
-    margin-bottom:0px;
+    width: 100%;
+    height: auto;
+    margin-bottom: 0px;
 }
 
-.charsheet input, 
+.charsheet input,
 .charsheet textarea {
-    background:#e3e3e3;
+    background: #e3e3e3;
 }
 
-.charsheet input:focus, 
+.charsheet input:focus,
 .charsheet textarea:focus {
-    background:#fff;
+    background: #fff;
 }
 
 .charsheet textarea {
-    width:calc(100% - 15px);
-    height:auto;
-    text-align:left;
+    width: calc(100% - 15px);
+    height: auto;
+    text-align: left;
 }
 
 .charsheet label {
-    font-size:11px;
-    color:#444;
-    margin:0px;
-    padding:0px;
+    font-size: 11px;
+    color: #444;
+    margin: 0px;
+    padding: 0px;
 }
 
 .charsheet table {
-    width:100%;
-    background-image: url('http://i.imgur.com/4biHABZ.jpg');/* Grey Background */
-    background-position:center center;
-    background-repeat:repeat;
+    width: 100%;
+    background-image: url('http://i.imgur.com/4biHABZ.jpg'); /* Grey Background */
+    background-position: center center;
+    background-repeat: repeat;
 }
 
 .charsheet table tr th {
-    text-align:left;
-    background:#444;
-    color:#f3f3f3;
-    padding:3px 5px;
+    text-align: left;
+    background: #444;
+    color: #f3f3f3;
+    padding: 3px 5px;
 }
 
 .charsheet table tr th:last-child {
-    background-image: url('http://i.imgur.com/iZPF9he.png');/* Blank white space */
+    background-image: url('http://i.imgur.com/iZPF9he.png'); /* Blank white space */
     background-position: right bottom;
-    background-repeat:no-repeat;
+    background-repeat: no-repeat;
 }
 
 .charsheet table tr td {
-    text-align:left;
-    padding:3px 5px;
-    border-bottom:1px dotted #ccc;
+    text-align: left;
+    padding: 3px 5px;
+    border-bottom: 1px dotted #ccc;
 }
 
 .charsheet table tr:hover td {
-    background-color:#f1f1f1;
+    background-color: #f1f1f1;
+}
+
+.sheet-bg-gray label {
+    color: #eee
 }
 
-.sheet-bg-gray label {color:#eee}
 .sheet-bg-gray td,
 .sheet-bg-gray:hover td,
-
 .charsheet .sheet-sub-header,
-.charsheet .sheet-sub-header:hover{
-    background:#D3D3D3;
-    color:#eee;
+.charsheet .sheet-sub-header:hover {
+    background: #D3D3D3;
+    color: #eee;
+}
+
+.sheet-bg-blue label {
+    color: #fff
 }
 
-.sheet-bg-blue label {color:#fff}
 .sheet-bg-blue td,
 .sheet-bg-blue:hover td,
-
 .charsheet .sheet-sub-header,
-.charsheet .sheet-sub-header:hover{
-    background:#78728f;
-    color:#fff;
+.charsheet .sheet-sub-header:hover {
+    background: #78728f;
+    color: #fff;
 }
 
 .charsheet table tr td.sheet-div-right {
-    border-right:1px solid #ccc    
+    border-right: 1px solid #ccc
 }
 
 .charsheet h3 {
-    background-image: url('http://i.imgur.com/dulnTTi.png'), url('http://i.imgur.com/oWaNr2C.png');/* Stretched hexagon, Grey Title lines*/
+    /* background-image: url('http://i.imgur.com/dulnTTi.png'), url('http://i.imgur.com/2bOTD87.png'); */
+    /* Stretched hexagon, Grey Title lines*/
+    /* background-image: url('http://i.imgur.com/dulnTTi.png'), url('http://i.imgur.com/oWaNr2C.png'); */
+    /* Stretched hexagon, Grey Title lines*/
+    background-image: url('http://i.imgur.com/PAAMegP.png'), url('http://i.imgur.com/oWaNr2C.png'); /* Stretched hexagon, Grey Title lines*/
     background-position: center top, center 5px;
-    background-repeat:no-repeat, repeat-x;
-    line-height:40px;
-    padding:0;
-    margin:0;
-    text-align:center;
-    color:#fff;
+    background-repeat: no-repeat, repeat-x;
+    line-height: 40px;
+    padding: 0;
+    margin: 0;
+    text-align: center;
+    color: #fff;
 }
 
 .charsheet .sheet-sub-header,
-.charsheet .sheet-sub-header:hover{
-    background:#485a6d;
-    color:#fff;
+.charsheet .sheet-sub-header:hover {
+    background: #485a6d;
+    color: #fff;
 }
 
 /* ------------------------------------------------- Dice Pool */
 
 .sheet-section-1 {
-    padding-bottom:10px;
+    padding-bottom: 10px;
 }
 
 .sheet-section-1 .sheet-column {
-    margin-bottom:0px;
-    margin:0 0;
-    width:100%
+    margin-bottom: 0px;
+    margin: 0 0;
+    width: 100%
 }
 
-.sheet-dice-pool {border-bottom:1px solid #444;}
+.sheet-dice-pool {
+    border-bottom: 1px solid #444;
+}
 
 .sheet-dice-pool img {
-    width:20px;
-    margin:4px 0 0 -10px;
-    padding:0px;
-    position:absolute;
+    width: 20px;
+    margin: 4px 0 0 -10px;
+    padding: 0px;
+    position: absolute;
 }
 
 .sheet-dice-pool .sheet-note {
-    font-size:10px;
-    font-weight:normal;
-    color:#d3d3d3;
+    font-size: 10px;
+    font-weight: normal;
+    color: #c1c9c2;
 }
 
 .sheet-dice-pool td,
 .sheet-dice-pool tr:hover td {
-    background:#444;    
+    background: #444;
 }
 
 .sheet-dice-pool td.sheet-light,
 .sheet-dice-pool td.sheet-dark,
 .sheet-dice-pool td.sheet-force {
-    text-align:center;
+    text-align: center;
 }
 
 .sheet-dice-pool td.sheet-light:nth-child(1),
 .sheet-dice-pool td.sheet-dark:nth-child(5) {
-    text-align:right;
+    text-align: right;
 }
 
 .sheet-dice-pool td.sheet-light:nth-child(3),
 .sheet-dice-pool td.sheet-dark:nth-child(7) {
-    text-align:left;
+    text-align: left;
 }
 
 .sheet-dice-pool td.sheet-force {
-    border-left:1px solid #777;
-    border-right:1px solid #777;
+    border-left: 1px solid #d1cbcb;
+    border-right: 1px solid #d1cbcb;
 }
 
-.sheet-dice-pool td.sheet-force {border-bottom:none}
-.sheet-dice-pool td.sheet-light {}
-.sheet-dice-pool td.sheet-dark {}
+.sheet-dice-pool td.sheet-force {
+    border-bottom: none
+}
+
+.sheet-dice-pool td.sheet-light {
+}
+
+.sheet-dice-pool td.sheet-dark {
+}
 
 .sheet-dice-pool td.sheet-light:nth-child(1) {
-    border-left:1px solid #999;
+    border-left: 1px solid #999;
 }
 
 .sheet-dice-pool td.sheet-upgrade,
 .sheet-dice-pool td.sheet-downgrade {
-    text-align:center !important;
-    border-bottom:1px solid #777;
-    border-top:1px solid #777;
+    text-align: center !important;
+    border-bottom: 1px solid #d1cbcb;
+    border-top: 1px solid #d1cbcb;
 }
 
 .sheet-dice-pool [type=number] {
-    background:#f3f3f3;
+    background: #f3f3f3;
     width: 50px !important;
-    height:40px;
-    font-size:20px;
-    font-weight:bold;
+    height: 40px;
+    font-size: 20px;
+    font-weight: bold;
 }
 
 .sheet-dice-pool [type=number]:focus {
-    background:#fff;
+    background: #fff;
 }
 
 .sheet-upgrade label,
 .sheet-downgrade label {
-    display:inline-block;
-    width:auto;
-    text-align:center;
-    color:#f3f3f3;
+    display: inline-block;
+    width: auto;
+    text-align: center;
+    color: #f3f3f3;
 }
 
 /* ------------------------------------------------- Soak, Wounds... */
 
 .sheet-swsd {
-   background: url('http://i.imgur.com/M8dBhzt.png') center -2px no-repeat;/* Character Sheet Stat connecting sword title - Border */
+    /* background: url('http://i.imgur.com/YBGDdGr.png') center -2px no-repeat; */
+    /* Character Sheet Stat connecting sword title - Border */
+    background: url('http://i.imgur.com/M8dBhzt.png') center -2px no-repeat; /* Character Sheet Stat connecting sword title - Border */
+}
+
+.sheet-swsd tr:hover td {
+    background-color: transparent;
+}
+
+.sheet-swsd tr td {
+    border: none;
 }
-.sheet-swsd tr:hover td {background-color:transparent;}
-.sheet-swsd tr td {border:none;}
 
 .sheet-swsd th {
-    font-size:10px;
-    font-weight:normal;
+    font-size: 10px;
+    font-weight: normal;
 }
 
 .sheet-swsd td {
-    text-align:center;
-    vertical-align:top;
+    text-align: center;
+    vertical-align: top;
 }
 
 .sheet-swsd td:nth-child(1),
@@ -673,144 +956,155 @@ input.sheet-gm:checked ~ div.sheet-tab-gm-dice {
 .sheet-swsd td:nth-child(3),
 .sheet-swsd td:nth-child(4),
 .sheet-swsd td:nth-child(5) {
-    background-image: url('http://i.imgur.com/cODj4n5.png');/* Threshold / Current - Border */
+    /* background-image: url('http://i.imgur.com/FxUooOF.png');*/
+    /* Threshold / Current - Border */
+    background-image: url('http://i.imgur.com/cODj4n5.png'); /* Threshold / Current - Border */
     background-position: center top;
-    background-repeat:no-repeat; 
-    width:153px;
-    height:87px;
+    background-repeat: no-repeat;
+    width: 153px;
+    height: 87px;
 }
 
 .sheet-swsd td:nth-child(3),
 .sheet-swsd td:nth-child(4),
 .sheet-swsd td:nth-child(5) {
     background-position: center center;
-    vertical-align:middle; 
+    vertical-align: middle;
 }
 
 .sheet-swsd tr:nth-child(2) td:nth-child(1),
-.sheet-beast tr:first-child td:nth-child(5){
-    background-image: url('http://i.imgur.com/cyPJPLg.png');/* Single Digit - Border */
+.sheet-beast tr:first-child td:nth-child(5) {
+    /*background-image: url('http://i.imgur.com/EaK5056.png');   *//*Single Digit - Border*/
+    background-image: url('http://i.imgur.com/cyPJPLg.png'); /*Single Digit - Border*/
     background-position: center top;
-    background-repeat:no-repeat; 
-    width:99px;
-    height:66px;
-    vertical-align:top;
+    background-repeat: no-repeat;
+    width: 99px;
+    height: 66px;
+    vertical-align: top;
 }
 
-.sheet-beast tr:first-child td:nth-child(5){
-    vertical-align:middle;
+/* background-image: url('http://i.imgur.com/H92wsCd.png'); Beast-Sil */
+/* Single Digit - Border */
+
+.sheet-beast tr:first-child td:nth-child(5) {
+    vertical-align: middle;
     background-position: center 60px;
 }
 
 .sheet-swsd tr:nth-child(2) td:nth-child(2) {
-    background:none;
-    width:auto;
-    height:auto;
+    background: none;
+    width: auto;
+    height: auto;
 }
 
 .sheet-swsd tr:nth-child(2) td:nth-child(1) label.sheet-label-title {
-    text-align:center;
-    color:#fff;
-    font-weight:bold;
-    line-height:15px;
-    padding-bottom:4px;
-    font-size:14px;
-    display:block;
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    line-height: 15px;
+    padding-bottom: 4px;
+    font-size: 14px;
+    display: block;
 }
 
 .sheet-beast tr:first-child td:nth-child(5) label.sheet-label-title {
-    padding-bottom:0px;
-    margin-bottom:0px;
+    padding-bottom: 0px;
+    margin-bottom: 0px;
 }
 
 label.sheet-label-title {
-    text-align:center;
-    color:#fff;
-    font-size:13px;
-    line-height:25px;
-    padding-bottom:6px;
+    text-align: center;
+    color: #fff;
+    font-size: 13px;
+    line-height: 25px;
+    padding-bottom: 6px;
 }
 
+label.sheet-label-committed,
 label.sheet-label-threshold,
 label.sheet-label-current,
 label.sheet-label-range,
 label.sheet-label-melee {
-    color:#fff;
-    font-size:9px;
-    font-weight:normal;
-    display:inline-block;
-    width:auto;
-    padding:0 5px;
+    color: #fff;
+    font-size: 9px;
+    font-weight: normal;
+    display: inline-block;
+    width: auto;
+    padding: 0 5px;
 }
+
 label.sheet-label-current-speed,
 label.sheet-label-threshold-speed {
-    color:#fff;
-    font-size:9px;
-    font-weight:normal;
-    display:inline-block;
-    width:auto;
-    padding:0 10px;
+    color: #fff;
+    font-size: 9px;
+    font-weight: normal;
+    display: inline-block;
+    width: auto;
+    padding: 0 10px;
 }
 
 label.sheet-label-current {
-    padding-right:16px;
+    padding-right: 16px;
 }
 
 .charsheet .sheet-swsd [type=number] {
-    font-size:16px;
-    font-weight:bold;
-    text-align:right;
-    width:50px !important;
+    font-size: 16px;
+    font-weight: bold;
+    text-align: right;
+    width: 50px !important;
 }
 
-.sheet-destiny td:nth-child(1)
-{
+.sheet-destiny td:nth-child(1) {
     margin-left: auto;
     margin-right: auto;
-    width:250px;
-    height:66px;
-    vertical-align:top;
+    width: 250px;
+    height: 66px;
+    vertical-align: top;
 }
 
-.sheet-destiny td:nth-child(3)
-{
-    width:99px;
-    height:66px;
-    vertical-align:middle;
+.sheet-destiny td:nth-child(3) {
+    width: 99px;
+    height: 66px;
+    vertical-align: middle;
 }
 
 .sheet-destiny td:nth-child(2),
-.sheet-destiny td:nth-child(4)
-{
-    text-align:center;
-    background-image: url('http://i.imgur.com/cyPJPLg.png');/* Single Digit - Border */
+.sheet-destiny td:nth-child(4) {
+    text-align: center;
+    /*background-image: url('http://i.imgur.com/EaK5056.png');   *//*Single Digit - Border*/
+    background-image: url('http://i.imgur.com/cyPJPLg.png'); /*Single Digit - Border*/
     background-position: center top;
-    background-repeat:no-repeat; 
-    width:99px;
-    height:66px;
-    vertical-align:top;
+    background-repeat: no-repeat;
+    width: 99px;
+    height: 66px;
+    vertical-align: top;
 }
 
 .sheet-destiny {
-   background-image:none;
+    background-image: none;
 }
 
-.sheet-destiny tr td {border:none;}
-.sheet-destiny tr:hover td {background-color:transparent;}
+.sheet-destiny tr td {
+    border: none;
+}
+
+.sheet-destiny tr:hover td {
+    background-color: transparent;
+}
 
 .sheet-destiny label {
-    text-align:center;
-    color:#fff;
-    font-weight:bold;
-    line-height:15px;
-    padding-bottom:4px;
-    font-size:14px;
-    display:block;
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    line-height: 15px;
+    padding-bottom: 4px;
+    font-size: 14px;
+    display: block;
 }
 
 .sheet-destiny [type=number] {
-    font-size:14px;
-    font-weight:bold;
+    font-size: 14px;
+    font-weight: bold;
 }
 
 /* ------------------------------------------------- Characteristics */
@@ -821,138 +1115,143 @@ label.sheet-label-current {
 .sheet-characteristics td:nth-child(7),
 .sheet-characteristics td:nth-child(9),
 .sheet-characteristics td:nth-child(11),
-.sheet-characteristics td:nth-child(13)
-{
-    text-align:center;
-    background-image: url('http://i.imgur.com/cyPJPLg.png');/* Single Digit - Border */
+.sheet-characteristics td:nth-child(13) {
+    text-align: center;
+    /*background-image: url('http://i.imgur.com/EaK5056.png'); *//* Single Digit - Border */
+    background-image: url('http://i.imgur.com/cyPJPLg.png'); /* Single Digit - Border */
     background-position: center top;
-    background-repeat:no-repeat; 
-    width:99px;
-    height:66px;
-    vertical-align:top;
+    background-repeat: no-repeat;
+    width: 99px;
+    height: 66px;
+    vertical-align: top;
 }
 
 .sheet-characteristics {
-   background-image:none;
+    background-image: none;
 }
 
-.sheet-characteristics tr td {border:none;}
-.sheet-characteristics tr:hover td {background-color:transparent;}
+.sheet-characteristics tr td {
+    border: none;
+}
+
+.sheet-characteristics tr:hover td {
+    background-color: transparent;
+}
 
 .sheet-characteristics label {
-    text-align:center;
-    color:#fff;
-    font-weight:bold;
-    line-height:15px;
-    padding-bottom:4px;
-    font-size:14px;
-    display:block;
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    line-height: 15px;
+    padding-bottom: 4px;
+    font-size: 14px;
+    display: block;
 }
 
 .sheet-characteristics [type=number] {
-    font-size:14px;
-    font-weight:bold;
+    font-size: 14px;
+    font-weight: bold;
 }
 
 /* Critical */
 
 .sheet-critical tr td {
-    border-bottom:none;
+    border-bottom: none;
 }
 
 .sheet-critical {
-    border-bottom:1px dotted #999;
+    border-bottom: 1px dotted #999;
 }
 
 .sheet-critical:hover {
-    background:#f1f1f1;
+    background: #f1f1f1;
 }
 
 .sheet-roll-critical,
 .sheet-roll-critical tr td,
 .sheet-roll-critical tr:hover td {
-    background-color:#444;
-    border:none;
-    color:#ccc
+    background-color: #444;
+    border: none;
+    color: #ccc
 }
 
 .sheet-crit-dice-bg {
-    background-image:url('http://i.imgur.com/UqQCDZ6.png');/* Four Boxes - Dice Border */
-    background-position:center center;
-    background-repeat:no-repeat;
+    background-image: url('http://i.imgur.com/UqQCDZ6.png'); /* Four Boxes - Dice Border */
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 
 .sheet-roll-critical label {
-    color:#ccc;    
+    color: #ccc;
 }
 
 [name="attr_critAddRangeNum"],
 [name="attr_critShipAddRangeNum"],
 [name="attr_critAddOffset"],
-[name="attr_critShipAddOffset"]{
-    background:#ccc;
+[name="attr_critShipAddOffset"] {
+    background: #ccc;
 }
 
 .sheet-critical {
-    display:none;
+    /*display: none;*/
 }
 
 .sheet-checkbox-criton {
-    display:none; 
+    display: none;
 }
 
 .sheet-checkbox-criton:checked + .sheet-critical {
-    display:block; 
+    display: block;
 }
 
 button.sheet-btn-lightSide[type=roll]::before {
-    content: '';    
+    content: '';
 }
 
 button.sheet-btn-lightSide[type=roll] {
-    white-space:nowrap;
-    font-size:15px;
-    margin:0;  
+    white-space: nowrap;
+    font-size: 15px;
+    margin: 0;
 }
 
 button.sheet-btn-heal-crit[type=roll]::before,
 button.sheet-btn-roll-crit[type=roll]::before,
 button.sheet-btn-add-crit[type=roll]::before {
-    content: '';    
+    content: '';
 }
 
-button.sheet-btn-heal-crit[type=roll], 
+button.sheet-btn-heal-crit[type=roll],
 button.sheet-btn-add-crit[type=roll],
 button.sheet-btn-roll-crit[type=roll] {
-    white-space:nowrap;
-    font-size:12px;
-    width:100%;
-    margin:0;
+    white-space: nowrap;
+    font-size: 12px;
+    width: 100%;
+    margin: 0;
 }
 
 button.sheet-btn-roll-crit[type=roll] {
-    color:#fff;
-    font-size:16px;
-    line-height:30px;
-    background: #65bd63;
-    border:none;
-    background-image: -webkit-linear-gradient(top, #485a6d, #2c3947);
-    background-image: -moz-linear-gradient(top, #485a6d, #2c3947);
-    background-image: -o-linear-gradient(top, #485a6d, #2c3947);
-    background-image: linear-gradient(to bottom, #485a6d, #2c3947);
+    color: #fff;
+    font-size: 16px;
+    line-height: 30px;
+    border: none;
+    background: red; /* For browsers that do not support gradients */
+    background: -webkit-linear-gradient(red, white); /* For Safari */
+    background: -o-linear-gradient(red, white); /* For Opera */
+    background: -moz-linear-gradient(red, white); /* For Firefox */
+    background: linear-gradient(red, white); /* Standard syntax (must be last) */
     -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
 }
 
 button.sheet-btn-roll-crit[type=roll]::before {
     content: 't ';
-    font-size:18px;
-    color:#fff;
+    font-size: 18px;
+    color: #fff;
 }
 
 button.sheet-btn-roll-crit[type=roll]:focus {
-    outline:none;
-    border:none;
+    outline: none;
+    border: none;
 }
 
 button.sheet-btn-roll-crit[type=roll]:active {
@@ -966,67 +1265,113 @@ button.sheet-btn-roll-crit[type=roll]:active {
 
 .sheet-skills td:nth-child(2),
 .sheet-skills td:nth-child(3),
-.sheet-skills td:nth-child(6){
-    width:50px;    
+.sheet-skills td:nth-child(6) {
+    width: 50px;
 }
 
 .sheet-init td:nth-child(2),
 .sheet-init td:nth-child(5),
 .sheet-skills td:nth-child(4) {
-    width:124px; 
-    background-image:url(http://i.imgur.com/xUqfqbd.gif);/*url('http://i.imgur.com/fY7gsGx.png'); Seven Boxes - Dice Border */
-    background-repeat:no-repeat;
-    background-position:3px center;
+    width: 124px;
+    background-image: url(http://i.imgur.com/xUqfqbd.gif); /*url('http://i.imgur.com/fY7gsGx.png'); Seven Boxes - Dice Border */
+    background-repeat: no-repeat;
+    background-position: 3px center;
 }
 
 .sheet-skills td:nth-child(5) {
-    width:124px;    
+    width: 124px;
 }
 
 .sheet-custome-skills td:nth-child(2) {
-    width:100px;  
+    width: 100px;
 }
 
 .sheet-custome-skills td:nth-child(3),
 .sheet-custome-skills td:nth-child(4),
 .sheet-custome-skills td:nth-child(7) {
-    width:50px;  
-    background-image:none;
+    width: 50px;
+    background-image: none;
 }
 
 .sheet-custome-skills td:nth-child(6) {
-    width:120px;    
+    width: 120px;
 }
 
 .sheet-custome-skills td:nth-child(5) {
-    width:124px;
-    background-image:url('http://i.imgur.com/xUqfqbd.gif');/* Seven Boxes - Dice Border */
-    background-repeat:no-repeat;
-    background-position:4px center;
+    width: 124px;
+    background-image: url('http://i.imgur.com/xUqfqbd.gif'); /* Seven Boxes - Dice Border */
+    background-repeat: no-repeat;
+    background-position: 4px center;
 }
 
 .sheet-skills th:nth-child(2),
 .sheet-skills td:nth-child(2),
 .sheet-custome-skills th:nth-child(3),
 .sheet-custome-skills td:nth-child(3) {
-    text-align:center;
+    text-align: center;
 }
 
 /* TIP HELP */
 
-.sheet-icon-S {background:url('http://galacticcampaigns.com/images/EotE/Symbols/S.png') center center no-repeat;}/* Success - Symbol */
-.sheet-icon-F {background:url('http://galacticcampaigns.com/images/EotE/Symbols/F.png') center center no-repeat;}/* Failure - Symbol */
-.sheet-icon-A {background:url('http://galacticcampaigns.com/images/EotE/Symbols/A.png') center center no-repeat;}/* Advantage - Symbol */
-.sheet-icon-Tri {background:url('http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png') center center no-repeat;}/* Triumph - Symbol */
-.sheet-icon-T {background:url('http://galacticcampaigns.com/images/EotE/Symbols/T.png') center center no-repeat;}/* Threat - Symbol */
-.sheet-icon-Des {background:url('http://galacticcampaigns.com/images/EotE/Symbols/Despair.png') center center no-repeat;}/* Despair - Symbol */
-.sheet-icon-B {background:url('http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png') center center no-repeat;}
-.sheet-icon-G {background:url('http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png') center center no-repeat;}
-.sheet-icon-Y {background:url('http://galacticcampaigns.com/images/EotE/Proficiency/ProficiencyBlank.png') center center no-repeat;}
-.sheet-icon-P {background:url('http://galacticcampaigns.com/images/EotE/Difficulty/DifficultyBlank.png') center center no-repeat;}
-.sheet-icon-R {background:url('http://galacticcampaigns.com/images/EotE/Challenge/ChallengeBlank.png') center center no-repeat;}
-.sheet-icon-BLK {background:url('http://galacticcampaigns.com/images/EotE/Setback/SetBackBlank.png') center center no-repeat;}
-.sheet-icon-W {background:url('http://galacticcampaigns.com/images/EotE/Force/ForceD.png') center center no-repeat;}/* Force Die - Black - Symbol */
+.sheet-icon-S {
+    background: url('http://galacticcampaigns.com/images/EotE/Symbols/S.png') center center no-repeat;
+}
+
+/* Success - Symbol */
+.sheet-icon-F {
+    background: url('http://galacticcampaigns.com/images/EotE/Symbols/F.png') center center no-repeat;
+}
+
+/* Failure - Symbol */
+.sheet-icon-A {
+    background: url('http://galacticcampaigns.com/images/EotE/Symbols/A.png') center center no-repeat;
+}
+
+/* Advantage - Symbol */
+.sheet-icon-Tri {
+    background: url('http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png') center center no-repeat;
+}
+
+/* Triumph - Symbol */
+.sheet-icon-T {
+    background: url('http://galacticcampaigns.com/images/EotE/Symbols/T.png') center center no-repeat;
+}
+
+/* Threat - Symbol */
+.sheet-icon-Des {
+    background: url('http://galacticcampaigns.com/images/EotE/Symbols/Despair.png') center center no-repeat;
+}
+
+/* Despair - Symbol */
+.sheet-icon-B {
+    background: url('http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png') center center no-repeat;
+}
+
+.sheet-icon-G {
+    background: url('http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png') center center no-repeat;
+}
+
+.sheet-icon-Y {
+    background: url('http://galacticcampaigns.com/images/EotE/Proficiency/ProficiencyBlank.png') center center no-repeat;
+}
+
+.sheet-icon-P {
+    background: url('http://galacticcampaigns.com/images/EotE/Difficulty/DifficultyBlank.png') center center no-repeat;
+}
+
+.sheet-icon-R {
+    background: url('http://galacticcampaigns.com/images/EotE/Challenge/ChallengeBlank.png') center center no-repeat;
+}
+
+.sheet-icon-BLK {
+    background: url('http://galacticcampaigns.com/images/EotE/Setback/SetBackBlank.png') center center no-repeat;
+}
+
+.sheet-icon-W {
+    background: url('http://galacticcampaigns.com/images/EotE/Force/ForceD.png') center center no-repeat;
+}
+
+/* Force Die - Black - Symbol */
 
 .sheet-icon-S,
 .sheet-icon-F,
@@ -1041,104 +1386,138 @@ button.sheet-btn-roll-crit[type=roll]:active {
 .sheet-icon-R,
 .sheet-icon-BLK,
 .sheet-icon-W {
-    background-size:15px 15px;
-    display:inline-block;
-    width:15px;
-    height:15px;
+    background-size: 15px 15px;
+    display: inline-block;
+    width: 15px;
+    height: 15px;
 }
 
 .sheet-skills label {
-    float:left;
-    width:auto;
+    float: left;
+    width: auto;
 }
 
 .sheet-tips {
-    float:left;
-    margin-left:5px;
+    float: left;
+    margin-left: 5px;
 }
 
-.sheet-help {display:none;}
-.sheet-help-def {display:block}
+.sheet-help {
+    display: none;
+}
 
-.sheet-tips:hover .sheet-help {display:block}
+.sheet-help-def {
+    display: block
+}
+
+.sheet-tips:hover .sheet-help {
+    display: block
+}
 
 .sheet-icon-question {
-    width:14px;
-    margin:auto;
-    line-height:14px;
-    display:block;
-    text-align:center;
-    color:#fff;
-    font-weight:bold;
-    background:#444;
+    width: 14px;
+    margin: auto;
+    line-height: 14px;
+    display: block;
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    background: #444;
     -webkit-border-radius: 7px;
     border-radius: 7px;
 }
 
 th .sheet-icon-question {
-    color:#444;
-    background:#fff;
+    color: #444;
+    background: #fff;
 }
 
 .sheet-help .sheet-icon {
-    position:absolute;
-    width:21px;
-    height:16px;
-    padding:4px 2px 2px 2px;
-    text-align:center;
-    margin-top:-2px;
-    cursor:pointer;
+    position: absolute;
+    width: 21px;
+    height: 16px;
+    padding: 4px 2px 2px 2px;
+    text-align: center;
+    margin-top: -2px;
+    cursor: pointer;
 }
 
-.sheet-help-def .sheet-icon {margin-left: 0px}
-.sheet-help-success .sheet-icon {margin-left: 25px}
-.sheet-help-advantage .sheet-icon {margin-left: 50px}
-.sheet-help-triumph .sheet-icon {margin-left: 75px}
-.sheet-help-threat .sheet-icon {margin-left: 100px}
-.sheet-help-despair .sheet-icon {margin-left: 125px}
-.sheet-help-failure .sheet-icon {margin-left: 150px}
+.sheet-help-def .sheet-icon {
+    margin-left: 0px
+}
+
+.sheet-help-success .sheet-icon {
+    margin-left: 25px
+}
+
+.sheet-help-advantage .sheet-icon {
+    margin-left: 50px
+}
+
+.sheet-help-triumph .sheet-icon {
+    margin-left: 75px
+}
+
+.sheet-help-threat .sheet-icon {
+    margin-left: 100px
+}
+
+.sheet-help-despair .sheet-icon {
+    margin-left: 125px
+}
+
+.sheet-help-failure .sheet-icon {
+    margin-left: 150px
+}
 
 .sheet-help-content {
-    position:absolute;
-    background:#fff;
-    border:1px solid #ccc;
-    display:none;
-    width:250px;
-    margin-left:-25px;
-    margin-top:19px;
-    padding:10px;
-    font-size:12px;
+    position: absolute;
+    background: #fff;
+    border: 1px solid #ccc;
+    display: none;
+    width: 250px;
+    margin-left: -25px;
+    margin-top: 19px;
+    padding: 10px;
+    font-size: 12px;
     -webkit-border-radius: 0px 3px 3px 3px;
     border-radius: 0px 3px 3px 3px;
     -webkit-box-shadow: 2px 2px 3px 0px rgba(50, 50, 50, 0.75);
     /* -moz-box-shadow:    2px 2px 3px 0px rgba(50, 50, 50, 0.75); */
-    box-shadow:         2px 2px 3px 0px rgba(50, 50, 50, 0.75);
+    box-shadow: 2px 2px 3px 0px rgba(50, 50, 50, 0.75);
 }
 
 th .sheet-help-content {
-    color:#444; 
+    color: #444;
     font-weight: normal;
 }
 
-.sheet-icon:hover ~ .sheet-help-content {display:block; z-index:10}
+.sheet-helper {
+    cursor: help;
+}
+
+.sheet-icon:hover ~ .sheet-help-content {
+    display: block;
+    z-index: 10
+}
 
 .sheet-icon:hover {
-    background:#fff;
-    border:1px solid #ccc;
-    border-bottom:1px solid #fff;
-    padding:3px 1px 1px 1px;
-    z-index:15;
+    background: #fff;
+    border: 1px solid #ccc;
+    border-bottom: 1px solid #fff;
+    padding: 3px 1px 1px 1px;
+    z-index: 15;
     -webkit-border-radius: 3px 3px 0px 0px;
     border-radius: 3px 3px 0px 0px;
 }
 
 .sheet-help-content h5 {
-    padding-bottom:8px;
+    padding-bottom: 8px;
 }
 
 .sheet-help-content ul li {
-    line-height:14px;
-    padding-bottom:8px;
+    line-height: 14px;
+    padding-bottom: 8px;
 }
 
 .sheet-force-rating label input {
@@ -1148,266 +1527,597 @@ th .sheet-help-content {
 /* -------------------------------------------------- Talents */
 
 .sheet-talents th:last-child {
-    background-image:none;
-    text-align:center;
+    background-image: none;
+    text-align: center;
 }
 
 .sheet-talent tr td {
-    border-bottom:none;
+    border-bottom: none;
 }
 
 .sheet-talent {
-    border-bottom:1px dotted #999;
+    border-bottom: 1px dotted #999;
 }
 
 .sheet-talent:hover {
-    background:#f1f1f1;
+    background: #f1f1f1;
 }
 
 [name=attr_talentname] {
-    font-weight:bold;    
+    font-weight: bold;
 }
 
 /* ------------------------------------------------- Weapons */
 
 .sheet-weapons td:nth-child(1),
 .sheet-weapons td:nth-child(9) {
-    width:20%;
+    width: 20%;
 }
 
 .sheet-weapons td:nth-child(2),
 .sheet-weapons td:nth-child(4),
 .sheet-weapons td:nth-child(6),
-.sheet-weapons td:nth-child(8)
-{
-    text-align:center;
-    background-image: url('http://i.imgur.com/cyPJPLg.png');/* Single Digit - Border */
+.sheet-weapons td:nth-child(8) {
+    text-align: center;
+    /*background-image: url('http://i.imgur.com/EaK5056.png'); *//* Single Digit - Border */
+    background-image: url('http://i.imgur.com/cyPJPLg.png'); /* Single Digit - Border */
     background-position: center top;
-    background-repeat:no-repeat; 
-    width:99px;
-    height:66px;
-    vertical-align:top;
+    background-repeat: no-repeat;
+    width: 99px;
+    height: 66px;
+    vertical-align: top;
 }
 
 .sheet-weapons {
-    background: url('http://i.imgur.com/oWaNr2C.png') center 45px repeat-x;/* Title Double Line */
+    /* background: url('http://i.imgur.com/2bOTD87.png') center 45px repeat-x; */
+    /* Title Double Line */
+    background: url('http://i.imgur.com/oWaNr2C.png') center 45px repeat-x; /* Title Double Line */
 }
 
-.sheet-weapons tr td {border:none;}
-.sheet-weapons tr:hover td {background-color:transparent;}
+.sheet-weapons tr td {
+    border: none;
+}
+
+.sheet-weapons tr:hover td {
+    background-color: transparent;
+}
 
 .sheet-weapons label {
-    text-align:center;
-    color:#fff;
-    font-weight:bold;
-    line-height:15px;
-    padding-bottom:4px;
-    font-size:14px;
-    display:block;
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    line-height: 15px;
+    padding-bottom: 4px;
+    font-size: 14px;
+    display: block;
 }
 
 .sheet-weapons [type=text] {
-    font-size:14px;
-    font-weight:bold;
-    width:50px;
-    text-align:center
+    font-size: 14px;
+    font-weight: bold;
+    width: 50px;
+    text-align: center
 }
 
 .sheet-weapons [type=roll] {
-    font-size:28px !important;
-    line-height:30px !important;
-    width:auto !important;
+    font-size: 28px !important;
+    line-height: 30px !important;
+    width: auto !important;
 }
 
 .sheet-attachments-wrapper {
-    position:relative;
-    padding-top:5px;
+    position: relative;
+    padding-top: 5px;
 }
 
 .sheet-view-attachments {
-    float:left;
-    margin-left:10px;
-    padding-bottom:15px;
-    position:relative;
+    float: left;
+    margin-left: 10px;
+    padding-bottom: 15px;
+    position: relative;
 }
 
 input.sheet-view-attachments {
-   margin-top:-28px;
+    margin-top: -28px;
 }
 
 label.sheet-view-attachments {
-    width:150px;
-    margin-top:-31px;
-    margin-left:30px;
+    width: 150px;
+    margin-top: -31px;
+    margin-left: 30px;
 }
 
 .sheet-attachments {
-    display:none;
+    display: none;
 }
 
 input.sheet-view-attachments:checked ~ .sheet-attachments {
-    display:table;
+    display: table;
 }
 
 .sheet-attachments th:last-child {
-    background:#444;
+    background: #444;
 }
 
-
-
 /* ---------------------------------------------------------- Ship */
 
 .sheet-ship {
-    background:url('http://i.imgur.com/R7CME69.png') center center no-repeat;/* Vehicle Sheet Stat connecting sword title - Border */
-    background-color:transparent;
+    /* background:url('http://i.imgur.com/6yMYyrt.png') center center no-repeat; */
+    /* Vehicle Sheet Stat connecting sword title - Border */
+    background: url('http://i.imgur.com/R7CME69.png') center center no-repeat; /* Vehicle Sheet Stat connecting sword title - Border */
+    background-color: transparent;
 }
 
 table.sheet-ship tr td {
-    border:none;
-    background-color:transparent;
+    border: none;
+    background-color: transparent;
 }
 
 table.sheet-ship tr:hover td {
-    background-color:transparent;
+    background-color: transparent;
 }
 
 .sheet-ship-defense {
-    background:url('http://i.imgur.com/VaTaF9r.png') center center no-repeat;/* Starship Four Zones - Border */
-    width:302px;
-    height:236px;
-    text-align:center; 
-    vertical-align:top;
+    /* background:url('http://i.imgur.com/IAOS820.png') center center no-repeat; */
+    /* Starship Four Zones - Border */
+    background: url('http://i.imgur.com/VaTaF9r.png') center center no-repeat; /* Starship Four Zones - Border */
+    width: 302px;
+    height: 236px;
+    text-align: center;
+    vertical-align: top;
+}
+
+.sheet-planetary-vehicle-defense {
+    /* background:url('http://i.imgur.com/jvox6Kl.png') center center no-repeat; */
+    /* Planetary Four Zones - Border */
+    background: url('http://i.imgur.com/JwhFORw.png') center center no-repeat; /* Speeder Four Zones - Border */
+    width: 302px;
+    height: 236px;
+    text-align: center;
+    vertical-align: top;
 }
 
 .sheet-ship-char-thre-bg {
-    background-image: url('http://i.imgur.com/cODj4n5.png');/* Threshold / Current - Border */
+    /* background-image: url('http://i.imgur.com/FxUooOF.png'); */
+    /* Threshold / Current - Border */
+    background-image: url('http://i.imgur.com/cODj4n5.png'); /* Threshold / Current - Border */
     background-position: center 0px;
-    background-repeat:no-repeat; 
-    vertical-align:top;
-    width: 33%;/*153px;*/
-    height:87px;
-    text-align:center;
+    background-repeat: no-repeat;
+    vertical-align: top;
+    width: 33%; /*153px;*/
+    height: 87px;
+    text-align: center;
 }
 
 .sheet-ship-char-thre-bg-speed {
-    background-image: url('http://i.imgur.com/cODj4n5.png');/* Threshold / Current - Border */
+    /* background-image: url('http://i.imgur.com/FxUooOF.png');*/
+    /* Threshold / Current - Border */
+    background-image: url('http://i.imgur.com/cODj4n5.png'); /* Threshold / Current - Border */
     background-position: center 25px;
-    background-repeat:no-repeat; 
-    vertical-align:top;
-    width: 33%;/*153px;*/
-    height:87px;
-    text-align:center;
-    padding-top:28px;
+    background-repeat: no-repeat;
+    vertical-align: top;
+    width: 33%; /*153px;*/
+    height: 87px;
+    text-align: center;
+    padding-top: 28px;
 }
 
 .sheet-ship-char-bg {
-    text-align:center;
-    background-image: url('http://i.imgur.com/cyPJPLg.png');/* Single Digit - Border */
+    text-align: center;
+    /*background-image: url('http://i.imgur.com/EaK5056.png');   *//*Single Digit - Border*/
+    background-image: url('http://i.imgur.com/cyPJPLg.png'); /*Single Digit - Border*/
     background-position: center 37px;
-    background-repeat:no-repeat; 
-    width:99px;
-    height:66px;
-    vertical-align:top;
-    text-align:center;
-    padding-top:40px;
+    background-repeat: no-repeat;
+    width: 99px;
+    height: 66px;
+    vertical-align: top;
+    padding-top: 40px;
 }
 
-.sheet-ship-char-bg  label {
-    text-align:center;
-    color:#fff;
-    font-weight:bold;
-    line-height:15px;
-    padding-bottom:4px;
-    font-size:13px;
-    display:block;
+.sheet-ship-char-bg label {
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    line-height: 15px;
+    padding-bottom: 4px;
+    font-size: 13px;
+    display: block;
+}
+
+.sheet-ship-char-bg.sheet-armor {
+    width: 26%;
+    padding-top: 3px;
+    background-position: center 0;
 }
 
 .sheet-ship [type=number] {
-    font-size:16px;
-    font-weight:bold;
-    text-align:right;
-    width:50px !important;
+    font-size: 16px;
+    font-weight: bold;
+    text-align: right;
+    width: 50px !important;
 }
 
-.sheet-ship-char-bg  [type=number] {
-    font-size:14px;
+.sheet-ship-char-bg [type=number] {
+    font-size: 14px;
 }
 
 .sheet-ship-defense label {
-    color:#fff; 
-    text-align:center
+    color: #fff;
+    text-align: center
+}
+
+.sheet-planetary-vehicle-defense label {
+    color: #fff;
+    text-align: center
 }
 
 .sheet-def-label {
-    position:absolute;
-    width:50px;
-    margin-left:220px;
-    margin-top:48px;
-    font-size:14px
+    position: absolute;
+    width: 50px;
+    margin-left: 220px;
+    margin-top: 48px;
+    font-size: 14px
 }
 
 .sheet-fore,
 .sheet-starboard,
 .sheet-aft,
 .sheet-port {
-    width:99px;
-    height:66px;
-    position:absolute;
+    width: 99px;
+    height: 66px;
+    position: absolute;
 }
 
 .sheet-fore {
-    margin-left:99px;
-    margin-top:2px;
+    margin-left: 99px;
+    margin-top: 2px;
 }
 
 .sheet-starboard {
-    margin-left:203px;
-    margin-top:91px;
+    margin-left: 203px;
+    margin-top: 91px;
 }
 
 .sheet-aft {
-    margin-left:99px;
-    margin-top:172px;
+    margin-left: 99px;
+    margin-top: 172px;
 }
 
 .sheet-port {
-    margin-left:0px;
-    margin-top:91px;
+    margin-left: 0px;
+    margin-top: 91px;
 }
 
-.sheet-firearc-field {width:32px; height:32px; padding:1px 0 0 0; vertical-align:top}
+.sheet-firearc-field {
+    width: 32px;
+    height: 32px;
+    padding: 1px 0 0 0;
+    vertical-align: top
+}
 
 .sheet-fireArcFore,
 .sheet-fireArcStarboard,
 .sheet-fireArcAft,
 .sheet-fireArcPort {
-    position:absolute; 
-    z-index:5;
-    opacity:0.0;
+    position: absolute;
+    z-index: 5;
+    opacity: 0.0;
 }
 
-.sheet-fireArcFore {margin-left:10px; margin-top:0px}
-.sheet-fireArcStarboard {margin-left:20px; margin-top:10px}
-.sheet-fireArcAft {margin-left:10px; margin-top:20px}
-.sheet-fireArcPort {margin-left:0px; margin-top:10px}
+.sheet-fireArcFore {
+    margin-left: 10px;
+    margin-top: 0px
+}
+
+.sheet-fireArcStarboard {
+    margin-left: 20px;
+    margin-top: 10px
+}
+
+.sheet-fireArcAft {
+    margin-left: 10px;
+    margin-top: 20px
+}
+
+.sheet-fireArcPort {
+    margin-left: 0px;
+    margin-top: 10px
+}
 
 span.sheet-fireArcForeImg,
 span.sheet-fireArcStarboardImg,
 span.sheet-fireArcAftImg,
 span.sheet-fireArcPortImg {
-        background:url('http://i.imgur.com/DcWGIWp.png') left bottom no-repeat;/* Starship Weapon Firing Arcs */
-        display:block;
-        width:32px;
-        height:32px;
-        position:absolute;
+    background: url('http://i.imgur.com/DcWGIWp.png') left bottom no-repeat; /* Starship Weapon Firing Arcs */
+    display: block;
+    width: 32px;
+    height: 32px;
+    position: absolute;
 }
 
-span.sheet-fireArcForeImg {background-position:0px bottom}
-span.sheet-fireArcStarboardImg {background-position:-32px bottom}
-span.sheet-fireArcAftImg {background-position:-64px bottom}
-span.sheet-fireArcPortImg {background-position:-96px bottom}
+span.sheet-fireArcForeImg {
+    background-position: 0px bottom
+}
 
-.sheet-fireArcFore:checked ~ span.sheet-fireArcForeImg {background-position:0px top}
-.sheet-fireArcStarboard:checked ~ span.sheet-fireArcStarboardImg {background-position:-32px top}
-.sheet-fireArcAft:checked ~ span.sheet-fireArcAftImg {background-position:-64px top}
-.sheet-fireArcPort:checked ~ span.sheet-fireArcPortImg {background-position:-96px top}
\ No newline at end of file
+span.sheet-fireArcStarboardImg {
+    background-position: -32px bottom
+}
+
+span.sheet-fireArcAftImg {
+    background-position: -64px bottom
+}
+
+span.sheet-fireArcPortImg {
+    background-position: -96px bottom
+}
+
+.sheet-fireArcFore:checked ~ span.sheet-fireArcForeImg {
+    background-position: 0px top
+}
+
+.sheet-fireArcStarboard:checked ~ span.sheet-fireArcStarboardImg {
+    background-position: -32px top
+}
+
+.sheet-fireArcAft:checked ~ span.sheet-fireArcAftImg {
+    background-position: -64px top
+}
+
+.sheet-fireArcPort:checked ~ span.sheet-fireArcPortImg {
+    background-position: -96px top
+}
+
+div.sheet-footer {
+    border: 2px solid black;
+    padding: 10px;
+    margin: 10px auto;
+    box-shadow: 3px 3px 1px #888888;
+    width: 65%;
+}
+
+.sheet-npc-type {
+    display: inline;
+    margin-right: 1em;
+}
+
+label.sheet-npc-type input[type="radio"] {
+    margin-left: 5px;
+}
+
+label.sheet-npc-minion-group {
+    display: inline;
+}
+
+.sheet-npc-minion-title {
+    cursor: help;
+}
+
+.sheet-spacer {
+    padding: 1% 0%;
+}
+
+.sheet-textbox {
+    height: 164px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+/************************
+ * Sheet Toggle Section *
+ ************************/
+div.sheet-section-spacer {
+    margin-bottom: 20px;
+}
+
+/* Hide actual checkbox */
+input[type="checkbox"].sheet-toggle {
+    opacity: 0;
+    width: 16px;
+    height: 16px;
+    position: relative;
+    top: 5px;
+    left: 6px;
+    margin: -10px;
+    cursor: pointer;
+    z-index: 1;
+}
+
+/* Fake checkbox */
+input[type="checkbox"].sheet-toggle + span::before {
+    content: "►";
+    margin-left: .5em;
+}
+
+input[type="checkbox"].sheet-toggle:checked + span::before {
+    margin-right: 4px;
+    line-height: 14px;
+    text-align: center;
+    display: inline-block;
+    vertical-align: middle;
+
+    content: "▼";
+    width: 14px;
+    height: 14px;
+    font-size: 12px;
+}
+
+/* Header section */
+input.sheet-header-section-toggle:checked ~ div.sheet-header-section,
+input.sheet-top-section-toggle:checked ~ div.sheet-top-section,
+
+input.sheet-stats-section-toggle:checked ~ div.sheet-stats-section,
+input.sheet-destiny-section-toggle:checked ~ div.sheet-destiny-section,
+input.sheet-dice-section-toggle:checked ~ div.sheet-dice-section,
+input.sheet-motivations-section-toggle:checked ~ div.sheet-motivations-section,
+input.sheet-obligation-section-toggle:checked ~ div.sheet-obligation-section,
+input.sheet-assignment-section-toggle:checked ~ div.sheet-assignment-section,
+input.sheet-duties-section-toggle:checked ~ div.sheet-duties-section,
+input.sheet-morality-section-toggle:checked ~ div.sheet-morality-section,
+input.sheet-details-section-toggle:checked ~ div.sheet-details-section,
+input.sheet-npc-section-toggle:checked ~ div.sheet-npc-section,
+input.sheet-upgrades-section-toggle:checked ~ div.sheet-upgrades-section,
+input.sheet-contacts-section-toggle:checked ~ div.sheet-contacts-section,
+input.sheet-tasks-section-toggle:checked ~ div.sheet-tasks-section,
+input.sheet-resources-section-toggle:checked ~ div.sheet-resources-section,
+input.sheet-possessions-section-toggle:checked ~ div.sheet-possessions-section,
+
+input.sheet-roles-section-toggle:checked ~ div.sheet-roles-section,
+input.sheet-attachments-section-toggle:checked ~ div.sheet-attachments-section,
+input.sheet-cargo-section-toggle:checked ~ div.sheet-cargo-section,
+input.sheet-passengers-section-toggle:checked ~ div.sheet-passengers-section,
+
+input.sheet-main-section-toggle:checked ~ div.sheet-main-section,
+input.sheet-mechanics-section-toggle:checked ~ div.sheet-mechanics-section,
+
+input.sheet-quickinfo-section-toggle:checked ~ div.sheet-quickinfo-section,
+input.sheet-weapon-section-toggle:checked ~ div.sheet-weapon-section,
+input.sheet-characteristic-section-toggle:checked ~ div.sheet-characteristic-section,
+input.sheet-skills-section-toggle:checked ~ div.sheet-skills-section,
+input.sheet-talents-section-toggle:checked ~ div.sheet-talents-section,
+input.sheet-force-section-toggle:checked ~ div.sheet-force-section,
+input.sheet-signature-section-toggle:checked ~ div.sheet-signature-section,
+input.sheet-combatskills-section-toggle:checked ~ div.sheet-combatskills-section,
+
+input.sheet-armor-section-toggle:checked ~ div.sheet-armor-section,
+input.sheet-cybernetics-section-toggle:checked ~ div.sheet-cybernetics-section,
+input.sheet-tools-section-toggle:checked ~ div.sheet-tools-section,
+input.sheet-other-gear-section-toggle:checked ~ div.sheet-other-gear-section,
+input.sheet-initiative-section-toggle:checked ~ div.sheet-initiative-section,
+
+input.sheet-stats-toggle-small:checked ~ div.sheet-stats-toggle-small,
+
+input.sheet-equipment-section-toggle:checked ~ div.sheet-equipment-section,
+
+input.sheet-character-toggle-small:checked ~ div.sheet-character-toggle-small,
+input.sheet-game-mechanics-toggle-small:checked ~ div.sheet-game-mechanics-toggle-small,
+
+input.sheet-career-toggle-small:checked ~ div.sheet-career-toggle-small,
+input.sheet-description-toggle-small:checked ~ div.sheet-description-toggle-small,
+input.sheet-motivation-toggle-small:checked ~ div.sheet-motivation-toggle-small,
+
+input.sheet-obligation-toggle-small:checked ~ div.sheet-obligation-toggle-small,
+input.sheet-duty-toggle-small:checked ~ div.sheet-duty-toggle-small,
+input.sheet-morality-toggle-small:checked ~ div.sheet-morality-toggle-small,
+
+input.sheet-armor-toggle-small:checked ~ div.sheet-armor-toggle-small,
+input.sheet-cybernetics-toggle-small:checked ~ div.sheet-cybernetics-toggle-small,
+input.sheet-tools-toggle-small:checked ~ div.sheet-tools-toggle-small,
+input.sheet-other-gear-toggle-small:checked ~ div.sheet-other-gear-toggle-small,
+
+input.sheet-initiative-toggle-small:checked ~ div.sheet-initiative-toggle-small,
+input.sheet-info-toggle-small:checked ~ div.sheet-info-toggle-small,
+input.sheet-weapons-toggle-small:checked ~ div.sheet-weapons-toggle-small,
+input.sheet-characteristic-toggle-small:checked ~ div.sheet-characteristic-toggle-small,
+input.sheet-skills-toggle-small:checked ~ div.sheet-skills-toggle-small,
+input.sheet-talents-toggle-small:checked ~ div.sheet-talents-toggle-small,
+input.sheet-equipment-toggle-small:checked ~ div.sheet-equipment-toggle-small,
+input.sheet-force-toggle-small:checked ~ div.sheet-force-toggle-small,
+
+input.sheet-toggle.sheet-initiative-toggle-small:checked ~ div.sheet-initiative-toggle-small,
+
+    /* Repeating Section Toggles */
+input.sheet-assignment-toggle:checked ~ div.sheet-assignment,
+input.sheet-mission-toggle:checked ~ div.sheet-mission,
+input.sheet-geninfo-toggle:checked ~ div.sheet-geninfo,
+input.sheet-location-toggle:checked ~ div.sheet-location,
+input.sheet-rewards-toggle:checked ~ div.sheet-rewards,
+input.sheet-details-toggle:checked ~ div.sheet-details,
+input.sheet-list-toggle:checked ~ div.sheet-list,
+input.sheet-weapon-toggle:checked ~ div.sheet-weapon,
+
+    /* footer */
+input.sheet-footer-toggle:checked ~ div.sheet-footer {
+    display: block;
+}
+
+/* Header section */
+input.sheet-header-section-toggle ~ div.sheet-header-section,
+input.sheet-top-section-toggle ~ div.sheet-top-section,
+
+input.sheet-destiny-section-toggle ~ div.sheet-destiny-section,
+input.sheet-dice-section-toggle ~ div.sheet-dice-section,
+input.sheet-motivations-section-toggle ~ div.sheet-motivations-section,
+input.sheet-obligation-section-toggle ~ div.sheet-obligation-section,
+input.sheet-assignment-section-toggle ~ div.sheet-assignment-section,
+input.sheet-duties-section-toggle ~ div.sheet-duties-section,
+input.sheet-morality-section-toggle ~ div.sheet-morality-section,
+
+input.sheet-details-section-toggle ~ div.sheet-details-section,
+input.sheet-npc-section-toggle ~ div.sheet-npc-section,
+input.sheet-upgrades-section-toggle ~ div.sheet-upgrades-section,
+input.sheet-contacts-section-toggle ~ div.sheet-contacts-section,
+input.sheet-tasks-section-toggle ~ div.sheet-tasks-section,
+input.sheet-resources-section-toggle ~ div.sheet-resources-section,
+input.sheet-possessions-section-toggle ~ div.sheet-possessions-section,
+
+input.sheet-roles-section-toggle ~ div.sheet-roles-section,
+input.sheet-attachments-section-toggle ~ div.sheet-attachments-section,
+input.sheet-cargo-section-toggle ~ div.sheet-cargo-section,
+input.sheet-passengers-section-toggle ~ div.sheet-passengers-section,
+
+input.sheet-main-section-toggle ~ div.sheet-main-section,
+input.sheet-mechanics-section-toggle ~ div.sheet-mechanics-section,
+
+input.sheet-quickinfo-section-toggle ~ div.sheet-quickinfo-section,
+input.sheet-weapon-section-toggle ~ div.sheet-weapon-section,
+input.sheet-characteristic-section-toggle ~ div.sheet-characteristic-section,
+input.sheet-skills-section-toggle ~ div.sheet-skills-section,
+input.sheet-talents-section-toggle ~ div.sheet-talents-section,
+input.sheet-force-section-toggle ~ div.sheet-force-section,
+input.sheet-signature-section-toggle ~ div.sheet-signature-section,
+input.sheet-combatskills-section-toggle ~ div.sheet-combatskills-section,
+
+input.sheet-armor-section-toggle ~ div.sheet-armor-section,
+input.sheet-cybernetics-section-toggle ~ div.sheet-cybernetics-section,
+input.sheet-tools-section-toggle ~ div.sheet-tools-section,
+input.sheet-other-gear-section-toggle ~ div.sheet-other-gear-section,
+input.sheet-initiative-section-toggle ~ div.sheet-initiative-section,
+
+input.sheet-equipment-section-toggle ~ div.sheet-equipment-section,
+
+input.sheet-stats-toggle-small ~ div.sheet-stats-toggle-small,
+
+input.sheet-character-toggle-small ~ div.sheet-character-toggle-small,
+input.sheet-game-mechanics-toggle-small ~ div.sheet-game-mechanics-toggle-small,
+
+input.sheet-career-toggle-small ~ div.sheet-career-toggle-small,
+input.sheet-description-toggle-small ~ div.sheet-description-toggle-small,
+input.sheet-motivation-toggle-small ~ div.sheet-motivation-toggle-small,
+
+input.sheet-obligation-toggle-small ~ div.sheet-obligation-toggle-small,
+input.sheet-duty-toggle-small ~ div.sheet-duty-toggle-small,
+input.sheet-morality-toggle-small ~ div.sheet-morality-toggle-small,
+
+input.sheet-armor-toggle-small ~ div.sheet-armor-toggle-small,
+input.sheet-cybernetics-toggle-small ~ div.sheet-cybernetics-toggle-small,
+input.sheet-tools-toggle-small ~ div.sheet-tools-toggle-small,
+input.sheet-other-gear-toggle-small ~ div.sheet-other-gear-toggle-small,
+
+input.sheet-initiative-toggle-small ~ div.sheet-initiative-toggle-small,
+input.sheet-info-toggle-small ~ div.sheet-info-toggle-small,
+input.sheet-weapons-toggle-small ~ div.sheet-weapons-toggle-small,
+input.sheet-characteristic-toggle-small ~ div.sheet-characteristic-toggle-small,
+input.sheet-skills-toggle-small ~ div.sheet-skills-toggle-small,
+input.sheet-talents-toggle-small ~ div.sheet-talents-toggle-small,
+input.sheet-equipment-toggle-small ~ div.sheet-equipment-toggle-small,
+input.sheet-force-toggle-small ~ div.sheet-force-toggle-small,
+
+    /* Repeating Section Toggles */
+input.sheet-assignment-toggle ~ div.sheet-assignment,
+input.sheet-mission-toggle ~ div.sheet-mission,
+input.sheet-geninfo-toggle ~ div.sheet-geninfo,
+input.sheet-location-toggle ~ div.sheet-location,
+input.sheet-rewards-toggle ~ div.sheet-rewards,
+input.sheet-details-toggle ~ div.sheet-details,
+input.sheet-list-toggle ~ div.sheet-list,
+input.sheet-weapon-toggle ~ div.sheet-weapon,
+
+    /* footer */
+input.sheet-footer-toggle ~ div.sheet-footer {
+    display: none;
+}
+
+.repcontrol_add, .repcontrol_edit, .repcontrol_del, .repcontrol_move {
+    background: #444;
+    color: #f3f3f3;
+}
diff --git a/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html b/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html
index 3f2409e41d..e0227d423a 100644
--- a/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html	
+++ b/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html	
@@ -4,45 +4,20 @@
 
 <div>
     <h3 class="sheet-section-header"><span style="font-size:11px">Fantasy Flight Games Star Wars Role Playing Game</span></h3>
-    <div>
+    <input style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-header-section-toggle" type="checkbox" checked="checked"/>
+    <div class="sheet-header-section">
         <table>
             <tr>
                 <td><label>Version</label></td>
                 <td>
-                    <div class="sheet-tips">
-                        <div class="sheet-help-def sheet-help">
-                            <div class="sheet-icon">
-                                <span class="sheet-icon-question">?</span>
-                            </div>
-                            <div class="sheet-help-content">
-                                <h5>Recent Change(s):</h5>
-                                <p>
-                                    ====New Features:====<br />
-                                    * 4.0.4.6<br />
-                                    ** Added Version info and Recent Changes list.<br />
-                                    ====Redesigns:====<br />
-                                    ====Bug Fixes:====<br />
-                                    * 4.0.4.5<br />
-                                    ** Fixed an auto-calculation error that effected skill downdown lists.<br />
-                                    * 4.0.4.6<br />
-                                    ** Fixed species display for Dressellian.<br />
-                                    ** Fixed an auto-calculation error that effected skill downdown lists (again).<br />
-                                </p>
-                            </div>
-                        </div>
-                    </div><!-- Recent Changes List -->
+                    6.3.0 
                 </td>
-                <td><input type="text" name="attr_sheet-version" value="4.0.4.6" disabled /></td>
+                <td style="width: 28%;"><label>For more information on this version visit:</label></td>
+                <td><input disabled value="https://github.com/khendar/Roll20_StarWars" type="text"/></td>
             </tr>
         </table><!--Version Info-->
-        <table>
-            <tr>
-                <td><img src="http://i.imgur.com/Rw85dQ1.jpg" alt="Edge of the Empire" width="88" height="40"></td>
-                <td><img src="http://i.imgur.com/UL3nBjn.jpg" alt="Age of Rebellion" width="88" height="40"></td>
-                <td><img src="http://i.imgur.com/zTe7Jcx.jpg" alt="Force and Destiny" width="88" height="40"></td>
-            </tr>
-        </table><br /><!--Game Line Pictures-->
     </div>
+    <br />
 </div><!--Character Sheet Header-->
 
 <!--Player Sheet Tabs-->
@@ -54,96 +29,22 @@
 <span class="sheet-tab-new sheet-player-sheet">Group Sheet</span>
 <input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-companion-sheet sheet-player-sheet" value="4" />
 <span class="sheet-tab-new sheet-player-sheet">Companion Sheet</span>
+<input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-npc-sheet sheet-player-sheet" value="5" />
+<span class="sheet-tab-new sheet-player-sheet">NPC Sheet</span>
 
 <!--GM Sheet Tabs-->
-<input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-gm-dice sheet-gm-sheet" value="5" />
+<input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-gm-dice sheet-gm-sheet" value="6" />
 <span class="sheet-tab-new sheet-gm-sheet">GM Resources</span>
 
-<!--Player Sheet Tabs - Expanded-->
-<div class="sheet-tab-content sheet-tab-character-sheet">
-    <div class="sheet-row sheet-section-1">
-        <div class="sheet-small-12 sheet-column">
-            <table class="sheet-swsd" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
-                    <tr>
-                        <td>
-                            <label class="sheet-label-title">Wounds</label>
-                            <input name="attr_wounds_max" type="number" min="1" value="1" />
-                            <input name="attr_wounds" type="number" min="0" value="0" /><br />
-                            <label class="sheet-label-threshold">Threshold</label>
-                            <label class="sheet-label-current">Current</label>
-                        </td>
-                        <td>
-                            <label class="sheet-label-title">Strain</label>
-                            <input name="attr_strain_max" type="number" min="1" value="1" />
-                            <input name="attr_strain" type="number" min="0" value="0" /><br />
-                            <label class="sheet-label-threshold">Threshold</label>
-                            <label class="sheet-label-current">Current</label>
-                        </td>
-                        <td rowspan="2">
-                            <label class="sheet-label-title">Defense</label>
-                            <input name="attr_rangeddefense" type="number" max="10" min="0" value="0" />
-                            <input name="attr_meleedefense" type="number" max="10" min="0" value="0" /><br />
-                            <label class="sheet-label-range">Range</label>
-                            <label class="sheet-label-melee">Melee</label>
-                        </td>
-                        <td rowspan="2">
-                            <label class="sheet-label-title">Encum</label>
-                            <input name="attr_encumbrance_max" type="number" min="1" value="1" />
-                            <input name="attr_encumbrancemax" type="hidden" value="@{encumbrance|max}" disabled />
-                            <input name="attr_encumbrance" type="number" min="0" value="0" /><br />-->
-                            <label class="sheet-label-threshold">Threshold</label>
-                            <label class="sheet-label-current">Current</label>
-                        </td>
-                        <td rowspan="2">
-                            <label class="sheet-label-title">Force Rating</label>
-                            <input name="attr_forcerating" type="number" max="9" min="0" value="0" />
-                            <input name="attr_forcecommitted" type="number" max="9" min="0" value="0" /><br />
-                            <label class="sheet-label-threshold">Threshold</label>
-                            <label class="sheet-label-current">Committed</label>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="2">
-                            <label class="sheet-label-title">Soak</label>
-                            <input name="attr_soak" type="number" max="49" min="1" value="1" />
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div><!-- Top Stats -->
-        <div class="sheet-small-6 sheet-column">
-            <br />
-            <h3 class="sheet-section-header">Destiny Pool</h3>
-            <table class="sheet-destiny" cellspaceing="0" cellpadding="0" border="0">
-                <tbody>
-                    <tr>
-                        <td colspan="1">
-                            <button type='roll' class="sheet-btn-lightSide" name="Update-Dest-Pool" value='!eed characterID(@{character_id}) destiny registerPlayer'>Sync Pool with GM</button><br><br>
-                            <button type='roll' class="sheet-btn-lightSide" name="Roll-Destiny" value='!eed characterID(@{character_id}) 1w destiny doRoll'>Roll Destiny</button>
-                        </td>
-                        <td>
-                            <label>Light</label>
-                            <input name='attr_light' value="@{lightSidePoints}" type="number" disabled />
-                        </td>
-                        <td>
-                            <button type='roll' class="sheet-btn-lightSide" name="Use-Darkside-Point" value='!eed characterID(@{character_id}) destiny useLight'>&#8592; Use Light Side</button>
-                        </td>
-                        <td>
-                            <label>Dark</label>
-                            <input name='attr_dark' value="@{darkSidePoints}" type="number" disabled />
-                        </td>
-                        <td></td>
-                    </tr>
-                </tbody>
-            </table>
-            <br>
-            <div class="sheet-clear"></div>
-        </div><!-- Destiny Pool -->
-        <div class="sheet-small-12 sheet-column">
+<div class="sheet-separator sheet-player-dice">
+    <b>Dice &amp; Destiny Pool</b><input name="attr_Dice-Destiny-Pool" value="1" style="width:148px;margin:-13px -20px 0 -132px" class="sheet-toggle sheet-top-section-toggle" type="checkbox" checked="checked"/><span></span>
+    <div class="sheet-top-section">
+        <div class="sheet-row">
             <h3 class="sheet-section-header">Dice Pool</h3>
-            <table class="sheet-dice-pool" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
+            <input style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-dice-section-toggle" type="checkbox" checked="checked"/>
+            <div class="sheet-dice-section">
+                <table class="sheet-dice-pool" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
                     <tr>
                         <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png" /><input name="attr_b" type="number" step="1" max="9" min="0" value="0"></td>
                         <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png" /><input name="attr_g" type="number" step="1" max="9" min="0" value="0"></td>
@@ -180,11 +81,100 @@
                             </label>
                         </td>
                     </tr>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div><!-- Dice Pool -->
         <div class="sheet-clear"></div>
-    </div><!--Top of Character Sheet-->
+        <div class="sheet-row">
+            <h3 class="sheet-section-header">Destiny Pool</h3>
+            <input style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-destiny-section-toggle" type="checkbox" checked="checked"/>
+            <div class="sheet-destiny-section">
+                <table class="sheet-destiny" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                    <tr>
+                        <td colspan="1">
+                            <button type='roll' class="sheet-btn-lightSide" name="Update-Dest-Pool" value='!eed characterID(@{character_id}) destiny registerPlayer'>Sync Pool with GM</button><br><br>
+                            <button type='roll' class="sheet-btn-lightSide" name="Roll-Destiny" value='!eed characterID(@{character_id}) 1w destiny doRoll'>Roll Destiny</button>
+                        </td>
+                        <td>
+                            <label>Light</label>
+                            <input name='attr_light' value="@{lightSidePoints}" type="number" disabled />
+                        </td>
+                        <td>
+                            <button type='roll' class="sheet-btn-lightSide" name="Use-Darkside-Point" value='!eed characterID(@{character_id}) destiny useLight'>&#8592; Use Light Side</button>
+                        </td>
+                        <td>
+                            <label>Dark</label>
+                            <input name='attr_dark' value="@{darkSidePoints}" type="number" disabled />
+                        </td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div><!-- Destiny Pool -->
+    </div>
+    <div class="sheet-clear"></div>
+</div><!-- Dice & Destiny Pools -->
+
+<div class="sheet-tab-content sheet-tab-character-sheet">
+    <b>Stats</b><input name="attr_character-Stats" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-stats-toggle-small" type="checkbox"/><span></span>
+    <div class="sheet-stats-toggle-small">
+        <div class="sheet-row sheet-section-1">
+            <div class="sheet-small-12 sheet-column">
+                <table class="sheet-swsd" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                    <tr>
+                        <td>
+                            <label class="sheet-label-title">Wounds</label>
+                            <input name="attr_wounds_max" type="number" min="1" value="1" />
+                            <input name="attr_wounds" type="number" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td>
+                            <label class="sheet-label-title">Strain</label>
+                            <input name="attr_strain_max" type="number" min="0" value="0" />
+                            <input name="attr_strain" type="number" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Defense</label>
+                            <input name="attr_rangeddefense" type="number" max="10" min="0" value="0" />
+                            <input name="attr_meleedefense" type="number" max="10" min="0" value="0" /><br />
+                            <label class="sheet-label-range">Range</label>
+                            <label class="sheet-label-melee">Melee</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Encum</label>
+                            <input name="attr_encumbrance_max" type="number" min="1" value="1" />
+                            <input name="attr_encumbrancemax" type="hidden" value="@{encumbrance|max}" disabled />
+                            <input name="attr_encumbrance" type="number" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Force Rating</label>
+                            <input name="attr_forcerating" type="number" max="21" min="0" value="0" />
+                            <input name="attr_forcecommitted" type="number" max="21" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-committed">Committed</label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">
+                            <label class="sheet-label-title">Soak</label>
+                            <input name="attr_soak" type="number" max="49" min="1" value="1" />
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div><!-- Top Stats -->
+        </div>
+    </div><!--Stats-->
+    <div class="sheet-clear"></div>
 
     <input type="radio" name="attr_sheet" class="sheet-tab-new sheet-tab-character" value="1" checked="checked" />
     <span class="sheet-tab-new">&emsp;Character Info&emsp;</span>
@@ -194,900 +184,536 @@
     <span class="sheet-tab-new">&emsp; &emsp;Combat&emsp; &emsp;</span>
     <input type="radio" name="attr_sheet" class="sheet-tab-new sheet-tab-weapons" value="4" />
     <span class="sheet-tab-new">&emsp;Item Inventory&emsp;</span>
-    <input type="radio" name="attr_sheet" class="sheet-tab-new sheet-tab-notes" value="5" />
+    <input type="radio" name="attr_sheet" class="sheet-tab-new sheet-tab-critical" value="5" />
+    <span class="sheet-tab-new">&emsp;Critical Injuries&emsp;</span>
+    <input type="radio" name="attr_sheet" class="sheet-tab-new sheet-tab-notes" value="6" />
     <span class="sheet-tab-new">&emsp; &emsp;Notes&emsp; &emsp;</span>
 
     <div class="sheet-tab-content sheet-tab-character">
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
+        <b>Character</b><input name="attr_character-Character" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-character-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-character-toggle-small">
+            <div class="sheet-row">
                 <h3 class="sheet-section-header">Character</h3>
-                <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="15%"><label>Name:</label></td>
-                            <td width="35%"><input type="text" name="attr_name" /></td>
-                            <td width="15%"><label>Player Name:</label></td>
-                            <td width="35%"><input type="text" name="attr_playername" /></td>
-                        </tr>
-                        <tr>
-                            <td width="15%"><label>Species:</label></td>
-                            <td width="35%">
-                                <select name='attr_species'>
-                                    <option>&emsp;&emsp;</option>
-                                    <option value="Aqualish (Aquala)">Aqualish (Aquala)</option>
-                                    <option value="Aqualish (Quara)">Aqualish (Quara)</option>
-                                    <option value="Aqualish (Ualaq)">Aqualish (Ualaq)</option>
-                                    <option value="Arcona">Arcona</option>
-                                    <option value="Bothan">Bothan</option>
-                                    <option value="Caamasi">Caamasi</option>
-                                    <option value="Cerean">Cerean</option>
-                                    <option value="Chadra-Fan">Chadra-Fan</option>
-                                    <option value="Chagrian">Chagrian</option>
-                                    <option value="Chevin">Chevin</option>
-                                    <option value="Chiss">Chiss</option>
-                                    <option value="Corellian Human">Corellian Human</option>
-                                    <option value="Drall">Drall</option>
-                                    <option value="Dressellian (Primitive)">Dressellian (Primitive)</option>
-                                    <option value="Dressellian (Non-Primitive)">Dressellian (Non-Primitive)</option>
-                                    <option value="Droid">Droid</option>
-                                    <option value="Duros">Duros</option>
-                                    <option value="Falleen">Falleen</option>
-                                    <option value="Gand (With Lungs)">Gand (With Lungs)</option>
-                                    <option value="Gand (Without Lungs)">Gand (Without Lungs)</option>
-                                    <option value="Gank">Gank</option>
-                                    <option value="Gossam">Gossam</option>
-                                    <option value="Gotal">Gotal</option>
-                                    <option value="Gran">Gran</option>
-                                    <option value="Human">Human</option>
-                                    <option value="Hutt">Hutt</option>
-                                    <option value="Iktotchi">Iktotchi</option>
-                                    <option value="Ishi Tib">Ishi Tib</option>
-                                    <option value="Ithorian">Ithorian</option>
-                                    <option value="Kel Dor">Kel Dor</option>
-                                    <option value="Klatooinian">Klatooinian</option>
-                                    <option value="Lannik">Lannik</option>
-                                    <option value="Mirialan">Mirialan</option>
-                                    <option value="Mon Calamari">Mon Calamari</option>
-                                    <option value="Nautolan">Nautolan</option>
-                                    <option value="Neimodian">Neimodian</option>
-                                    <option value="Nikto (Green)">Nikto (Green)</option>
-                                    <option value="Nikto (Mountain)">Nikto (Mountain)</option>
-                                    <option value="Nikto (Pale)">Nikto (Pale)</option>
-                                    <option value="Nikto (Red)">Nikto (Red)</option>
-                                    <option value="Nikto (Southern)">Nikto (Southern)</option>
-                                    <option value="Polis Massan (With Vocal Chords)">Polis Massan (With Vocal Chords)</option>
-                                    <option value="Polis Massan (Without Vocal Chords)">Polis Massan (Without Vocal Chords)</option>
-                                    <option value="Quarren">Quarren</option>
-                                    <option value="Rodian">Rodian</option>
-                                    <option value="Sakiyan">Sakiyan</option>
-                                    <option value="Sathari">Sathari</option>
-                                    <option value="Selonian">Selonian</option>
-                                    <option value="Sullustan">Sullustan</option>
-                                    <option value="Togruta">Togruta</option>
-                                    <option value="Toydarian">Toydarian</option>
-                                    <option value="Trandosian">Trandosian</option>
-                                    <option value="Twi'lek">Twi'lek</option>
-                                    <option value="Verpine">Verpine</option>
-                                    <option value="Weequay">Weequay</option>
-                                    <option value="Whiphid">Whiphid</option>
-                                    <option value="Wookiee">Wookiee</option>
-                                    <option value="Xexto">Xexto</option>
-                                    <option value="Zabrak">Zabrak</option>
-                                </select><!--Species List-->
-                                <input type="text" name="attr_species" />
-                            </td>
-                            <td width="15%"><label>Credits:</label></td>
-                            <td width="35%"><input type="text" name="attr_credits" /></td>
-                        </tr>
-                        <tr>
-                            <td width="15%"><label>Total XP:</label></td>
-                            <td width="35%"><input type="number" name="attr_totalxp" /></td>
-                            <td width="15%"><label>Available XP:</label></td>
-                            <td width="35%"><input type="number" name="attr_availablexp" /></td>
-                        </tr>
-                    </tbody>
-                </table>
+                <input name="attr_character-Character" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-main-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-main-section">
+                    <div class="sheet-small-12 sheet-column">
+                        <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td width="15%"><label>Name:</label></td>
+                                <td width="35%"><input type="text" name="attr_name" /></td>
+                                <td width="15%"><label>Player Name:</label></td>
+                                <td width="35%"><input type="text" name="attr_playername" /></td>
+                            </tr>
+                            <tr>
+                                <td width="15%"><label>Species:</label></td>
+                                <td width="35%">
+                                    <select name='attr_species'>
+                                        <option value=""></option>
+                                        <option value="Aleena">Aleena</option>
+                                        <option value="Anx">Anx</option>
+                                        <option value="Aqualish (Aquala)">Aqualish (Aquala)</option>
+                                        <option value="Aqualish (Quara)">Aqualish (Quara)</option>
+                                        <option value="Aqualish (Ualaq)">Aqualish (Ualaq)</option>
+                                        <option value="Arcona">Arcona</option>
+                                        <option value="Bardottan">Bardottan</option>
+                                        <option value="Besalisk">Besalisk</option>
+                                        <option value="Bothan">Bothan</option>
+                                        <option value="Caamasi">Caamasi</option>
+                                        <option value="Cerean">Cerean</option>
+                                        <option value="Chadra-Fan">Chadra-Fan</option>
+                                        <option value="Chagrian">Chagrian</option>
+                                        <option value="Chevin">Chevin</option>
+                                        <option value="Chiss">Chiss</option>
+                                        <option value="Corellian Human">Corellian Human</option>
+                                        <option value="Devaronian">Devaronian</option>
+                                        <option value="Drall">Drall</option>
+                                        <option value="Dressellian (Primitive)">Dressellian (Primitive)</option>
+                                        <option value="Dressellian (Non-Primitive)">Dressellian (Non-Primitive)</option>
+                                        <option value="Droid">Droid</option>
+                                        <option value="Dug">Dug</option>
+                                        <option value="Duros">Duros</option>
+                                        <option value="Falleen">Falleen</option>
+                                        <option value="Gand (With Lungs)">Gand (With Lungs)</option>
+                                        <option value="Gand (Without Lungs)">Gand (Without Lungs)</option>
+                                        <option value="Gank">Gank</option>
+                                        <option value="Gossam">Gossam</option>
+                                        <option value="Gotal">Gotal</option>
+                                        <option value="Gran">Gran</option>
+                                        <option value="Gungan">Gungan</option>
+                                        <option value="Human">Human</option>
+                                        <option value="Hutt">Hutt</option>
+                                        <option value="Iktotchi">Iktotchi</option>
+                                        <option value="Ishi Tib">Ishi Tib</option>
+                                        <option value="Ithorian">Ithorian</option>
+                                        <option value="Kel Dor">Kel Dor</option>
+                                        <option value="Klatooinian">Klatooinian</option>
+                                        <option value="Lannik">Lannik</option>
+                                        <option value="Mirialan">Mirialan</option>
+                                        <option value="Mon Calamari">Mon Calamari</option>
+                                        <option value="Mustafarian (Northern)">Mustafarian (Northern)</option>
+                                        <option value="Mustafarian (Southern)">Mustafarian (Southern)</option>
+                                        <option value="Nautolan">Nautolan</option>
+                                        <option value="Neimodian">Neimodian</option>
+                                        <option value="Nikto (Green)">Nikto (Green)</option>
+                                        <option value="Nikto (Mountain)">Nikto (Mountain)</option>
+                                        <option value="Nikto (Pale)">Nikto (Pale)</option>
+                                        <option value="Nikto (Red)">Nikto (Red)</option>
+                                        <option value="Nikto (Southern)">Nikto (Southern)</option>
+                                        <option value="Polis Massan (With Vocal Chords)">Polis Massan (With Vocal Chords)</option>
+                                        <option value="Polis Massan (Without Vocal Chords)">Polis Massan (Without Vocal Chords)</option>
+                                        <option value="Quarren">Quarren</option>
+                                        <option value="Quermian">Quermian</option>
+                                        <option value="Rodian">Rodian</option>
+                                        <option value="Sakiyan">Sakiyan</option>
+                                        <option value="Sathari">Sathari</option>
+                                        <option value="Selonian">Selonian</option>
+                                        <option value="Sullustan">Sullustan</option>
+                                        <option value="Togruta">Togruta</option>
+                                        <option value="Toydarian">Toydarian</option>
+                                        <option value="Trandosian">Trandosian</option>
+                                        <option value="Twi'lek">Twi'lek</option>
+                                        <option value="Verpine">Verpine</option>
+                                        <option value="Weequay">Weequay</option>
+                                        <option value="Whiphid">Whiphid</option>
+                                        <option value="Wookiee">Wookiee</option>
+                                        <option value="Xexto">Xexto</option>
+                                        <option value="Zabrak">Zabrak</option>
+                                    </select><!--Species List-->
+                                    <input type="text" name='attr_species'>
+                                </td>
+                                <td width="15%"><label>Credits:</label></td>
+                                <td width="35%"><input type="text" name="attr_credits" /></td>
+                            </tr>
+                            <tr>
+                                <td width="15%"><label>Total XP:</label></td>
+                                <td width="35%"><input type="number" name="attr_totalxp" /></td>
+                                <td width="15%"><label>Available XP:</label></td>
+                                <td width="35%"><input type="number" name="attr_availablexp" /></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <div class="sheet-clear"></div>
+                    </div>
+
+                    <b>Career</b><input name="attr_character-Career" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-career-toggle-small" type="checkbox"/><span></span>
+                    <div class="sheet-career-toggle-small">
+                        <div class="sheet-small-12 sheet-column">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr>
+                                    <th width="30%">Career</th>
+                                    <th width="30%">
+                                        <span style="float:left">Specialization</span>
+                                    </th>
+                                    <th width="30%">Is it in your Career?</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <input name="attr_career" type="text"/>
+                                    </td><!--Career List-->
+                                    <td>
+                                        <input name="attr_tree" type="text"/>
+                                    </td><!--Specialization List-->
+                                    <td>
+                                        <input type="text" name="attr_specialization-career" value="Yes" disabled/>
+                                    </td><!--Career Yes/No-->
+                                </tr>
+                                </tbody>
+                            </table>
+                            <fieldset class="repeating_specialization">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td width="33%">
+                                            <select name="attr_career-list">
+                                                <optgroup label="Edge of the Empire">
+                                                    <option value="Bounty Hunter">Bounty Hunter</option>
+                                                    <option value="Colonist">Colonist</option>
+                                                    <option value="Explorer">Explorer</option>
+                                                    <option value="Hired Gun">Hired Gun</option>
+                                                    <option value="Smuggler">Smuggler</option>
+                                                    <option value="Technican">Technican</option>
+                                                </optgroup>
+                                                <optgroup label="Age of Rebellion">
+                                                    <option value="Ace">Ace</option>
+                                                    <option value="Commander">Commander</option>
+                                                    <option value="Diplomat">Diplomat</option>
+                                                    <option value="Engineer">Engineer</option>
+                                                    <option value="Soldier">Soldier</option>
+                                                    <option value="Spy">Spy</option>
+                                                </optgroup>
+                                                <optgroup label="Force and Destiny">
+                                                    <option value="Consular">Consular</option>
+                                                    <option value="Guardian">Guardian</option>
+                                                    <option value="Mystic">Mystic</option>
+                                                    <option value="Seeker">Seeker</option>
+                                                    <option value="Sentinel">Sentinel</option>
+                                                    <option value="Warrior">Warrior</option>
+                                                </optgroup>
+                                                <optgroup label="All">
+                                                    <option value="Universal">Universal</option>
+                                                </optgroup>
+                                            </select>
+                                        </td><!--Career List-->
+                                        <td width="33.5%">
+                                            <select name="attr_specialization">
+                                                <optgroup label="Edge of the Empire"></optgroup>
+                                                <optgroup label="Bounty Hunter">
+                                                    <option value="Assassin">Assassin</option>
+                                                    <option value="Gadgeteer">Gadgeteer</option>
+                                                    <option value="Survivalist">Survivalist</option>
+                                                </optgroup>
+                                                <optgroup label="Colonist">
+                                                    <option value="Doctor">Doctor</option>
+                                                    <option value="Politico">Politico</option>
+                                                    <option value="Scholar">Scholar</option>
+                                                    <option value="Entrepreneur">Entrepreneur</option>
+                                                    <option value="Marshal">Marshal</option>
+                                                    <option value="Performer">Performer</option>
+                                                </optgroup>
+                                                <optgroup label="Explorer">
+                                                    <option value="Scout">Scout</option>
+                                                    <option value="Fringer">Fringer</option>
+                                                    <option value="Driver">Driver</option>
+                                                    <option value="Archaeologist">Archaeologist</option>
+                                                    <option value="Big-Game Hunter">Big-Game Hunter</option>
+                                                    <option value="Trader">Trader</option>
+                                                </optgroup>
+                                                <optgroup label="Hired Gun">
+                                                    <option value="Bodyguard">Bodyguard</option>
+                                                    <option value="Demolitionist">Demolitionist</option>
+                                                    <option value="Enforcer">Enforcer</option>
+                                                    <option value="Heavy">Heavy</option>
+                                                    <option value="Marauder">Marauder</option>
+                                                    <option value="Mercenary Soldier">Mercenary Soldier</option>
+                                                </optgroup>
+                                                <optgroup label="Smuggler">
+                                                    <option value="Pilot">Pilot</option>
+                                                    <option value="Scoundrel">Scoundrel</option>
+                                                    <option value="Thief">Thief</option>
+                                                    <option value="Charmer">Charmer</option>
+                                                    <option value="Gambler">Gambler</option>
+                                                    <option value="Gunslinger">Gunslinger</option>
+                                                </optgroup>
+                                                <optgroup label="Technician">
+                                                    <option value="Mechanic">Mechanic</option>
+                                                    <option value="Outlaw Tech">Outlaw Tech</option>
+                                                    <option value="Slicer">Slicer</option>
+                                                    <option value="Cyber Tech">Cyber Tech</option>
+                                                    <option value="Droid Tech">Droid Tech</option>
+                                                    <option value="Modder">Modder</option>
+                                                </optgroup>
+                                                <optgroup label="Age of Rebellion"></optgroup>
+                                                <optgroup label="Ace">
+                                                    <option value="Driver">Driver</option>
+                                                    <option value="Pilot">Pilot</option>
+                                                    <option value="Gunner">Gunner</option>
+                                                    <option value="Rigger">Rigger</option>
+                                                    <option value="Hotshot">Hotshot</option>
+                                                    <option value="Beast Rider">Beast Rider</option>
+                                                </optgroup>
+                                                <optgroup label="Commander">
+                                                    <option value="Commodore">Commodore</option>
+                                                    <option value="Squadron Leader">Squadron Leader</option>
+                                                    <option value="Tactician">Tactician</option>
+                                                    <option value="Figurehead">Figurehead</option>
+                                                    <option value="Instructor">Instructor</option>
+                                                    <option value="Strategist">Strategist</option>
+                                                </optgroup>
+                                                <optgroup label="Diplomat">
+                                                    <option value="Ambassador">Ambassador</option>
+                                                    <option value="Agitator">Agitator</option>
+                                                    <option value="Quartermaster">Quartermaster</option>
+                                                    <option value="Analyst">Analyst</option>
+                                                    <option value="Advocate">Advocate</option>
+                                                    <option value="Propagandist">Propagandist</option>
+                                                </optgroup>
+                                                <optgroup label="Engineer">
+                                                    <option value="Mechanic">Mechanic</option>
+                                                    <option value="Scientist">Scientist</option>
+                                                    <option value="Saboteur">Saboteur</option>
+                                                </optgroup>
+                                                <optgroup label="Soldier">
+                                                    <option value="Medic">Medic</option>
+                                                    <option value="Sharpshooter">Sharpshooter</option>
+                                                    <option value="Commando">Commando</option>
+                                                </optgroup>
+                                                <optgroup label="Spy">
+                                                    <option value="Slicer">Slicer</option>
+                                                    <option value="Infiltrator">Infiltrator</option>
+                                                    <option value="Scout">Scout</option>
+                                                </optgroup>
+                                                <optgroup label="Force and Destiny"></optgroup>
+                                                <optgroup label="Consular">
+                                                    <option value="Healer">Healer</option>
+                                                    <option value="Niman Disciple">Niman Disciple</option>
+                                                    <option value="Sage">Sage</option>
+                                                </optgroup>
+                                                <optgroup label="Guardian">
+                                                    <option value="Armorer">Armorer</option>
+                                                    <option value="Peace Keeper">Peace Keeper</option>
+                                                    <option value="Protector">Protector</option>
+                                                    <option value="Soresu Defender">Soresu Defender</option>
+                                                    <option value="Warden">Warden</option>
+                                                    <option value="Warleader">Warleader</option>
+                                                </optgroup>
+                                                <optgroup label="Mystic">
+                                                    <option value="Seer">Seer</option>
+                                                    <option value="Makashi Duelist">Makashi Duelist</option>
+                                                    <option value="Advisor">Advisor</option>
+                                                </optgroup>
+                                                <optgroup label="Seeker">
+                                                    <option value="Ataru Striker">Ataru Striker</option>
+                                                    <option value="Hunter">Hunter</option>
+                                                    <option value="Pathfinder">Pathfinder</option>
+                                                    <option value="Executioner">Executioner</option>
+                                                    <option value="Hermit">Hermit</option>
+                                                    <option value="Navigator">Navigator</option>
+                                                </optgroup>
+                                                <optgroup label="Sentinel">
+                                                    <option value="Artisan">Artisan</option>
+                                                    <option value="Shadow">Shadow</option>
+                                                    <option value="Shien Expert">Shien Expert</option>
+                                                </optgroup>
+                                                <optgroup label="Warrior">
+                                                    <option value="Aggressor">Aggressor</option>
+                                                    <option value="Shii-Cho Knight">Shii-Cho Knight</option>
+                                                    <option value="Starfighter Ace">Starfighter Ace</option>
+                                                </optgroup>
+                                                <optgroup label="Universal">
+                                                    <option value="Force Sensitive Exile">Force Sensitive Exile</option>
+                                                    <option value="Force Sensitive Emergent">Force Sensitive Emergent</option>
+                                                    <option value="Recruit">Recruit</option>
+                                                </optgroup>
+                                            </select>
+                                        </td><!--Specialization List-->
+                                        <td width="30%">
+                                            <select name="attr_specialization-career-list">
+                                                <option value="yes">Yes</option>
+                                                <option value="no">No</option>
+                                            </select>
+                                        </td><!--Career Yes/No-->
+                                        <td width="10%"></td><!--Placeholder for spacing-->
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </fieldset>
+                        </div>
+                    </div><!--Career and Specialization List-->
+                    <div class="sheet-clear"></div>
+                    <div class="sheet-section-spacer sheet-career-toggle-small"></div>
+
+                    <b>Description</b><input name="attr_character-Description" value="1" checked="checked" style="width:96px;margin:-13px -20px 0 -80px" class="sheet-toggle sheet-description-toggle-small" type="checkbox"/><span></span>
+                    <div class="sheet-description-toggle-small">
+                        <div class="sheet-small-6 sheet-column">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th colspan="2">Description</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td><label>Gender:</label></td>
+                                    <td><input type="text" name="attr_chargender" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Age:</label></td>
+                                    <td><input type="text" name="attr_charager" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Height:</label></td>
+                                    <td><input type="text" name="attr_charheight" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Build:</label></td>
+                                    <td><input type="text" name="attr_charbuild" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Hair:</label></td>
+                                    <td><input type="text" name="attr_charhair" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Eyes:</label></td>
+                                    <td><input type="text" name="attr_chareyes" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="sheet-small-6 sheet-column">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th>Notable Features</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr><td><textarea rows="4" name="attr_charfeatures"></textarea></td></tr>
+                                </tbody>
+                            </table>
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th>Other</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr><td><textarea rows="4" name="attr_charother"></textarea></td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div><!-- Description -->
+                    <div class="sheet-clear"></div>
+                    <div class="sheet-section-spacer sheet-description-toggle-small"></div>
+
+                    <b>Motivations</b><input name="attr_character-Motivations" value="1" checked="checked" style="width:96px;margin:-13px -20px 0 -80px" class="sheet-toggle sheet-motivation-toggle-small" type="checkbox"/><span></span>
+                    <div class="sheet-motivation-toggle-small">
+                        <div class="sheet-small-12 sheet-column">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th colspan="6">Motivations</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td><label>Category:</label></td>
+                                    <td><input type="text" name='attr_attr_motivation-cat' /></td>
+                                    <td><label>Type:</label></td>
+                                    <td><input type="text" name="attr_motivation-type" /></td>
+                                    <td><label>Description:</label></td>
+                                    <td><textarea rows="2" name="attr_motivation-desc"></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Category:</label></td>
+                                    <td><input type="text" name='attr_attr_motivation-cat2' /></td>
+                                    <td><label>Type:</label></td>
+                                    <td><input type="text" name="attr_motivation-type2" /></td>
+                                    <td><label>Description:</label></td>
+                                    <td><textarea rows="2" name="attr_motivation-desc2"></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="sheet-clear"></div>
+                    </div><!-- Motivations -->
+                </div>
+                <div class="sheet-clear"></div>
             </div>
-            <div class="sheet-clear"></div>
         </div><!--Character Info-->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th width="30%">Career</th>
-                            <th width="30%">
-                                <span style="float:left">Specialization</span>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content" style="margin-left:-225px">
-                                            <p>This section is to have you list your specializations</p>
-                                            <p>
-                                                Career - Indicates the Career the Specilization
-                                                came from
-                                            </p>
-                                            <p>Specialization - Indicates the name of the Specs</p>
-                                            <p>
-                                                Is it in your Career? - This is to list if it is an out
-                                                of career Specialization and thus adds an
-                                                additional 10XP to pick it up.
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div><!-- Modifier Help -->
-                            </th>
-                            <th width="30%">Is it in your Career?</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><input type="text" name="attr_career" value="Career" /></td>
-                            <td><input type="text" name="attr_tree" value="Starting Specialization" /></td>
-                            <td><input type="text" name="attr_specialization-career" value="Yes" disabled /></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <fieldset class="repeating_specialization">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="33%">
-                                    <select name="attr_career-list">
-                                        <option value="" disabled>*Edge of the Empire*</option>
-                                        <option value="Bounty Hunter">&nbsp;&nbsp;&nbsp;&nbsp;Bounty Hunter</option>
-                                        <option value="Colonist">&nbsp;&nbsp;&nbsp;&nbsp;Colonist</option>
-                                        <option value="Explorer">&nbsp;&nbsp;&nbsp;&nbsp;Explorer</option>
-                                        <option value="Hired Gun">&nbsp;&nbsp;&nbsp;&nbsp;Hired Gun</option>
-                                        <option value="Smuggler">&nbsp;&nbsp;&nbsp;&nbsp;Smuggler</option>
-                                        <option value="Technican">&nbsp;&nbsp;&nbsp;&nbsp;Technican</option>
-                                        <option value="" disabled>*Age of Rebellion*</option>
-                                        <option value="Ace">&nbsp;&nbsp;&nbsp;&nbsp;Ace</option>
-                                        <option value="Commander">&nbsp;&nbsp;&nbsp;&nbsp;Commander</option>
-                                        <option value="Diplomat">&nbsp;&nbsp;&nbsp;&nbsp;Diplomat</option>
-                                        <option value="Engineer">&nbsp;&nbsp;&nbsp;&nbsp;Engineer</option>
-                                        <option value="Soldier">&nbsp;&nbsp;&nbsp;&nbsp;Soldier</option>
-                                        <option value="Spy">&nbsp;&nbsp;&nbsp;&nbsp;Spy</option>
-                                        <option value="" disabled>*Force and Destiny*</option>
-                                        <option value="Consular">&nbsp;&nbsp;&nbsp;&nbsp;Consular</option>
-                                        <option value="Guardian">&nbsp;&nbsp;&nbsp;&nbsp;Guardian</option>
-                                        <option value="Mystic">&nbsp;&nbsp;&nbsp;&nbsp;Mystic</option>
-                                        <option value="Seeker">&nbsp;&nbsp;&nbsp;&nbsp;Seeker</option>
-                                        <option value="Sentinel">&nbsp;&nbsp;&nbsp;&nbsp;Sentinel</option>
-                                        <option value="Warrior">&nbsp;&nbsp;&nbsp;&nbsp;Warrior</option>
-                                        <option value="" disabled>*All*</option>
-                                        <option value="Universal">&nbsp;&nbsp;&nbsp;&nbsp;Universal</option>
-                                    </select>
-                                </td><!--Career List-->
-                                <td width="33%">
-                                    <select name="attr_specialization">
-                                        <option value="" disabled>*Edge of the Empire*</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Bounty Hunter</option>
-                                        <option value="Assassin">&nbsp;&nbsp;&nbsp;&nbsp;Assassin</option>
-                                        <option value="Gadgeteer">&nbsp;&nbsp;&nbsp;&nbsp;Gadgeteer</option>
-                                        <option value="Survivalist">&nbsp;&nbsp;&nbsp;&nbsp;Survivalist</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Colonist</option>
-                                        <option value="Doctor">&nbsp;&nbsp;&nbsp;&nbsp;Doctor</option>
-                                        <option value="Politico">&nbsp;&nbsp;&nbsp;&nbsp;Politico</option>
-                                        <option value="Scholar">&nbsp;&nbsp;&nbsp;&nbsp;Scholar</option>
-                                        <option value="Entrepreneur">&nbsp;&nbsp;&nbsp;&nbsp;Entrepreneur</option>
-                                        <option value="Marshal">&nbsp;&nbsp;&nbsp;&nbsp;Marshal</option>
-                                        <option value="Performer">&nbsp;&nbsp;&nbsp;&nbsp;Performer</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Explorer</option>
-                                        <option value="Scout">&nbsp;&nbsp;&nbsp;&nbsp;Scout</option>
-                                        <option value="Fringer">&nbsp;&nbsp;&nbsp;&nbsp;Fringer</option>
-                                        <option value="Driver">&nbsp;&nbsp;&nbsp;&nbsp;Driver</option>
-                                        <option value="Archaeologist">&nbsp;&nbsp;&nbsp;&nbsp;Archaeologist</option>
-                                        <option value="Big-Game Hunter">&nbsp;&nbsp;&nbsp;&nbsp;Big-Game Hunter</option>
-                                        <option value="Trader">&nbsp;&nbsp;&nbsp;&nbsp;Trader</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Hired Gun</option>
-                                        <option value="Bodyguard">&nbsp;&nbsp;&nbsp;&nbsp;Bodyguard</option>
-                                        <option value="Demolitionist">&nbsp;&nbsp;&nbsp;&nbsp;Demolitionist</option>
-                                        <option value="Enforcer">&nbsp;&nbsp;&nbsp;&nbsp;Enforcer</option>
-                                        <option value="Heavy">&nbsp;&nbsp;&nbsp;&nbsp;Heavy</option>
-                                        <option value="Marauder">&nbsp;&nbsp;&nbsp;&nbsp;Marauder</option>
-                                        <option value="Mercenary Soldier">&nbsp;&nbsp;&nbsp;&nbsp;Mercenary Soldier</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Smuggler</option>
-                                        <option value="Pilot">&nbsp;&nbsp;&nbsp;&nbsp;Pilot</option>
-                                        <option value="Scoundrel">&nbsp;&nbsp;&nbsp;&nbsp;Scoundrel</option>
-                                        <option value="Thief">&nbsp;&nbsp;&nbsp;&nbsp;Thief</option>
-                                        <option value="Charmer">&nbsp;&nbsp;&nbsp;&nbsp;Charmer</option>
-                                        <option value="Gambler">&nbsp;&nbsp;&nbsp;&nbsp;Gambler</option>
-                                        <option value="Gunslinger">&nbsp;&nbsp;&nbsp;&nbsp;Gunslinger</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Technician</option>
-                                        <option value="Mechanic">&nbsp;&nbsp;&nbsp;&nbsp;Mechanic</option>
-                                        <option value="Outlaw Tech">&nbsp;&nbsp;&nbsp;&nbsp;Outlaw Tech</option>
-                                        <option value="Slicer">&nbsp;&nbsp;&nbsp;&nbsp;Slicer</option>
-                                        <option value="" disabled>*Age of Rebellion*</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Ace</option>
-                                        <option value="Driver">&nbsp;&nbsp;&nbsp;&nbsp;Driver</option>
-                                        <option value="Pilot">&nbsp;&nbsp;&nbsp;&nbsp;Pilot</option>
-                                        <option value="Gunner">&nbsp;&nbsp;&nbsp;&nbsp;Gunner</option>
-                                        <option value="Rigger">&nbsp;&nbsp;&nbsp;&nbsp;Rigger</option>
-                                        <option value="Hotshot">&nbsp;&nbsp;&nbsp;&nbsp;Hotshot</option>
-                                        <option value="Beast Rider">&nbsp;&nbsp;&nbsp;&nbsp;Beast Rider</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Commander</option>
-                                        <option value="Commodore">&nbsp;&nbsp;&nbsp;&nbsp;Commodore</option>
-                                        <option value="Squadron Leader">&nbsp;&nbsp;&nbsp;&nbsp;Squadron Leader</option>
-                                        <option value="Tactician">&nbsp;&nbsp;&nbsp;&nbsp;Tactician</option>
-                                        <option value="Figurehead">&nbsp;&nbsp;&nbsp;&nbsp;Figurehead</option>
-                                        <option value="Instructor">&nbsp;&nbsp;&nbsp;&nbsp;Instructor</option>
-                                        <option value="Strategist">&nbsp;&nbsp;&nbsp;&nbsp;Strategist</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Diplomat</option>
-                                        <option value="Ambassador">&nbsp;&nbsp;&nbsp;&nbsp;Ambassador</option>
-                                        <option value="Agitator">&nbsp;&nbsp;&nbsp;&nbsp;Agitator</option>
-                                        <option value="Quartermaster">&nbsp;&nbsp;&nbsp;&nbsp;Quartermaster</option>
-                                        <option value="Analyst">&nbsp;&nbsp;&nbsp;&nbsp;Analyst</option>
-                                        <option value="Advocate">&nbsp;&nbsp;&nbsp;&nbsp;Advocate</option>
-                                        <option value="Propagandist">&nbsp;&nbsp;&nbsp;&nbsp;Propagandist</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Engineer</option>
-                                        <option value="Mechanic">&nbsp;&nbsp;&nbsp;&nbsp;Mechanic</option>
-                                        <option value="Scientist">&nbsp;&nbsp;&nbsp;&nbsp;Scientist</option>
-                                        <option value="Saboteur">&nbsp;&nbsp;&nbsp;&nbsp;Saboteur</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Soldier</option>
-                                        <option value="Medic">&nbsp;&nbsp;&nbsp;&nbsp;Medic</option>
-                                        <option value="Sharpshooter">&nbsp;&nbsp;&nbsp;&nbsp;Sharpshooter</option>
-                                        <option value="Commando">&nbsp;&nbsp;&nbsp;&nbsp;Commando</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Spy</option>
-                                        <option value="Slicer">&nbsp;&nbsp;&nbsp;&nbsp;Slicer</option>
-                                        <option value="Infiltrator">&nbsp;&nbsp;&nbsp;&nbsp;Infiltrator</option>
-                                        <option value="Scout">&nbsp;&nbsp;&nbsp;&nbsp;Scout</option>
-                                        <option value="" disabled>*Force and Destiny*</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Consular</option>
-                                        <option value="Healer">&nbsp;&nbsp;&nbsp;&nbsp;Healer</option>
-                                        <option value="Niman Disciple">&nbsp;&nbsp;&nbsp;&nbsp;Niman Disciple</option>
-                                        <option value="Sage">&nbsp;&nbsp;&nbsp;&nbsp;Sage</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Guardian</option>
-                                        <option value="Armorer">&nbsp;&nbsp;&nbsp;&nbsp;Armorer</option>
-                                        <option value="Peace Keeper">&nbsp;&nbsp;&nbsp;&nbsp;Peace Keeper</option>
-                                        <option value="Protector">&nbsp;&nbsp;&nbsp;&nbsp;Protector</option>
-                                        <option value="Soresu Defender">&nbsp;&nbsp;&nbsp;&nbsp;Soresu Defender</option>
-                                        <option value="Warden">&nbsp;&nbsp;&nbsp;&nbsp;Warden</option>
-                                        <option value="Warleader">&nbsp;&nbsp;&nbsp;&nbsp;Warleader</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Mystic</option>
-                                        <option value="Seer">&nbsp;&nbsp;&nbsp;&nbsp;Seer</option>
-                                        <option value="Makashi Duelist">&nbsp;&nbsp;&nbsp;&nbsp;Makashi Duelist</option>
-                                        <option value="Advisor">&nbsp;&nbsp;&nbsp;&nbsp;Advisor</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Seeker</option>
-                                        <option value="Ataru Striker">&nbsp;&nbsp;&nbsp;&nbsp;Ataru Striker</option>
-                                        <option value="Hunter">&nbsp;&nbsp;&nbsp;&nbsp;Hunter</option>
-                                        <option value="Pathfinder">&nbsp;&nbsp;&nbsp;&nbsp;Pathfinder</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Sentinel</option>
-                                        <option value="Artisan">&nbsp;&nbsp;&nbsp;&nbsp;Artisan</option>
-                                        <option value="Shadow">&nbsp;&nbsp;&nbsp;&nbsp;Shadow</option>
-                                        <option value="Shien Expert">&nbsp;&nbsp;&nbsp;&nbsp;Shien Expert</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Warrior</option>
-                                        <option value="Aggressor">&nbsp;&nbsp;&nbsp;&nbsp;Aggressor</option>
-                                        <option value="Shii-Cho Knight">&nbsp;&nbsp;&nbsp;&nbsp;Shii-Cho Knight</option>
-                                        <option value="Starfighter Ace">&nbsp;&nbsp;&nbsp;&nbsp;Starfighter Ace</option>
-                                        <option value="" disabled>**Universal**</option>
-                                        <option value="Force Sensitive Exile">&nbsp;&nbsp;&nbsp;&nbsp;Force Sensitive Exile</option>
-                                        <option value="Force Sensitive Emergent">&nbsp;&nbsp;&nbsp;&nbsp;Force Sensitive Emergent</option>
-                                        <option value="Recruit">&nbsp;&nbsp;&nbsp;&nbsp;Recruit</option>
-                                    </select>
-                                </td><!--Specialization List-->
-                                <td width="30%">
-                                    <select name="attr_specialization-career-list">
-                                        <option value="yes">Yes</option>
-                                        <option value="no">No</option>
-                                    </select>
-                                </td><!--Career Yes/No-->
-                                <td width="10%"></td><!--Placeholder for spacing-->
-                            </tr>
-                        </tbody>
-                    </table>
-                </fieldset>
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-character-toggle-small"></div>
+
+        <b>Game Mechanics</b><input name="attr_character-Game-Mechanics" value="1" checked="checked" style="width:131px;margin:-13px -20px 0 -115px" class="sheet-toggle sheet-game-mechanics-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-game-mechanics-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Game Mechanics</h3>
+                    <input name="attr_character-Game-Mechanics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-mechanics-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-mechanics-section">
+                        <b>Obligation</b><input name="attr_character-Obligation" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-obligation-toggle-small" type="checkbox"/><span></span>
+                        <div class="sheet-obligation-toggle-small">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th colspan="4">Obligations</th></tr>
+                                </thead>
+                            </table>
+                            <br />
+                            <fieldset class="repeating_obligation">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Type:</label></td>
+                                        <td><input type="text" name="attr_obligationtype1" /></td>
+                                        <td><label>Magnitude:</label></td>
+                                        <td><input type="number" name="attr_obligationmag1" min="0" value="0" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Details:</label></td>
+                                        <td colspan="3"><textarea rows="3" name="attr_obligationcomp1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div><!--Obligation-->
+                        <div class="sheet-clear"></div>
+                        <div class="sheet-section-spacer sheet-obligation-toggle-small"></div>
+
+                        <b>Duty</b><input name="attr_character-Duty" value="1" checked="checked" style="width:96px;margin:-13px -20px 0 -80px" class="sheet-toggle sheet-duty-toggle-small" type="checkbox"/><span></span>
+                        <div class="sheet-duty-toggle-small">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th colspan="4">Duty</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td style="width:50%"><label style="text-align:right">Contribution Rank:</label></td>
+                                    <td style="width:50%"><input type="number" name="attr_contributionRank" min="0" value="0" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <br />
+                            <fieldset class="repeating_duty">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td style="width:25%"><label>Type:</label></td>
+                                        <td style="width:25%"><input type="text" name="attr_dutytype1" /></td>
+                                        <td style="width:25%"><label>Magnitude:</label></td>
+                                        <td style="width:25%"><input type="number" name="attr_dutymag1" min="0" value="0" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td style="width:25%"><label>Description:</label></td>
+                                        <td style="width:75%" colspan="3"><textarea rows="3" name="attr_dutydesc1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div><!--Duty-->
+                        <div class="sheet-clear"></div>
+                        <div class="sheet-section-spacer sheet-duty-toggle-small"></div>
+
+                        <b>Morality</b><input name="attr_character-Morality" value="1" checked="checked" style="width:96px;margin:-13px -20px 0 -80px" class="sheet-toggle sheet-morality-toggle-small" type="checkbox"/><span></span>
+                        <div class="sheet-morality-toggle-small">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th colspan="4">Morality</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td colspan="2"><label style="text-align:right">Morality:</label></td>
+                                    <td colspan="2"><input type="number" name="attr_morality" max="100" min="0" value="50" /></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"><label>Conflict:</label></td>
+                                    <td colspan="2"><input type="number" name="attr_conflict" min="0" value="0" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Emotional Strength(s):</label></td>
+                                    <td><textarea rows="2" name="attr_emotestrengt"></textarea></td>
+                                    <td><label>Emotional Weakness(es):</label></td>
+                                    <td><textarea rows="2" name="attr_emoteweakness"></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Description:</label></td>
+                                    <td><textarea rows="3" name="attr_emotestrengthdesc"></textarea></td>
+                                    <td><label>Description:</label></td>
+                                    <td><textarea rows="3" name="attr_emoteweaknessdec"></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div><!--Morality-->
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
             </div>
-            <div class="sheet-clear"></div>
-        </div><!--Career and Specialization List-->
-        <div class="sheet-row">
-            <div class="sheet-small-6 sheet-column">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr><th colspan="2">Description</th></tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><label>Gender:</label></td>
-                            <td><input type="text" name="attr_chargender" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Age:</label></td>
-                            <td><input type="text" name="attr_charager" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Height:</label></td>
-                            <td><input type="text" name="attr_charheight" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Build:</label></td>
-                            <td><input type="text" name="attr_charbuild" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Hair:</label></td>
-                            <td><input type="text" name="attr_charhair" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Eyes:</label></td>
-                            <td><input type="text" name="attr_chareyes" /></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-small-6 sheet-column">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr><th>Notable Features</th></tr>
-                    </thead>
-                    <tbody>
-                        <tr><td><textarea rows="4" name="attr_charfeatures"></textarea></td></tr>
-                    </tbody>
-                </table>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr><th>Other</th></tr>
-                    </thead>
-                    <tbody>
-                        <tr><td><textarea rows="4" name="attr_charother"></textarea></td></tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Description -->
-        <div class="sheet-row sheet-show-critical-table">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Critical Injuries</h3>
-            </div>
-            <div class="sheet-small-9 sheet-column">
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn1" value="1" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName1" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange1" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice1" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity1" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea row="3" name="attr_critSummary1" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect1" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect1" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn1})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn2" value="2" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName2" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange2" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice2" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity2" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary2" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect2" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect2" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn2})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn3" value="3" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName3" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange3" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice3" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity3" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary3" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect3" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect3" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn3})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn4" value="4" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName4" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange4" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice4" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity4" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary4" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect4" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect4" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn4})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn5" value="5" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName5" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange5" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice5" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity5" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary5" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect5" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect5" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn5})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn6" value="6" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName6" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange6" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice6" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity6" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary6" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect6" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect6" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn6})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn7" value="7" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName7" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange7" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice7" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity7" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary7" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect7" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect7" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn7})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn8" value="8" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName8" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange8" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice8" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity8" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary8" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect8" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect8" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn8})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn9" value="9" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName9" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange9" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice9" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity9" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary9" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect9" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect9" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn9})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn10" value="10" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName10" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange10" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice10" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity10" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary10" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect10" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect10" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn10})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn11" value="11" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName11" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange11" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice11" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity11" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary11" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect11" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect11" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn11})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn12" value="12" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName12" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange12" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice12" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity12" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary12" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect12" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect12" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn12})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn13" value="13" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName13" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange13" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice13" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity13" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary13" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect13" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect13" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn13})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn14" value="14" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName14" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange14" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice14" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity14" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary14" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect14" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect14" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn14})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn15" value="15" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName15" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange15" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice15" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity15" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary15" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect15" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect15" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn15})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-small-3 sheet-column">
-                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Critical roll offset:</label></td>
-                            <td><input type="text" name="attr_critAddOffset" value="" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll)">Roll Critical</button></td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <label>Critical number:</label>
-                                <input type="text" name="attr_critAddRangeNum" value="" />
-                            </td>
-                            <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|@{critAddRangeNum})">Add Critical</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Critical Injury Table -->
-        <div class="sheet-small-12 sheet-column">
-            <table cellspacing="0" cellpadding="0" border="0">
-                <thead>
-                    <tr><th colspan="6">Motivations</th></tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td><label>Category:</label></td>
-                        <td><input type="text" name='attr_attr_motivation-cat' /></td>
-                        <td><label>Type:</label></td>
-                        <td><input type="text" name="attr_motivation-type" /></td>
-                        <td><label>Description:</label></td>
-                        <td><textarea rows="2" name="attr_motivation-desc"></textarea></td>
-                    </tr>
-                    <tr>
-                        <td><label>Category:</label></td>
-                        <td><input type="text" name='attr_attr_motivation-cat2' /></td>
-                        <td><label>Type:</label></td>
-                        <td><input type="text" name="attr_motivation-type2" /></td>
-                        <td><label>Description:</label></td>
-                        <td><textarea rows="2" name="attr_motivation-desc2"></textarea></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div><!-- Motivations -->
-        <div class="sheet-small-12 sheet-column">
-            <h3>Game Mechanics</h3><br />
-            <div>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr><th colspan="4">Obligations</th></tr>
-                    </thead>
-                </table>
-                <br />
-                <fieldset class="repeating_obligation">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><label>Type:</label></td>
-                                <td><input type="text" name="attr_obligationtype1" /></td>
-                                <td><label>Magnitude:</label></td>
-                                <td><input type="number" name="attr_obligationmag1" min="0" value="0" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Details:</label></td>
-                                <td colspan="3"><textarea rows="3" name="attr_obligationcomp1"></textarea></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div><!--Obligation-->
-            <div>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr><th colspan="4">Duty</th></tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td style="width:50%"><label style="text-align:right">Contribution Rank:</label></td>
-                            <td style="width:50%"><input type="number" name="attr_contributionRank" min="0" value="0" /></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <br />
-                <fieldset class="repeating_duty">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td style="width:25%"><label>Type:</label></td>
-                                <td style="width:25%"><input type="text" name="attr_dutytype1" /></td>
-                                <td style="width:25%"><label>Magnitude:</label></td>
-                                <td style="width:25%"><input type="number" name="attr_dutymag1" min="0" value="0" /></td>
-                            </tr>
-                            <tr>
-                                <td style="width:25%"><label>Description:</label></td>
-                                <td style="width:75%" colspan="3"><textarea rows="3" name="attr_dutydesc1"></textarea></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div><!--Duty-->
-            <div>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr><th colspan="4">Morality</th></tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td colspan="2"><label style="text-align:right">Morality:</label></td>
-                            <td colspan="2"><input type="number" name="attr_morality" max="100" min="0" value="50" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><label>Conflict:</label></td>
-                            <td colspan="2"><input type="number" name="attr_conflict" min="0" value="0" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Emotional Strength(s):</label></td>
-                            <td><textarea rows="2" name="attr_emotestrengt"></textarea></td>
-                            <td><label>Emotional Weakness(es):</label></td>
-                            <td><textarea rows="2" name="attr_emoteweakness"></textarea></td>
-                        </tr>
-                        <tr>
-                            <td><label>Description:</label></td>
-                            <td><textarea rows="3" name="attr_emotestrengthdesc"></textarea></td>
-                            <td><label>Description:</label></td>
-                            <td><textarea rows="3" name="attr_emoteweaknessdec"></textarea></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div><!--Morality-->
         </div><!-- Mechanics -->
     </div><!-- Character Tab -->
     <div class="sheet-tab-content sheet-tab-skills">
-        <div class="sheet-row" style="margin-top:10px">
+        <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
-                <table class="sheet-characteristics" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
+                <h3 class="sheet-section-header">Characteristics</h3>
+                <input name="attr_character-Characteristics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-characteristic-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-characteristic-section">
+                    <table class="sheet-characteristics" cellspacing="0" cellpadding="0" border="0">
+                        <tbody>
                         <tr>
                             <td>
                                 <label>Brawn</label>
@@ -1119,16 +745,19 @@
                                 <input name='attr_presence' type="number" max="7" min="1" value="1" />
                             </td>
                         </tr>
-                    </tbody>
-                </table>
+                        </tbody>
+                    </table>
+                </div>
             </div>
             <div class="sheet-clear"></div>
         </div><!--Characteristics-->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Skills</h3>
-                <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
+                <input name="attr_character-Skills" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-skills-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-skills-section">
+                    <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
                             <th>General Skills</th>
                             <th>Career</th>
@@ -1161,89 +790,11 @@
                                 </div><!-- Modifier Help -->
                             </th>
                         </tr>
-                    </thead>
-                    <tbody>
+                        </thead>
+                        <tbody>
                         <tr>
                             <td>
                                 <label>Astrogation (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p71)</h5>
-                                            <ul>
-                                                <li>Program a navicomputer for a hyperspace jump.</li>
-                                                <li>Basic knowledge of galactic geography.</li>
-                                                <li>Use navicomputer to identify location.</li>
-                                                <li>Familiarity with hyperspace routes and the types of craft and commerce most common along a route.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Better target the location, e.g.: place vessel directly into orbit around target planet.</li>
-                                                <li>Reduce time spent calculating.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Reduce travel time.</li>
-                                                <li>Identify convenient stopovers to resupply or conduct additional business.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Complete calculations in minimum time.</li>
-                                                <li>Greatly reduce travel time.</li>
-                                                <li>Reveal highly valuable but previously unknown information.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Decrease accuracy of hyperspace jump.</li>
-                                                <li>Increase travel time.</li>
-                                                <li>Miss relevant details when analyzing hyperspace routes or galactic maps.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>As for <span class="sheet-icon-T"></span>, but to greater magnitude.</li>
-                                                <li>Trigger something truly awful happening, such as jumping out of hyperspace in the path of an asteroid.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
                             </td>
                             <td><input name='attr_careerskillAstrogation' type="checkbox" value="1"></td>
                             <td>
@@ -1259,85 +810,11 @@
                                     <input type="text" name="attr_diceAstrogation" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Astrogation' value='!eed characterID(@{character_id}) label(skill:Astrogation) @{diceAstrogation} skill(@{rankAstrogation}|@{intellect}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Astrogation' value='!eed characterID(@{character_id}) label(skill:Astrogation) @{diceAstrogation} skill(@{rankAstrogation}|@{intellect}|Astrogation) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Astrogation-->
                         <tr>
                             <td>
                                 <label>Athletics (Br)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p71)</h5>
-                                            <ul>
-                                                <li>Climb - including rappel or swing on a line - difficulty determined by surface and weather conditions.</li>
-                                                <li>Swim - difficulty determined by water conditions (waves, currents and tides).</li>
-                                                <li>Jump horizontally or vertically - difficulty determined by gravitational conditions and distance required.</li>
-                                                <li>Push movement to a longer speed or run for an extended time.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Reduce time required.</li>
-                                                <li>Increase distance travelled.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Generate bonus <span class="sheet-icon-B"></span> on other physical checks performed later or by allies that turn.</li>
-                                                <li><span class="sheet-icon-A"></span><span class="sheet-icon-A"></span> to grant additional maneuver during turn to move or perform physical activity.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Perform the check with truly impressive results.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Small amounts cause strain.</li>
-                                                <li>Larger amounts may cause character to fall prone, or even suffer a wound from sprains and bruises.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Inflict a Critical Injury, which the GM can choose to be thematic or roll randomly.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillAthletics' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankAthletics" max="6" min="0" value="0" /></td>
@@ -1351,82 +828,11 @@
                                     <input type="text" name="attr_diceAthletics" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Athletics' value='!eed characterID(@{character_id}) label(skill:Athletics) @{diceAthletics} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankAthletics}|@{brawn}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Athletics' value='!eed characterID(@{character_id}) label(skill:Athletics) @{diceAthletics} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankAthletics}|@{brawn}|Athletics) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Athletics-->
                         <tr>
                             <td>
                                 <label>Charm (Pr)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p72)</h5>
-                                            <ul>
-                                                <li>Persuade an individual to make a special exception to usual practices through flattery, flirting and grace.</li>
-                                                <li>Appeal to an individual's better nature, requiring them to go out of their way to aid the characters without any hope of remuneration.</li>
-                                                <li>Sincere seduction attempts (use Deceit when interest is feigned).</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Gain an extra scene in which target is willing to support you for each additional <span class="sheet-icon-S"></span></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Affect unexpected subjects beyond the original target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Have target NPC become recurring character who remains predisposed to assist.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Reduce the number of people able to influence</li>
-                                                <li>Turn those affected negatively against character.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Turn NPC against character and make into a minor recurring adversary.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
                             </td>
                             <td><input name='attr_careerskillCharm' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankCharm" max="6" min="0" value="0" /></td>
@@ -1440,81 +846,11 @@
                                     <input type="text" name="attr_diceCharm" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Charm' value='!eed characterID(@{character_id}) label(skill:Charm) @{diceCharm} skill(@{rankCharm}|@{presence}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Charm' value='!eed characterID(@{character_id}) label(skill:Charm) @{diceCharm} skill(@{rankCharm}|@{presence}|Charm) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Charm-->
                         <tr>
                             <td>
                                 <label>Coercion (Will)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p72)</h5>
-                                            <ul>
-                                                <li>Issue a threat, whether accompanied by hostile actions or implied, such as gesturing or pointing towards a weapon.</li>
-                                                <li>Question or persuade a target under conditions of physical captivity.</li>
-                                                <li>Acts of torture.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li><span class="sheet-icon-S"></span><span class="sheet-icon-S"></span> Inflict one strain on target. </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Affect unexpected subjects beyond the original target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Shift allegiance of target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Target has building resentment towards character.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Reveal something about goals and motivations to target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillCoercion' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankCoercion" max="6" min="0" value="0" /></td>
@@ -1528,100 +864,11 @@
                                     <input type="text" name="attr_diceCoercion" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Coercion' value='!eed characterID(@{character_id}) label(skill:Coercion) @{diceCoercion} skill(@{rankCoercion}|@{willpower}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Coercion' value='!eed characterID(@{character_id}) label(skill:Coercion) @{diceCoercion} skill(@{rankCoercion}|@{willpower}|Coercion) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Coercion-->
                         <tr>
                             <td>
                                 <label>Computers (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p73)</h5>
-                                            <ul>
-                                                <li>Open a locked door, control an elevator or bypass a security system.</li>
-                                                <li>Search through records, particularly if encrypted.</li>
-                                                <li>Investigate what actions a slicer might have taken against a computer system.</li>
-                                                <li>Alter a droid's programming or gain access to its memories.</li>
-                                                <li>Recover data from a system that has suffered physical damage.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Reduce time required.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Uncover additional information about the system.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Obfuscate actions taken -add <span class="sheet-icon-R"></span> to any check to detect or identify the characters actions.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>
-                                                    The character does a
-                                                    poor job of concealing his
-                                                    presence in the system.
-                                                    Security systems are
-                                                    alerted, and add <span class="sheet-icon-B"></span> to the
-                                                    check of any NPC attempting
-                                                    to discover evidence of his
-                                                    actions.
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>
-                                                    Leave behind trace
-                                                    information of your own
-                                                    system in the system being
-                                                    sliced. Add <span class="sheet-icon-B"></span> to the check of
-                                                    any NPC using the target
-                                                    system to slice the
-                                                    character's system.
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillComputers' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankComputers" max="6" min="0" value="0" /></td>
@@ -1635,81 +882,11 @@
                                     <input type="text" name="attr_diceComputers" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Computers' value='!eed characterID(@{character_id}) label(skill:Computers) @{diceComputers} skill(@{rankComputers}|@{intellect}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Computers' value='!eed characterID(@{character_id}) label(skill:Computers) @{diceComputers} skill(@{rankComputers}|@{intellect}|Computers) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Computers-->
                         <tr>
                             <td>
                                 <label>Cool (Pr)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p74)</h5>
-                                            <ul>
-                                                <li>Resist efforts to hide the truth among overt niceties.</li>
-                                                <li>Check for initiative when carefully and calmly prepared.</li>
-                                                <li>Check for initiative in a social situation/discussion where timing matters.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>-</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Gain an additional insight into the situation at hand.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Heal 3 strain.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Miss a vital detail or event.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>The character is overwhelmed by the chaos and is stunned for one round.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillCool' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankCool" max="6" min="0" value="0" /></td>
@@ -1723,84 +900,11 @@
                                     <input type="text" name="attr_diceCool" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Cool' value='!eed characterID(@{character_id}) label(skill:Cool) @{diceCool} skill(@{rankCool}|@{presence}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Cool' value='!eed characterID(@{character_id}) label(skill:Cool) @{diceCool} skill(@{rankCool}|@{presence}|Cool) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Cool-->
                         <tr>
                             <td>
                                 <label>Coordination (Ag)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p74)</h5>
-                                            <ul>
-                                                <li>Reduce damage when falling (see p140).</li>
-                                                <li>Walk across a narrow surface, whether a wide beam or a thin pipe.</li>
-                                                <li>Escape from restraints.</li>
-                                                <li>Crawl through the twists and turns of a sewage pipe, ventilation duct or garbage chute.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Reduce time required.</li>
-                                                <li>Increase distance travelled by 25%, (maximum 100% increase).</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li><span class="sheet-icon-A"></span><span class="sheet-icon-A"></span> to grant additional maneuver during turn.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Perform the check with truly impressive results.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Lose free maneuver for one round.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Suffer a wound</li>
-                                                <li>Lose a vital piece of equipment.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillCoordination' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankCoordination" max="6" min="0" value="0" /></td>
@@ -1814,81 +918,11 @@
                                     <input type="text" name="attr_diceCoordination" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Coordination' value='!eed characterID(@{character_id}) label(skill:Coordination) @{diceCoordination} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankCoordination}|@{agility}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Coordination' value='!eed characterID(@{character_id}) label(skill:Coordination) @{diceCoordination} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankCoordination}|@{agility}|Coordination) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Coordination-->
                         <tr>
                             <td>
                                 <label>Deception (Cun)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p75)</h5>
-                                            <ul>
-                                                <li>Mislead a buyer or seller about the value of an object.</li>
-                                                <li>Distract an opponent through guile.</li>
-                                                <li>Lay a false trail when pursued.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Extend duration of Deceit action.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Increase the value of any goods or services gained through the action.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Fool the target into believing the character is trustworthy - future Deceit checks against target do not require an opposed check.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Give away a portion of the lie, making target suspicious.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Target realises he has been lied to and spreads word of his deceit to harm his reputation or uses the situation to his advantage.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillDeception' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankDeception" max="6" min="0" value="0" /></td>
@@ -1902,106 +936,11 @@
                                     <input type="text" name="attr_diceDeception" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Deception' value='!eed characterID(@{character_id}) label(skill:Deception) @{diceDeception} skill(@{rankDeception}|@{cunning}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Deception' value='!eed characterID(@{character_id}) label(skill:Deception) @{diceDeception} skill(@{rankDeception}|@{cunning}|Deception) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Deception-->
                         <tr>
                             <td>
                                 <label>Discipline (Will)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p75)</h5>
-                                            <ul>
-                                                <li>Act normally while pinned down by heavy fire.</li>
-                                                <li>Engage, rather than flee before, a creature with inherently horrifying aspects.</li>
-                                                <li>Resist a tempting deal that seems far too good to be true.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Downgrade difficulty of the dice pool for next action (max. 1).</li>
-                                                <li>For Fear Checks:</li>
-                                                <li>The character avoids any fear effects, except those triggered by <span class="sheet-icon-T"></span></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Gain an additional insight into the situation at hand.</li>
-                                                <li>For Fear Checks:</li>
-                                                <li>Gain <span class="sheet-icon-B"></span> on the character's first check.</li>
-                                                <li>If spending multiple <span class="sheet-icon-A"></span>, grant <span class="sheet-icon-B"></span> to an additional player's first check.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Add <span class="sheet-icon-B"></span> to any Discipline checks made by allies during the following round.</li>
-                                                <li>For Fear Checks:</li>
-                                                <li>Can be spent to cancel all previous penalties from fear checks, or</li>
-                                                <li>Spent to ensure the character need not make any additional fear checks during the encounter, no matter the source.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-failure sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-F"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Failure</h5>
-                                            <ul>
-                                                <li>For Fear Checks:</li>
-                                                <li>The character adds <span class="sheet-icon-BLK"></span> to each action he takes during the encounter.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Undermine the characters resolve, perhaps inflicting a penalty on further actions in distressing circumstances.</li>
-                                                <li>For Fear Checks:</li>
-                                                <li>The character suffers a number of strain equal to the number of Failures.</li>
-                                                <li>If the check generates <span class="sheet-icon-T"></span><span class="sheet-icon-T"></span><span class="sheet-icon-T"></span> or more, the character can be staggeed for his first turn, instead.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>The character is overwhelmed entirely and is unable to perform more than one maneuver next round.</li>
-                                                <li>For Fear Checks:</li>
-                                                <li>The character is incredibly frightend and increases the difficulty of all checks until the end of the encounter by one.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillDiscipline' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankDiscipline" max="6" min="0" value="0" /></td>
@@ -2015,97 +954,11 @@
                                     <input type="text" name="attr_diceDiscipline" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Discipline' value='!eed characterID(@{character_id}) label(skill:Discipline) @{diceDiscipline} skill(@{rankDiscipline}|@{willpower}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Discipline' value='!eed characterID(@{character_id}) label(skill:Discipline) @{diceDiscipline} skill(@{rankDiscipline}|@{willpower}|Discipline) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Discipline-->
                         <tr>
                             <td>
                                 <label>Leadership (Pr)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p76)</h5>
-                                            <ul>
-                                                <li>Rally allies subject to the effects of fear (see p189).</li>
-                                                <li>Sway a crowd in a public venue to take action, most often of a political nature.</li>
-                                                <li>Reassert the loyalty of underlings that have fallen before the guile of an opponent.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Extend target's support for additional scenes.</li>
-                                                <li>Increase efficiency or effectiveness of target during ordered actions.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Affect bystanders in addition to target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Have target NPC become recurring character who decides to faithfully follow the acting character.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Decrease the efficiency of ordered actions, causing them to take longer or be done poorly.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>
-                                                    Undermine the
-                                                    character's authority,
-                                                    damaging the characters
-                                                    ability to command target or
-                                                    those who witnessed the
-                                                    attempt.
-                                                </li>
-                                                <li>
-                                                    With multiple <span class="sheet-icon-Des"></span> target may
-                                                    become a recurring thorn in
-                                                    the character's side,
-                                                    refusing future orders or
-                                                    turning others against the
-                                                    character.
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillLeadership' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankLeadership" max="6" min="0" value="0" /></td>
@@ -2119,92 +972,11 @@
                                     <input type="text" name="attr_diceLeadership" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Leadership' value='!eed characterID(@{character_id}) label(skill:Leadership) @{diceLeadership} skill(@{rankLeadership}|@{presence}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Leadership' value='!eed characterID(@{character_id}) label(skill:Leadership) @{diceLeadership} skill(@{rankLeadership}|@{presence}|Leadership) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Leadership-->
                         <tr>
                             <td>
                                 <label>Mechanics (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p76)</h5>
-                                            <ul>
-                                                <li>Repair physical damage to a device, provided necessary tools and replacement components are available.
-                                                <li>Repair starship or vehicle (see p155).</li>
-                                                <li>Identify the parts and tools necessary for a repair job, along with approximate cost.</li>
-                                                <li>Construct a completely new device from discrete components and damaged devices.</li>
-                                                <li>Make a healing check on a droid (see Medicine, p177).</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Reduce time required by 10-20%</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Grant <span class="sheet-icon-B"></span> on checks when using repaired item, or even the Superior quality, for a session.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Give device additional single use function.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>
-                                                    Particularly shoddy
-                                                    repairs or temporary
-                                                    measures, the GM may spend <span class="sheet-icon-T"></span>
-                                                    to cause the target object
-                                                    or system to malfunction
-                                                    shortly after check
-                                                    completed.
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Cause further harm to target object or system.</li>
-                                                <li>Cause other components of target to malfunction.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillMechanics' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankMechanics" max="6" min="0" value="0" /></td>
@@ -2218,84 +990,11 @@
                                     <input type="text" name="attr_diceMechanics" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Mechanics' value='!eed characterID(@{character_id}) label(skill:Mechanics) @{diceMechanics} skill(@{rankMechanics}|@{intellect}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Mechanics' value='!eed characterID(@{character_id}) label(skill:Mechanics) @{diceMechanics} skill(@{rankMechanics}|@{intellect}|Mechanics) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Mechanics-->
                         <tr>
                             <td>
                                 <label>Medicine (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p77)</h5>
-                                            <ul>
-                                                <li>Apply routine first aid, including medpacs.</li>
-                                                <li>Treat or inflict a poison, pharmaceutical or recreational drug.</li>
-                                                <li>Identify symptoms and treatment for infectious diseases and parasites.</li>
-                                                <li>More serious treatment - including surgery, cybernetic augmentation and psychotherapy, provided necessary pharmaceuticals and medical instruments are available.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Target recovers one additional wound.</li>
-                                                <li>Reduce healing time by one hour.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Eliminate one strain from target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Heal additional wounds while attempting to heal Critical Injury, or vice versa.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Inflict strain on the target due to shock of procedure.</li>
-                                                <li>Increase time procedure takes.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>A truly terrible accident, perhaps inflicting further wounds on target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillMedicine' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankMedicine" max="6" min="0" value="0" /></td>
@@ -2309,84 +1008,11 @@
                                     <input type="text" name="attr_diceMedicine" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Medicine' value='!eed characterID(@{character_id}) label(skill:Medicine) @{diceMedicine} skill(@{rankMedicine}|@{intellect}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Medicine' value='!eed characterID(@{character_id}) label(skill:Medicine) @{diceMedicine} skill(@{rankMedicine}|@{intellect}|Medicine) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Medicine-->
                         <tr>
                             <td>
                                 <label>Negotiation (Pr)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p77)</h5>
-                                            <ul>
-                                                <li>Adjust the purchase price when buying goods or services.</li>
-                                                <li>Adjust the selling price when selling goods or services.</li>
-                                                <li>Participate in skill-based gambling (use Deceit when cheating).</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Increase acting character's profit by 5%.</li>
-                                                <li>Modify scope of agreement.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Earn unrelated boons from target, concessions if failed or extra perks if passed.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Have target NPC become regular client or specialist vendor.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Increase cost of goods purchased.</li>
-                                                <li>Decrease value of goods sold.</li>
-                                                <li>Shorten contracts negotiated.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Seriously sabotage goals during the interaction, perhaps receive counterfeit goods or payment, or agree to terms entirely beyond scope of negotiation.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillNegotiation' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankNegotiation" max="6" min="0" value="0" /></td>
@@ -2400,82 +1026,11 @@
                                     <input type="text" name="attr_diceNegotiation" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Negotiation' value='!eed characterID(@{character_id}) label(skill:Negotiation) @{diceNegotiation} skill(@{rankNegotiation}|@{presence}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Negotiation' value='!eed characterID(@{character_id}) label(skill:Negotiation) @{diceNegotiation} skill(@{rankNegotiation}|@{presence}|Negotiation) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Negotiation-->
                         <tr>
                             <td>
                                 <label>Perception (Cun)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p78)</h5>
-                                            <ul>
-                                                <li>Detect a trap or ambush, prior to falling prey to the assault.</li>
-                                                <li>Detect a disguised individual, when not actively looking.</li>
-                                                <li>Notice a subtle clue - overheard conversation, the stink of a Jawa, drug introduced to beverage.</li>
-                                                <li>Accidently notice subtly hidden objects, such as the latch securing a smuggling compartment.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Reveal additional details.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Recall additional information associated with object noticed.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Notice details that can be useful later to gain <span class="sheet-icon-B"></span> on future interactions with noticed object.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Conceal a vital detail about situation or environment.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Obtain false information about surroundings or target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillPerception' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankPerception" max="6" min="0" value="0" /></td>
@@ -2489,83 +1044,11 @@
                                     <input type="text" name="attr_dicePerception" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Perception' value='!eed characterID(@{character_id}) label(skill:Perception) @{dicePerception} skill(@{rankPerception}|@{cunning}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Perception' value='!eed characterID(@{character_id}) label(skill:Perception) @{dicePerception} skill(@{rankPerception}|@{cunning}|Perception) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Perception-->
                         <tr>
                             <td>
                                 <label>Piloting - Planetary (Ag)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p78)</h5>
-                                            <ul>
-                                                <li>Decipher basic controls of completely foreign type of atmospheric craft.</li>
-                                                <li>Determine results of a race upon a world's surface.</li>
-                                                <li>Maintain a tail or lose a chaser.</li>
-                                                <li>Navigate through a familiar environment, representing knowledge of typical traffic patterns.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Gain insights into situation.</li>
-                                                <li>Deduce way to modify vehicle to make it more effective in future.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Reveal vulnerability in opponent's piloting style or vehicle, giving benefit in later rounds.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Grant additional maneuver while continuing to pilot vehicle.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li><span class="sheet-icon-T"></span><span class="sheet-icon-T"></span> to give opponents on <span class="sheet-icon-B"></span> checks against character and vehicle due to momentary malfunction in system.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Deal damage to vehicle as character strains systems throughout vehicle during check.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillPlanetary' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankPlanetary" max="6" min="0" value="0" /></td>
@@ -2579,82 +1062,11 @@
                                     <input type="text" name="attr_dicePlanetary" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Planetary' value='!eed characterID(@{character_id}) label(skill:Piloting - Planetary) @{dicePlanetary} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankPlanetary}|@{agility}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Planetary' value='!eed characterID(@{character_id}) label(skill:Piloting - Planetary) @{dicePlanetary} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankPlanetary}|@{agility}|PilotingPlanetary) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Piloting (Planetary)-->
                         <tr>
                             <td>
                                 <label>Piloting - Space (Ag)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p79)</h5>
-                                            <ul>
-                                                <li>Determine results of a race between the stars.</li>
-                                                <li>Resolve chases, whether through asteroid belts, a crowded battlefield or skirting the edge of a gravimetric instability.</li>
-                                                <li>Jockey for position in a space conflict, to determine which shields face the enemy and which weapons may be brought to bear.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Gain insights into situation.</li>
-                                                <li>Deduce way to modify vehicle to make it more effective in future.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Reveal vulnerability in opponent's piloting style or vehicle, giving benefit in later rounds.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Grant additional maneuver while continuing to pilot vehicle.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li><span class="sheet-icon-T"></span><span class="sheet-icon-T"></span> to give opponents on <span class="sheet-icon-B"></span> checks against character and vehicle due to momentary malfunction in system.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Deal damage to vehicle as character strains systems throughout vehicle during check.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillSpace' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankSpace" max="6" min="0" value="0" /></td>
@@ -2668,82 +1080,11 @@
                                     <input type="text" name="attr_diceSpace" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Space' value='!eed characterID(@{character_id}) label(skill:Piloting - Space) @{diceSpace} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankSpace}|@{agility}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Space' value='!eed characterID(@{character_id}) label(skill:Piloting - Space) @{diceSpace} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankSpace}|@{agility}|PilotingSpace) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Piloting (Space)-->
                         <tr>
                             <td>
                                 <label>Resilience (Br)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p79)</h5>
-                                            <ul>
-                                                <li>Go without sleep for significantly longer than is healthy for species.</li>
-                                                <li>Resist the effects of a toxin.</li>
-                                                <li>Endure prolonged exposure to a hostile environment - including heat, cold or toxic pollution.</li>
-                                                <li>Resist the effects of dehydration and malnutrition.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Extend effects of the success to increase time between checks.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Identify way to reduce difficulty of future checks against same threat.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Recover 3 strain.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Overburden the character, inflicting penalties on subsequent checks.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Inflict a wound or minor Critical Injury on character, as they succumb to harsh conditions.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillResilience' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankResilience" max="6" min="0" value="0" /></td>
@@ -2757,81 +1098,11 @@
                                     <input type="text" name="attr_diceResilience" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Resilience' value='!eed characterID(@{character_id}) label(skill:Resilience) @{diceResilience} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankResilience}|@{brawn}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Resilience' value='!eed characterID(@{character_id}) label(skill:Resilience) @{diceResilience} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankResilience}|@{brawn}|Resilience) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Resilience-->
                         <tr>
                             <td>
                                 <label>Skulduggery (Cun)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p80)</h5>
-                                            <ul>
-                                                <li>Pick a lock or pocket using physical tools rather than programming.</li>
-                                                <li>Escape from a cell (after using Coordination to slip any bonds) and navigate away from security elements.</li>
-                                                <li>Identify the most vulnerable aspects of a security scheme.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Gain additional insights about nature of opposition.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Identify additional potential target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Earn an unexpected boon.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Opportunity to catch character immediately after act, number of <span class="sheet-icon-T"></span> determine immediacy of discovery and ensuing danger.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Leave behind evidence of larceny.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillSkulduggery' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankSkulduggery" max="6" min="0" value="0" /></td>
@@ -2845,81 +1116,11 @@
                                     <input type="text" name="attr_diceSkulduggery" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Skulduggery' value='!eed characterID(@{character_id}) label(skill:Skulduggery) @{diceSkulduggery} skill(@{rankSkulduggery}|@{cunning}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Skulduggery' value='!eed characterID(@{character_id}) label(skill:Skulduggery) @{diceSkulduggery} skill(@{rankSkulduggery}|@{cunning}|Skulduggery) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Skulduggery-->
                         <tr>
                             <td>
                                 <label>Stealth (Ag)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p80)</h5>
-                                            <ul>
-                                                <li>Blend in with a crowd, hiding by acting as though you belong.</li>
-                                                <li>Hide from an opponent's senses, modified by ambient conditions and applicable gear.</li>
-                                                <li>Hide people or objects from the attentions of others, either through concealment or misdirection.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Assist allied character infiltrating at same time.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Decrease time taken to perform action while hidden.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Identify way to completely distract opponent for duration of scene.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Increase time taken to perform action while hidden by 20%.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Leave behind evidence of passing, concerning identity and possibly motive.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillStealth' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankStealth" max="6" min="0" value="0" /></td>
@@ -2933,81 +1134,11 @@
                                     <input type="text" name="attr_diceStealth" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Stealth' value='!eed characterID(@{character_id}) label(skill:Stealth) @{diceStealth} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankStealth}|@{agility}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Stealth' value='!eed characterID(@{character_id}) label(skill:Stealth) @{diceStealth} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankStealth}|@{agility}|Stealth) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Stealth-->
                         <tr>
                             <td>
                                 <label>Streetwise (Cun)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p81)</h5>
-                                            <ul>
-                                                <li>Locate a merchant who specialises in unsavoury goods or illicit services.</li>
-                                                <li>Pick up subtle cues from the language and attitudes of those who operate outside of legal structures. Understand subtle references within conversations.</li>
-                                                <li>Discover what rumours are actively circulating within a region.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Reduce time or funds required to obtain item, information or service.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Reveal additional rumours or alternative sources.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Gain semi-permanent contact on street.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Seed gathered information with minor falsehoods.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Character lets slip details about self or information sought.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillStreetwise' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankStreetwise" max="6" min="0" value="0" /></td>
@@ -3021,85 +1152,11 @@
                                     <input type="text" name="attr_diceStreetwise" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Streetwise' value='!eed characterID(@{character_id}) label(skill:Streetwise) @{diceStreetwise} skill(@{rankStreetwise}|@{cunning}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Streetwise' value='!eed characterID(@{character_id}) label(skill:Streetwise) @{diceStreetwise} skill(@{rankStreetwise}|@{cunning}|Streetwise) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Streetwise-->
                         <tr>
                             <td>
                                 <label>Survival (Cun)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p82)</h5>
-                                            <ul>
-                                                <li>Identify safe food, potable water or shelter in a natural environment.</li>
-                                                <li>Understand weather patterns. Recognise the signs of imminent dangerous conditions and know the best way to prepare.</li>
-                                                <li>Track a subject through the wilderness - whether game or bounty.</li>
-                                                <li>Handle domesticated animals, so they may be used as beasts of burden or transport.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Assist other character in surviving.</li>
-                                                <li>Stockpile goods to increase time between checks.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Gain insight into environment to make future checks simpler.</li>
-                                                <li>When tracking, learn significant detail about target, such as number, species or how recently tracks were made.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>When handling domesticated animal, predispose animal towards character earning loyal companion.</li>
-                                                <li>When tracking, learn vital clue about target.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Spend vital resources (food, fuel, etc.) during check.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>Inflict wounds, Critical Injuries or large amounts of strain on character.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillSurvival' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankSurvival" max="6" min="0" value="0" /></td>
@@ -3113,81 +1170,11 @@
                                     <input type="text" name="attr_diceSurvival" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Survival' value='!eed characterID(@{character_id}) label(skill:Survival) @{diceSurvival} skill(@{rankSurvival}|@{cunning}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Survival' value='!eed characterID(@{character_id}) label(skill:Survival) @{diceSurvival} skill(@{rankSurvival}|@{cunning}|Survival) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Survival-->
                         <tr>
                             <td>
                                 <label>Vigilance (Will)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p82)</h5>
-                                            <ul>
-                                                <li>Check for initiative when unprepared.</li>
-                                                <li>Use ability associated with the Force dependent on Vigilance.</li>
-                                                <li>Determine how prepared you are for unexpected crises. Resolve questions about whether or not a small piece of gear is available.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-success sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-S"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Additional Success</h5>
-                                            <ul>
-                                                <li>Character is particularly well prepared.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-advantage sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-A"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Advantage</h5>
-                                            <ul>
-                                                <li>Notice key environmental factor.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-triumph sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Tri"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Triumph</h5>
-                                            <ul>
-                                                <li>Gain extra maneuver during first round of combat.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-threat sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-T"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Threat</h5>
-                                            <ul>
-                                                <li>Miss key piece of information about situation or environment.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <div class="sheet-help-despair sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-Des"></span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Per Despair</h5>
-                                            <ul>
-                                                <li>The character is unable to perform more than one maneuver during first round of combat.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillVigilance' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankVigilance" max="6" min="0" value="0" /></td>
@@ -3201,37 +1188,23 @@
                                     <input type="text" name="attr_diceVigilance" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_Vigilance' value='!eed characterID(@{character_id}) label(skill:Vigilance) @{diceVigilance} skill(@{rankVigilance}|@{willpower}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_Vigilance' value='!eed characterID(@{character_id}) label(skill:Vigilance) @{diceVigilance} skill(@{rankVigilance}|@{willpower}|Vigilance) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Vigilance-->
-                    </tbody>
-                </table><!--General Skills Section-->
-                <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
+                        </tbody>
+                    </table><!--General Skills Section-->
+                    <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
                             <th>Combat Skills</th>
                             <th>Career</th>
                             <th colspan="2">Rank</th>
                             <th colspan="2">Mods</th>
                         </tr>
-                    </thead>
-                    <tbody>
+                        </thead>
+                        <tbody>
                         <tr>
                             <td valign="middle">
                                 <label>Lightsaber</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p130)</h5>
-                                            <ul>
-                                                <li>Make a melee attack while using a Lightsaber-type weapon.</li>
-                                                <li>The characteristic associated with this skill can be modified by certain talents.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                                 <select name="attr_charLightsaber" style="float:right; width:50%">
                                     <option value="@{brawn}">Brawn</option><!-- encum not working -->
                                     <option value="@{agility}">Agility</option>
@@ -3258,19 +1231,6 @@
                         <tr>
                             <td>
                                 <label>Brawl (Br)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p83)</h5>
-                                            <ul>
-                                                <li>Make a melee attack while unarmed or using a Brawl weapon.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillBrawl' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankBrawl" max="6" min="0" value="0" /></td>
@@ -3289,20 +1249,6 @@
                         <tr>
                             <td>
                                 <label>Gunnery (Agi)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p83)</h5>
-                                            <ul>
-                                                <li>Make a ranged attack using a Gunnery weapon.</li>
-                                                <li>Operate complex targeting computers and automated weapons mounts.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillGunnery' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankGunnery" max="6" min="0" value="0" /></td>
@@ -3321,19 +1267,6 @@
                         <tr>
                             <td>
                                 <label>Melee (Br)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p84)</h5>
-                                            <ul>
-                                                <li>Make a melee attack using a Melee weapon.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillMelee' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankMelee" max="6" min="0" value="0" /></td>
@@ -3351,20 +1284,7 @@
                         </tr><!--Melee-->
                         <tr>
                             <td>
-                                <label>Ranged - Light  (Ag)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p84)</h5>
-                                            <ul>
-                                                <li>Make a ranged attack using a Ranged (Light) weapon.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
+                                <label>Ranged - Light (Ag)</label>
                             </td>
                             <td><input name='attr_careerskillLight' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankLight" max="6" min="0" value="0" /></td>
@@ -3383,19 +1303,6 @@
                         <tr>
                             <td>
                                 <label>Ranged - Heavy (Ag)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p84)</h5>
-                                            <ul>
-                                                <li>Make a ranged attack using a Ranged (Heavy) weapon.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillHeavy' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankHeavy" max="6" min="0" value="0" /></td>
@@ -3411,36 +1318,21 @@
                             </td>
                             <td><button type='roll' name='roll_Heavy' value='!eed characterID(@{character_id}) label(skill:Ranged - Heavy) @{diceHeavy} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankHeavy}|@{agility}) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Ranged - Heavy-->
-                    </tbody>
-                </table><!--Combat Skills Section-->
-                <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
+                        </tbody>
+                    </table><!--Combat Skills Section-->
+                    <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
                             <th>Knowledge Skills</th>
                             <th>Career</th>
                             <th colspan="2">Rank</th>
                             <th colspan="2">Mods</th>
                         </tr>
-                    </thead>
-                    <tbody>
+                        </thead>
+                        <tbody>
                         <tr>
                             <td>
                                 <label>Core Worlds (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p85)</h5>
-                                            <ul>
-                                                <li>Identify a person's planet of origin without asking, by recognising traits of accent, dress and mannerisms associated with a particular world.</li>
-                                                <li>Know what behaviours are considered necessary and polite, as opposed to ones that could be offensive when interacting with someone from a Core World.</li>
-                                                <li>Identify which markets are the best places to sell or purchase a particular cargo (in the Core Worlds). Recognise any worlds where such goods could be illegal.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillCore' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankCore" max="6" min="0" value="0" /></td>
@@ -3459,21 +1351,6 @@
                         <tr>
                             <td>
                                 <label>Education (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p85)</h5>
-                                            <ul>
-                                                <li>Identify the best way to proceed when interacting with a government entity.</li>
-                                                <li>Employ basic scientific knowledge in an analysis.</li>
-                                                <li>Understand any question that doesn't obviously fall under another knowledge skill.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillEducation' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankEducation" max="6" min="0" value="0" /></td>
@@ -3492,20 +1369,6 @@
                         <tr>
                             <td>
                                 <label>Lore (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p85)</h5>
-                                            <ul>
-                                                <li>Decipher an ancient piece of writing or identify its context.</li>
-                                                <li>Know legends associated with the exploits of an ancient hero.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillLore' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankLore" max="6" min="0" value="0" /></td>
@@ -3524,21 +1387,6 @@
                         <tr>
                             <td>
                                 <label>Outer Rim (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p86)</h5>
-                                            <ul>
-                                                <li>Find a planet with a particular resource or service among the systems of the Outer Rim.</li>
-                                                <li>Identify which markets are the best places to sell or purchase a particular cargo (in the Outer Rim). Recognise any worlds where such goods could be illegal.</li>
-                                                <li>Know what behaviours are considered necessary and polite, as opposed to ones that could be offensive when interacting with someone from an Outer Rim world.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillOuter' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankOuter" max="6" min="0" value="0" /></td>
@@ -3557,20 +1405,6 @@
                         <tr>
                             <td>
                                 <label>Underworld (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p86)</h5>
-                                            <ul>
-                                                <li>Know which nearby worlds are the best locations for a particular type of illegal business.</li>
-                                                <li>Determine the most common methods an opponent might use for a particular type of criminal activity.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillUnderworld' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankUnderworld" max="6" min="0" value="0" /></td>
@@ -3589,21 +1423,6 @@
                         <tr>
                             <td>
                                 <label>Xenology (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (p86)</h5>
-                                            <ul>
-                                                <li>Know what behaviours are considered necessary and polite, as opposed to ones that could be offensive when interacting with a member of an unfamiliar species.</li>
-                                                <li>Identify a particular way to injure or a characteristic vulnerability, to either help or harm a member of another species.</li>
-                                                <li>Know appropriate environmental conditions and foodstuffs for a member of another species.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillXenology' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankXenology" max="6" min="0" value="0" /></td>
@@ -3622,20 +1441,6 @@
                         <tr>
                             <td>
                                 <label>Warfare (Int)</label>
-                                <div class="sheet-tips">
-                                    <div class="sheet-help-def sheet-help">
-                                        <div class="sheet-icon">
-                                            <span class="sheet-icon-question">?</span>
-                                        </div>
-                                        <div class="sheet-help-content">
-                                            <h5>Overview (AoR p136)</h5>
-                                            <ul>
-                                                <li>Know of the strategies and tactics of warefare both on the ground and in space.</li>
-                                                <li>Remembering details about a significant event, organization, or individual who played a role in a galactic struggle.</li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div><!-- end tip -->
                             </td>
                             <td><input name='attr_careerskillWarfare' type="checkbox" value="1"></td>
                             <td><input type="number" name="attr_rankWarfare" max="6" min="0" value="0" /></td>
@@ -3651,10 +1456,10 @@
                             </td>
                             <td><button type='roll' name='roll_Warfare' value='!eed characterID(@{character_id}) label(skill:Warfare) @{diceXenology} skill(@{rankWarfare}|@{intellect}) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Warfare-->
-                    </tbody>
-                </table><!--Knowledge Skills Section-->
-                <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
+                        </tbody>
+                    </table><!--Knowledge Skills Section-->
+                    <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
                             <th>Custom Skills</th>
                             <th>Char</th>
@@ -3662,8 +1467,8 @@
                             <th colspan="2">Rank</th>
                             <th colspan="2">Mods</th>
                         </tr>
-                    </thead>
-                    <tbody>
+                        </thead>
+                        <tbody>
                         <tr>
                             <td><input type="text" name="attr_customskillname1" /></td>
                             <td>
@@ -3688,7 +1493,7 @@
                                     <input type="text" name="attr_dicecustomskillname1" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_customskillname1' value='!eed characterID(@{character_id}) label(skill:@{customskillname1}) @{dicecustomskillname1} skill(@{rankcustomskillname1}|@{charcustomskillname1}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_customskillname1' value='!eed characterID(@{character_id}) label(skill:@{customskillname1}) @{dicecustomskillname1} skill(@{rankcustomskillname1}|@{charcustomskillname1}|@{customskillname1}) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Custom Skill 1-->
                         <tr>
                             <td><input type="text" name="attr_customskillname2" /></td>
@@ -3714,529 +1519,661 @@
                                     <input type="text" name="attr_dicecustomskillname2" />
                                 </div>
                             </td>
-                            <td><button type='roll' name='roll_customskillname2' value='!eed characterID(@{character_id}) label(skill:@{customskillname2}) @{dicecustomskillname2} skill(@{rankcustomskillname2}|@{charcustomskillname2}) @{dicePool} (gmdice)'></button></td>
+                            <td><button type='roll' name='roll_customskillname2' value='!eed characterID(@{character_id}) label(skill:@{customskillname2}) @{dicecustomskillname2} skill(@{rankcustomskillname2}|@{charcustomskillname2}|@{customskillname2}) @{dicePool} (gmdice)'></button></td>
                         </tr><!--Custom Skill 2-->
-                    </tbody>
-                </table><!--Custom Skills Section-->
+                        </tbody>
+                    </table><!--Custom Skills Section-->
+                </div>
             </div>
             <div class="sheet-clear"></div>
         </div><!--Skills List-->
     </div><!-- Skills Tab -->
     <div class="sheet-tab-content sheet-tab-talents">
-        <div class="sheet-small-12 sheet-column">
-            <br />
-            <br />
-            <div class="sheet-clear"></div>
-            <div class="sheet-attachments-wrapper">
-                <input type="checkbox" name="attr_character_init" class="sheet-view-attachments" />
-                <label class="sheet-view-attachments">Show Initiative</label>
-                <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <table>
-                                    <tr>
-                                        <td><label>What kind of Initiative Slot?</label></td>
-                                        <td><label>PC<input type="radio" name="attr_npc-pc" value="pcinit" checked="checked" /></label></td>
-                                        <td><label>NPC<input type="radio" name="attr_npc-pc" value="npcinit" /></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                    </tr>
-                                </table>
-                                <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
-                                    <tr>
-                                        <td><label>Cool (if prepared):</label></td>
-                                        <td>
-                                            <input class="sheet-yd" type="hidden" name="attr_yCoolInit" value="(((@{presence} + @{rankCool}) - abs(@{presence} - @{rankCool})) / 2)" disabled><span></span>
-                                            <input class="sheet-gd" type="hidden" name="attr_gCoolInit" value="((((@{presence} + @{rankCool}) + abs(@{presence} - @{rankCool})) / 2) - @{yCoolInit})" disabled><span></span>
-                                        </td>
-                                        <td><label>Modifiers</label><input name='attr_initiativeCoolDice' type="text" /></td>
-                                        <td>
-                                            <button type='roll' name='roll_VigilanceInit' value='!eed @{npc-pc} characterID(@{character_id}) label(skill:Initiative Cool) skill(@{rankCool}|@{presence}) @{initiativeCoolDice} @{dicePool}'></button>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><label>Vigilance (if unexpected):</label></td>
-                                        <td>
-                                            <input class="sheet-yd" type="hidden" name="attr_yVigilanceInit" value="(((@{willpower} + @{rankVigilance}) - abs(@{willpower} - @{rankVigilance})) / 2)" disabled><span></span>
-                                            <input class="sheet-gd" type="hidden" name="attr_gVigilanceInit" value="((((@{willpower} + @{rankVigilance}) + abs(@{willpower} - @{rankVigilance})) / 2) - @{yVigilanceInit})" disabled><span></span>
-                                        </td>
-                                        <td><label>Modifiers</label><input name='attr_initiativeVigDice' type="text" /></td>
-                                        <td>
-                                            <button type='roll' name='roll_VigilanceInit' value='!eed @{npc-pc} characterID(@{character_id}) label(skill:Initiative Vigilance) skill(@{rankVigilance}|@{willpower}) @{initiativeVigDice} @{dicePool}'></button>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+        <b>Initiative</b><input name="attr_character-Initiative" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-initiative-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-initiative-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Initiative</h3>
+                    <input name="attr_character-Initiative" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-initiative-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-initiative-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <table>
+                                        <tr>
+                                            <td><label>What kind of Initiative Slot?</label></td>
+                                            <td><label>PC<input type="radio" name="attr_npc-pc" value="pcinit" checked="checked" /></label></td>
+                                            <td><label>NPC<input type="radio" name="attr_npc-pc" value="npcinit" /></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                        </tr>
+                                    </table>
+                                    <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
+                                        <tr>
+                                            <td><label>Cool (if prepared):</label></td>
+                                            <td>
+                                                <input class="sheet-yd" type="hidden" name="attr_yCoolInit" value="(@{yCool})" disabled><span></span>
+                                                <input class="sheet-gd" type="hidden" name="attr_gCoolInit" value="(@{gCool})" disabled><span></span>
+                                            </td>
+                                            <td><label>Modifiers</label><input name='attr_initiativeCoolDice' type="text" /></td>
+                                            <td>
+                                                <button type='roll' name='roll_CoolInit' value='!eed @{npc-pc} characterID(@{character_id}) label(skill:Initiative Cool) skill(@{rankCool}|@{presence}) @{initiativeCoolDice} @{dicePool}'></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Vigilance (if unexpected):</label></td>
+                                            <td>
+                                                <input class="sheet-yd" type="hidden" name="attr_yVigilanceInit" value="(@{yVigilance})" disabled><span></span>
+                                                <input class="sheet-gd" type="hidden" name="attr_gVigilanceInit" value="(@{gVigilance})" disabled><span></span>
+                                            </td>
+                                            <td><label>Modifiers</label><input name='attr_initiativeVigDice' type="text" /></td>
+                                            <td>
+                                                <button type='roll' name='roll_VigilanceInit' value='!eed @{npc-pc} characterID(@{character_id}) label(skill:Initiative Vigilance) skill(@{rankVigilance}|@{willpower}) @{initiativeVigDice} @{dicePool}'></button>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
             </div>
-            <br />
         </div><!-- Initiative -->
-        <div class="sheet-small-12 sheet-column">
-            <h3>Weapons</h3><br />
-            <fieldset class="repeating_weapons">
-                <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td></td>
-                            <td>
-                                <label>Damage</label>
-                                <input name='attr_damage' type="text" value="0" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Critical</label>
-                                <input name='attr_critical' type="text" value="0" />
-                            </td>
-                            <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(Weapon:@{weaponmake}|Damage:@{damage}|Critical:@{critical}|Range:@{weaponrange}|Special:@{weaponspecial}) @{weapondice} encum(@{encumbrancemax}|@{encumbrance}) @{weaponskill} @{weaponcondition} @{dicePool} (gmdice)'></button></td>
-                            <td>
-                                <label>Encum</label>
-                                <input name='attr_weapon-encum' type="text" value="0" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>HP</label>
-                                <input name='attr_weapon-hp' type="text" value="0" />
-                            </td>
-                            <td></td>
-                        </tr>
-                    </tbody>
-                </table><!-- Weapon Top Stats -->
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Make / Model:</label></td>
-                            <td><input name='attr_weaponmake' type="text" /></td>
-                            <td><label>Range:</label></td>
-                            <td>
-                                <select name='attr_weaponrange'>
-                                    <option value="Engaged">Engaged</option>
-                                    <option value="Short">Short</option>
-                                    <option vaule="Medium">Medium</option>
-                                    <option value="Long">Long</option>
-                                    <option value="Extreme">Extreme</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Weapon Type:</label></td>
-                            <td><input name='attr_weapontype' type="text" /></td>
-                            <td><label>Skill:</label></td>
-                            <td>
-                                <select name='attr_weaponskill'>
-                                    <option value="skill(@{rankBrawl}|@{brawn})">Brawl</option>
-                                    <option value="skill(@{rankGunnery}|@{agility})">Gunnery</option>
-                                    <option value="skill(@{rankMelee}|@{brawn})">Melee</option>
-                                    <option value="skill(@{rankLight}|@{agility})">Ranged - Light</option>
-                                    <option value="skill(@{rankHeavy}|@{agility})">Ranged - Heavy</option>
-                                    <option value="skill(@{rankLightsaber}|@{charLightsaber})">Lightsaber</option>
-                                    <option value="skill(@{rankMechanics}|@{Intellect})">Mechanics</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Modifiers:</label></td>
-                            <td><input name='attr_weapondice' type="text" /></td>
-                            <td><label>Condition:</label></td>
-                            <td>
-                                <select name='attr_weaponcondition'>
-                                    <option value="">New</option>
-                                    <option value="1blk">Minor</option>
-                                    <option value="1p">Moderate</option>
-                                    <option value="unusableWeapon">Major</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Book &amp; Page:</label></td>
-                            <td><input name='attr_weapon_bookpage' type="text" /></td>
-                            <td>Rarity:</td>
-                            <td><input name='attr_weapon_rarity' type="number" min="1" max="10" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Restricted:</label></td>
-                            <td>
-                                <select name='attr_weapon_restrict'>
-                                    <option value="no">No</option>
-                                    <option value="yes">Yes</option>
-                                </select>
-                            </td>
-                            <td>Value</td>
-                            <td><input name='attr_weapon_value' type="text" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Features:</label></td>
-                            <td><textarea rows="2" name="attr_weaponfeatures"></textarea></td>
-                            <td><label>Special:</label></td>
-                            <td><textarea rows="2" name="attr_weaponspecial"></textarea></td>
-                        </tr>
-                        <tr>
-                            <td colspan="4">
-                                &nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table><!-- Weapon Info -->
-                <div class="sheet-attachments-wrapper">
-                    <input type="checkbox" name="attr_weaponattchments" class="sheet-view-attachments" />
-                    <label class="sheet-view-attachments">View Attachments</label>
-                    <div class="sheet-clear"></div>
-                    <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr>
-                                <th>Attachment Name</th>
-                                <th>Hard Points</th>
-                                <th>Base Modifiers</th>
-                                <th>Modifications</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td><input name='attr_weaponattch1' type="text" /></td>
-                                <td><input name='attr_weaponattachp1' type="number" /></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachbase1"></textarea></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachmod1"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input name='attr_weaponattch2' type="text" /></td>
-                                <td><input name='attr_weaponattachp2' type="number" /></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachbase2"></textarea></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachmod2"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input name='attr_weaponattch3' type="text" /></td>
-                                <td><input name='attr_weaponattachp3' type="number" /></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachbase3"></textarea></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachmod3"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input name='attr_weaponattch4' type="text" /></td>
-                                <td><input name='attr_weaponattachp4' type="number" /></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachbase4"></textarea></td>
-                                <td><textarea rows="3" type="text" name="attr_weaponattachmod4"></textarea></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div><!-- Weapon Attachments -->
-                <br />
-            </fieldset><!-- Weapon Info -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-initiative-toggle-small"></div>
+
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Weapons</h3>
+                <input name="attr_character-Weapons" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-weapon-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-weapon-section">
+                    <fieldset class="repeating_weapons">
+                        <b>Weapon</b><input name="attr_character-Weapon" value="1" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-weapon-toggle" type="checkbox" checked="checked"/><span></span>
+                        <div class="sheet-weapon">
+                            <div class="sheet-row">
+                                <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td></td>
+                                        <td>
+                                            <label>Damage</label>
+                                            <input name='attr_damage' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <label>Critical</label>
+                                            <input name='attr_critical' type="text" value="0" />
+                                        </td>
+                                        <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(Weapon:@{weaponmake}|Damage:@{damage}|Critical:@{critical}|Range:@{weaponrange}|Qualities:@{weaponspecial}) @{weapondice} combat(personal) encum(@{encumbrancemax}|@{encumbrance}) @{weaponskill} @{weaponcondition} @{dicePool} (gmdice)'></button></td>
+                                        <td>
+                                            <label>Encum</label>
+                                            <input name='attr_weapon-encum' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <label>HP</label>
+                                            <input name='attr_weapon-hp' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                    </tbody>
+                                </table><!-- Weapon Top Stats -->
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Make / Model:</label></td>
+                                        <td><input name='attr_weaponmake' type="text" /></td>
+                                        <td><label>Range:</label></td>
+                                        <td>
+                                            <select name='attr_weaponrange'>
+                                                <option value="Engaged">Engaged</option>
+                                                <option value="Short">Short</option>
+                                                <option value="Medium">Medium</option>
+                                                <option value="Long">Long</option>
+                                                <option value="Extreme">Extreme</option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Weapon Type:</label></td>
+                                        <td><input name='attr_weapontype' type="text" /></td>
+                                        <td><label>Skill:</label></td>
+                                        <td>
+                                            <select name='attr_weaponskill'>
+                                                <optgroup label="Combat Skills">
+                                                    <option value="skill(@{rankBrawl}|@{brawn})">Brawl</option>
+                                                    <option value="skill(@{rankGunnery}|@{agility})">Gunnery</option>
+                                                    <option value="skill(@{rankMelee}|@{brawn})">Melee</option>
+                                                    <option value="skill(@{rankLight}|@{agility})">Ranged - Light</option>
+                                                    <option value="skill(@{rankHeavy}|@{agility})">Ranged - Heavy</option>
+                                                    <option value="skill(@{rankLightsaber}|@{charLightsaber})">Lightsaber</option>
+                                                </optgroup>
+                                                <optgroup label="General Skills">
+                                                    <option value="skill(@{rankMechanics}|@{intellect})">Mechanics</option>
+                                                    <option value="skill(@{rankMedicine}|@{intellect})">Medicine</option>
+                                                    <option value="skill(@{rankResilience}|@{brawn})">Resilience</option>
+                                                </optgroup>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Modifiers:</label></td>
+                                        <td><input name='attr_weapondice' type="text" /></td>
+                                        <td><label>Condition:</label></td>
+                                        <td>
+                                            <select name='attr_weaponcondition'>
+                                                <option value="">New</option>
+                                                <option value="1blk">Minor</option>
+                                                <option value="1p">Moderate</option>
+                                                <option value="unusableWeapon">Major</option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Book &amp; Page:</label></td>
+                                        <td><input name='attr_weapon_bookpage' type="text" /></td>
+                                        <td><label>Rarity</label></td>
+                                        <td><input name='attr_weapon_rarity' type="number" min="1" max="10" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Restricted:</label></td>
+                                        <td>
+                                            <select name='attr_weapon_restrict'>
+                                                <option value="no">No</option>
+                                                <option value="yes">Yes</option>
+                                            </select>
+                                        </td>
+                                        <td><label>Value:</label></td>
+                                        <td><input name='attr_weapon_value' type="text" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Features:</label></td>
+                                        <td><textarea rows="2" name="attr_weaponfeatures"></textarea></td>
+                                        <td><label>Qualities:</label></td>
+                                        <td><textarea rows="2" name="attr_weaponspecial"></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4">
+                                            &nbsp;
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table><!-- Weapon Info -->
+                                <div class="sheet-attachments-wrapper">
+                                    <input type="checkbox" name="attr_weaponattchments" class="sheet-view-attachments" />
+                                    <label class="sheet-view-attachments">View Attachments</label>
+                                    <div class="sheet-clear"></div>
+                                    <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                        <thead>
+                                        <tr>
+                                            <th>Attachment Name</th>
+                                            <th>Hard Points</th>
+                                            <th>Base Modifiers</th>
+                                            <th>Modifications</th>
+                                            <th>Book &amp; Page</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr>
+                                            <td><input name='attr_weaponattach1' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP1' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase1"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod1"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage1"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input name='attr_weaponattach2' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP2' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase2"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod2"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage2"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input name='attr_weaponattach3' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP3' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase3"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod3"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage3"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input name='attr_weaponattach4' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP4' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase4"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod4"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage4"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input name='attr_weaponattach5' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP5' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase5"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod5"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage5"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input name='attr_weaponattach6' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP6' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase6"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod6"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage6"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input name='attr_weaponattach7' type="text" /></td>
+                                            <td><input name='attr_weaponattachHP7' type="number" /></td>
+                                            <td><textarea rows="3" name="attr_weaponattachbase7"></textarea></td>
+                                            <td><textarea rows="3" name="attr_weaponattachmod7"></textarea></td>
+                                            <td><input type="text" name="attr_weaponattachbookpage7"/></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div><!-- Weapon Attachments -->
+                            </div>
+                        </div>
+                        <div class="sheet-clear"></div>
+                    </fieldset><!-- Weapon Info -->
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
         </div><!-- Weapons -->
-        <div class="sheet-small-12 sheet-column">
-            <br />
-            <h3 class="sheet-section-header">Combat Skills</h3>
-            <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                <thead>
-                    <tr>
-                        <th style="width:50%">Skill Name</th>
-                        <th style="width:30%">Modifiers</th>
-                    </tr>
-                </thead>
-            </table>
-            <fieldset class="repeating_fightskills">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Combat Skills</h3>
+                <input name="attr_character-Combat-Skills" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-combatskills-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-combatskills-section">
+                    <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
-                            <td>
-                                <select name='attr_FightingSkill'>
-                                    <option value="" disabled>General Skills</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankAstrogation) label(skill:Astrogation) @{FightingDice} @{dicePool} (gmdice)">Astrogation</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankAthletics) label(skill:Athletics) @{FightingDice} @{dicePool} (gmdice)">Athletics</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCharm) label(skill:Charm) @{FightingDice} @{dicePool} (gmdice)">Charm</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCoercion) label(skill:Coercion) @{FightingDice} @{dicePool} (gmdice)">Coercion</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankComputers) label(skill:Computers) @{FightingDice} @{dicePool} (gmdice)">Computers</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCool) label(skill:Cool) @{FightingDice} @{dicePool} (gmdice)">Cool</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankCoordination) label(skill:Coordination) @{FightingDice} @{dicePool} (gmdice)">Coordination</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankDeception) label(skill:Deception) @{FightingDice} @{dicePool} (gmdice)">Deception</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDiscipline) label(skill:Discipline) @{FightingDice} @{dicePool} (gmdice)">Discipline</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankLeadership) label(skill:Leadership) @{FightingDice} @{dicePool} (gmdice)">Leadership</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMechanics) label(skill:Mechanics) @{FightingDice} @{dicePool} (gmdice)">Mechanics</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMedicine) label(skill:Medicine) @{FightingDice} @{dicePool} (gmdice)">Medicine</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankNegotiation) label(skill:Negotiation) @{FightingDice} @{dicePool} (gmdice)">Negotiation</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankPerception) label(skill:Perception) @{FightingDice} @{dicePool} (gmdice)">Perception</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankPlanetary) label(skill:Piloting-Planetary) @{FightingDice} @{dicePool} (gmdice)">Piloting (Planetary)</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankSpace) label(skill:Piloting-Space) @{FightingDice} @{dicePool} (gmdice)">Piloting (Space)</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankResilience) label(skill:Resilience) @{FightingDice} @{dicePool} (gmdice)">Resilience</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSkulduggery) label(skill:Skulduggery) @{FightingDice} @{dicePool} (gmdice)">Skulduggery</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankStealth) label(skill:Stealth) @{FightingDice} @{dicePool} (gmdice)">Stealth</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankStreetwise) label(skill:Streetwise) @{FightingDice} @{dicePool} (gmdice)">Streetwise</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSurvival) label(skill:Survival) @{FightingDice} @{dicePool} (gmdice)">Survival</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankVigilance) label(skill:Vigilance) @{FightingDice} @{dicePool} (gmdice)">Vigilance</option>
-                                    <option value="" disabled>Combat Skills</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankBrawl) label(skill:Brawl) @{FightingDice} @{dicePool} (gmdice)">Brawl</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankGunnery) label(skill:Gunnery) @{FightingDice} @{dicePool} (gmdice)">Gunnery</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankMelee) label(skill:Melee) @{FightingDice} @{dicePool} (gmdice)">Melee</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:charLightsaber,rankLightsaber) label(skill:Lightsaber) @{FightingDice} @{dicePool} (gmdice)">Lightsaber</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankLight) label(skill:Ranged-Light) @{FightingDice} @{dicePool} (gmdice)">Ranged (Light)</option>
-                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankHeavy) label(skill:Ranged-Heavy) @{FightingDice} @{dicePool} (gmdice)">Ranged (Heavy)</option>
-                                    <option value="" disabled>Knowledge Skills</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankCore) label(skill:Core Worlds) @{FightingDice} @{dicePool} (gmdice)">Core Worlds</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankEducation) label(skill:Education) @{FightingDice} @{dicePool} (gmdice)">Education</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankLore) label(skill:Lore) @{FightingDice} @{dicePool} (gmdice)">Lore</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankOuter) label(skill:Outer Rim) @{FightingDice} @{dicePool} (gmdice)">Outer Rim</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankUnderworld) label(skill:Underworld) @{FightingDice} @{dicePool} (gmdice)">Underworld</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankXenology) label(skill:Xenology) @{FightingDice} @{dicePool} (gmdice)">Xenology</option>
-                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankWarfare) label(skill:Warfare) @{FightingDice} @{dicePool} (gmdice)">Warfare</option>
-                                </select>
-                            </td><!--Skill List-->
-                            <td><input name='attr_FightingDice' type="text" /></td>
-                            <td><button type='roll' name='roll_Fighting' value='!eed rollPlayer(character:@{name}|@{FightingSkill}) label(skill:@{FightingSkill}) @{dicePool} @{FightingDice} (gmdice)'></button></td>
+                            <th style="width:50%">Skill Name</th>
+                            <th style="width:30%">Modifiers</th>
                         </tr>
-                    </tbody>
-                </table>
-            </fieldset>
+                        </thead>
+                    </table>
+                    <fieldset class="repeating_fightskills">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <select name='attr_FightingSkill'>
+                                        <optgroup label="General Skills">
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankAstrogation) label(skill:Astrogation) @{FightingDice} @{dicePool} (gmdice)">Astrogation</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankAthletics) label(skill:Athletics) @{FightingDice} @{dicePool} (gmdice)">Athletics</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCharm) label(skill:Charm) @{FightingDice} @{dicePool} (gmdice)">Charm</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCoercion) label(skill:Coercion) @{FightingDice} @{dicePool} (gmdice)">Coercion</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankComputers) label(skill:Computers) @{FightingDice} @{dicePool} (gmdice)">Computers</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCool) label(skill:Cool) @{FightingDice} @{dicePool} (gmdice)">Cool</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankCoordination) label(skill:Coordination) @{FightingDice} @{dicePool} (gmdice)">Coordination</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankDeception) label(skill:Deception) @{FightingDice} @{dicePool} (gmdice)">Deception</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDiscipline) label(skill:Discipline) @{FightingDice} @{dicePool} (gmdice)">Discipline</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankLeadership) label(skill:Leadership) @{FightingDice} @{dicePool} (gmdice)">Leadership</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMechanics) label(skill:Mechanics) @{FightingDice} @{dicePool} (gmdice)">Mechanics</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMedicine) label(skill:Medicine) @{FightingDice} @{dicePool} (gmdice)">Medicine</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankNegotiation) label(skill:Negotiation) @{FightingDice} @{dicePool} (gmdice)">Negotiation</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankPerception) label(skill:Perception) @{FightingDice} @{dicePool} (gmdice)">Perception</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankPlanetary) label(skill:Piloting [Planetary]) @{FightingDice} @{dicePool} (gmdice)">Piloting (Planetary)</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankSpace) label(skill:Piloting [Space]) @{FightingDice} @{dicePool} (gmdice)">Piloting (Space)</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankResilience) label(skill:Resilience) @{FightingDice} @{dicePool} (gmdice)">Resilience</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSkulduggery) label(skill:Skulduggery) @{FightingDice} @{dicePool} (gmdice)">Skulduggery</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankStealth) label(skill:Stealth) @{FightingDice} @{dicePool} (gmdice)">Stealth</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankStreetwise) label(skill:Streetwise) @{FightingDice} @{dicePool} (gmdice)">Streetwise</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSurvival) label(skill:Survival) @{FightingDice} @{dicePool} (gmdice)">Survival</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankVigilance) label(skill:Vigilance) @{FightingDice} @{dicePool} (gmdice)">Vigilance</option>
+                                        </optgroup>
+                                        <optgroup label="Combat Skills">
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankBrawl) label(skill:Brawl) @{FightingDice} @{dicePool} (gmdice)">Brawl</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankGunnery) label(skill:Gunnery) @{FightingDice} @{dicePool} (gmdice)">Gunnery</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankMelee) label(skill:Melee) @{FightingDice} @{dicePool} (gmdice)">Melee</option>
+                                            <!--<option value="!eed rollPlayer(character:@{name}|skill:@{rankLightsaber},@{charLightsaber}) label(skill:Lightsaber) @{FightingDice} @{dicePool} (gmdice)">Lightsaber</option>-->
+                                            <option value="!eed rollPlayer(character:@{name}|skill:charLightsaber,rankLightsaber) label(skill:Lightsaber) @{FightingDice} @{dicePool} (gmdice)">Lightsaber</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankLight) label(skill:Ranged [Light]) @{FightingDice} @{dicePool} (gmdice)">Ranged (Light)</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankHeavy) label(skill:Ranged [Heavy]) @{FightingDice} @{dicePool} (gmdice)">Ranged (Heavy)</option>
+                                        </optgroup>
+                                        <optgroup label="Knowledge Skills">
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankCore) label(skill:Core Worlds) @{FightingDice} @{dicePool} (gmdice)">Core Worlds</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankEducation) label(skill:Education) @{FightingDice} @{dicePool} (gmdice)">Education</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankLore) label(skill:Lore) @{FightingDice} @{dicePool} (gmdice)">Lore</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankOuter) label(skill:Outer Rim) @{FightingDice} @{dicePool} (gmdice)">Outer Rim</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankUnderworld) label(skill:Underworld) @{FightingDice} @{dicePool} (gmdice)">Underworld</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankXenology) label(skill:Xenology) @{FightingDice} @{dicePool} (gmdice)">Xenology</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankWarfare) label(skill:Warfare) @{FightingDice} @{dicePool} (gmdice)">Warfare</option>
+                                        </optgroup>
+                                    </select>
+                                </td><!--Skill List-->
+                                <td><input name='attr_FightingDice' type="text" /></td>
+                                <td><button type='roll' name='roll_Fighting' value=@{FightingSkill}></button></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
         </div><!-- Skills Dropdown -->
-        <div class="sheet-small-12 sheet-column">
-            <h3>Talents and Special Abilities</h3>
-            <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                <thead>
-                    <tr>
-                        <th style="width:50%">Name</th>
-                        <th style="width:50%">Summary</th>
-                    </tr>
-                </thead>
-            </table>
-            <fieldset class="repeating_skills">
-                <table class="sheet-talent">
-                    <tbody>
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Talents and Special Abilities</h3>
+                <input name="attr_character-Talents-and-Special-Abilities" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-talents-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-talents-section">
+                    <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
-                            <td style="width:50%" colspan="4">
-                                <input type="text" name="attr_talentname" />
-                            </td>
-                            <td style="width:50%" rowspan="6">
-                                <textarea rows="6" type="text" name="attr_talentsummary"></textarea>
-                            </td>
+                            <th style="width:50%">Name</th>
+                            <th style="width:50%">Summary</th>
                         </tr>
-                        <tr>
-                            <td><label>Rank:</label></td>
-                            <td><input type="number" name="attr_talentrank" /></td>
-                            <td>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_passiveActive" value="passive" title="Passive" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_passiveActive" value="active" title="Active">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Book &amp; Page:</label></td>
-                            <td><input type="text" name="attr_talentpagenum" /></td>
-                            <td><label>XP Cost:</label></td>
-                            <td><input type="number" style="width:50px" name="attr_talentcost" /></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <br />
-            </fieldset>
+                        </thead>
+                    </table>
+                    <fieldset class="repeating_skills">
+                        <table class="sheet-talent">
+                            <tbody>
+                            <tr>
+                                <td style="width:50%" colspan="4">
+                                    <input type="text" name="attr_talentname" />
+                                </td>
+                                <td style="width:50%" rowspan="6">
+                                    <textarea rows="6" name="attr_talentsummary"></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><label>Rank:</label></td>
+                                <td><input type="number" name="attr_talentrank" /></td>
+                                <td>
+                                    <div class="sheet-switch">
+                                        <input type="radio" class="sheet-switch-input-on" name="attr_passiveActive" value="passive" title="Passive" checked="checked">
+                                        <input type="radio" class="sheet-switch-input-off" name="attr_passiveActive" value="active" title="Active">
+                                        <span class="switch-selection"></span>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><label>Book &amp; Page:</label></td>
+                                <td><input type="text" name="attr_talentpagenum" /></td>
+                                <td><label>XP Cost:</label></td>
+                                <td><input type="number" style="width:50px" name="attr_talentcost" /></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <br />
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
         </div><!-- Talents and Abilities-->
-        <div class="sheet-small-12 sheet-column">
-            <h3>Force Powers</h3>
-            <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                <thead>
-                    <tr>
-                        <th style="width:50%">Power Name</th>
-                        <th style="width:50%">Summary</th>
-                    </tr>
-                </thead>
-            </table>
-            <fieldset class="repeating_powers">
-                <table class="sheet-talent">
-                    <tbody>
-                        <tr>
-                            <td style="width:50%" colspan="4">
-                                <input type="text" name="attr_forcepowername" />
-                            </td>
-                            <td style="width:50%" rowspan="7">
-                                <textarea rows="6" type="text" name="attr_powersummary"></textarea>
-                            </td>
-                            <td rowspan="3">
-                                <button type='roll' name='roll_force' value='!eed characterID(@{character_id}) label(skill:Force Power: |Power Name:@{forcepowername}) @{forceavailable}w @{dicePool}'></button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Available:</label></td>
-                            <td><input type="number" name="attr_forceavailable" value="@{forcerating}-@{forcecommitted}" disabled></td>
-                            <td><label>XP Cost:</label></td>
-                            <td><input type="number" style="width:50px" name="attr_powercost" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><label>Book &amp; Page:</label></td>
-                            <td colspan="2"><input type="text" name="attr_powerpagenum" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="5">
-                                &nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="sheet-attachments-wrapper">
-                    <input type="checkbox" name="attr_powerupgrades" class="sheet-view-attachments" />
-                    <label class="sheet-view-attachments">View Upgrades</label>
-                    <div class="sheet-clear"></div>
-                    <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Force Powers</h3>
+                <input name="attr_character-Force-Powers" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-force-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-force-section">
+                    <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
                         <thead>
-                            <tr>
-                                <th>Upgrade</th>
-                                <th>Rank</th>
-                                <th>XP Cost</th>
-                                <th>Description</th>
-                            </tr>
+                        <tr>
+                            <th style="width:50%">Power Name</th>
+                            <th style="width:50%">Summary</th>
+                        </tr>
                         </thead>
-                        <tbody>
-                            <tr>
-                                <td><input type="text" name='attr_forceupgradetype1'></td>
-                                <td><input name='attr_forceupgrade1' type="number" /></td>
-                                <td><input name='attr_forceupgradecost1' type="number" /></td>
-                                <td><textarea rows="3" name='attr_forceupgradedesc1' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_forceupgradetype2'></td>
-                                <td><input name='attr_forceupgrade2' type="number" /></td>
-                                <td><input name='attr_forceupgradecost2' type="number" /></td>
-                                <td><textarea rows="3" name='attr_forceupgradedesc2' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_forceupgradetype3'></td>
-                                <td><input name='attr_forceupgrade3' type="number" /></td>
-                                <td><input name='attr_forceupgradecost3' type="number" /></td>
-                                <td><textarea rows="3" name='attr_forceupgradedesc3' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_forceupgradetype4'></td>
-                                <td><input name='attr_forceupgrade4' type="number" /></td>
-                                <td><input name='attr_forceupgradecost3' type="number" /></td>
-                                <td><textarea rows="3" name='attr_forceupgradedesc4' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_forceupgradetype5'></td>
-                                <td><input name='attr_forceupgrade' type="number" /></td>
-                                <td><input name='attr_forceupgradecost3' type="number" /></td>
-                                <td><textarea rows="3" name='attr_forceupgradedesc5' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_forceupgradetype6'></td>
-                                <td><input name='attr_forceupgrade6' type="number" /></td>
-                                <td><input name='attr_forceupgradecost3' type="number" /></td>
-                                <td><textarea rows="3" name='attr_forceupgradedesc6' type="text"></textarea></td>
-                            </tr>
-                        </tbody>
                     </table>
-                </div><!-- Force Power Upgrades -->
-            </fieldset>
+                    <fieldset class="repeating_powers">
+                        <table class="sheet-talent">
+                            <tbody>
+                            <tr>
+                                <td style="width:50%" colspan="4"><input type="text" name="attr_forcepowername" /></td>
+                                <td style="width:50%" rowspan="7"><textarea rows="7" name="attr_powersummary"></textarea></td>
+                                <td rowspan="3"><button type='roll' name='roll_ForceSkill' value=@{ForceSkill}></button></td>
+                            </tr>
+                            <tr>
+                                <td colspan="2"><label>Book &amp; Page:</label></td>
+                                <td colspan="2"><input type="text" name="attr_powerpagenum" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Skill List</label></td>
+                                <td>
+                                    <select name='attr_ForceSkill'>
+                                        <option value="!eed characterID(@{character_id}) label(skill:Force Power |Power Name:@{forcepowername}) @{forceavailable}w @{dicePool}">No Skill</option>
+                                        <optgroup label="General Skills">
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankAthletics) label(skill:Force Power|Skill Name: Athletics|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Athletics</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCharm) label(skill:Force Power|Skill Name: Charm|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Charm</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCoercion) label(skill:Force Power|Skill Name: Coercion|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Coercion</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCool) label(skill:Force Power|Skill Name: Cool|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Cool</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankCoordination) label(skill:Force Power|Skill Name: Coordination|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Coordination</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankDeception) label(skill:Force Power|Skill Name: Deception|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Deception</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDiscipline) label(skill:Force Power|Skill Name: Discipline|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Discipline</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankLeadership) label(skill:Force Power|Skill Name: Leadership|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Leadership</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMedicine) label(skill:Force Power|Skill Name: Medicine|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Medicine</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:presence,rankNegotiation) label(skill:Force Power|Skill Name: Negotiation|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Negotiation</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankPlanetary) label(skill:Force Power|Skill Name: Piloting [Planetary]|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Piloting (Planetary)</option>
+                                            <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankSpace) label(skill:Force Power|Skill Name: Piloting [Space]|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Piloting (Space)</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankResilience) label(skill:Force Power|Skill Name: Resilience|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Resilience</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankVigilance) label(skill:Force Power|Skill Name: Vigilance|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Vigilance</option>
+                                        </optgroup>
+                                        <optgroup label="Combat Skills">
+                                            <option value="!eed rollPlayer(character:@{name}|skill:brawn,rankBrawl) label(skill:Force Power|Skill Name: Brawl|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Brawl</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:agility,rankLight) label(skill:Force Power|Skill Name: Ranged (Light)|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Ranged (Light)</option>
+                                            <option value="!eed rollPlayer(character:@{name}|skill:agility,rankHeavy) label(skill:Force Power|Skill Name: Ranged (Heavy)|Power Name:@{forcepowername}) @{ForceSkillDice} @{forceavailable}w @{dicePool} (gmdice)">Ranged (Heavy)</option>
+                                        </optgroup>
+                                    </select>
+                                </td><!--Skill List-->
+                                <td><label>XP Cost:</label></td>
+                                <td><input type="number" style="width:50px" name="attr_powercost" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Modifiers</label></td>
+                                <td><input name='attr_ForceSkillDice' type="text" /></td>
+                                <td><label>Force Dice Available:</label></td>
+                                <td><input type="number" name="attr_forceavailable" value="@{forcerating}-@{forcecommitted}" disabled></td>
+                            </tr>
+                            <tr>
+                                <td colspan="5">
+                                    &nbsp;
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <div class="sheet-attachments-wrapper">
+                            <input type="checkbox" name="attr_powerupgrades" class="sheet-view-attachments" />
+                            <label class="sheet-view-attachments">View Upgrades</label>
+                            <div class="sheet-clear"></div>
+                            <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr>
+                                    <th>Upgrade</th>
+                                    <th>Rank</th>
+                                    <th>XP Cost</th>
+                                    <th>Description</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype1'></td>
+                                    <td><input name='attr_forceupgrade1' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost1' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc1'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype2'></td>
+                                    <td><input name='attr_forceupgrade2' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost2' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc2'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype3'></td>
+                                    <td><input name='attr_forceupgrade3' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc3'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype4'></td>
+                                    <td><input name='attr_forceupgrade4' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc4'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype5'></td>
+                                    <td><input name='attr_forceupgrade' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc5'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype6'></td>
+                                    <td><input name='attr_forceupgrade6' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc6'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype7'></td>
+                                    <td><input name='attr_forceupgrade7' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc7'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype8'></td>
+                                    <td><input name='attr_forceupgrade8' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc8'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype9'></td>
+                                    <td><input name='attr_forceupgrade9' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc9'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype10'></td>
+                                    <td><input name='attr_forceupgrade10' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc10'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_forceupgradetype11'></td>
+                                    <td><input name='attr_forceupgrade11' type="number" /></td>
+                                    <td><input name='attr_forceupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_forceupgradedesc11'></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div><!-- Force Power Upgrades -->
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
         </div><!-- Force Powers -->
-        <div class="sheet-small-12 sheet-column">
-            <h3>Signature Abilities</h3>
-            <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                <thead>
-                    <tr>
-                        <th style="width:50%">Ability Name</th>
-                        <th style="width:50%">Summary</th>
-                    </tr>
-                </thead>
-            </table>
-            <fieldset class="repeating_signature">
-                <table class="sheet-talent">
-                    <tbody>
-                        <tr>
-                            <td style="width:50%" colspan="5">
-                                <input type="text" name="attr_sigabilityname" />
-                            </td>
-                            <td style="width:50%" rowspan="4">
-                                <textarea rows="5" type="text" name="attr_sigabilitysummary"></textarea>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><label>Specialization attached?</label></td>
-                            <td colspan="2"><input type="text" name="attr_sigabilityspec"></td>
-                        </tr>
-                        <tr>
-                            <td><label>Book &amp; Page:</label></td>
-                            <td><input type="text" name="attr_sigabilitypagenum" /></td>
-                            <td><label>XP Cost:</label></td>
-                            <td><input type="number" style="width:50px" name="attr_powercost" value="10" disabled /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="5">
-                                &nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="sheet-attachments-wrapper">
-                    <input type="checkbox" name="attr_sigabilityupgrades" class="sheet-view-attachments" />
-                    <label class="sheet-view-attachments">View Upgrades</label>
-                    <div class="sheet-clear"></div>
-                    <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Signature Abilities</h3>
+                <input name="attr_character-Signature-Abilities" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-signature-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-signature-section">
+                    <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
                         <thead>
-                            <tr>
-                                <th>Upgrade</th>
-                                <th>Rank</th>
-                                <th>XP Cost</th>
-                                <th>Description</th>
-                            </tr>
+                        <tr>
+                            <th style="width:50%">Ability Name</th>
+                            <th style="width:50%">Summary</th>
+                        </tr>
                         </thead>
-                        <tbody>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype1'></td>
-                                <td><input name='attr_sigabilityupgraderank1' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost1' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc1' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype2'></td>
-                                <td><input name='attr_sigabilityupgraderank2' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost2' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc2' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype3'></td>
-                                <td><input name='attr_sigabilityupgraderank3' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost3' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc3' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype4'></td>
-                                <td><input name='attr_sigabilityupgraderank4' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost4' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc4' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype5'></td>
-                                <td><input name='attr_sigabilityupgraderank5' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost5' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc5' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype6'></td>
-                                <td><input name='attr_sigabilityupgraderank6' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost6' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc6' type="text"></textarea></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name='attr_sigabilityupgradetype7'></td>
-                                <td><input name='attr_sigabilityupgraderank7' type="number" /></td>
-                                <td><input name='attr_sigabilityupgradecost7' type="number" /></td>
-                                <td><textarea rows="3" name='attr_sigabilityupgradedesc7' type="text"></textarea></td>
-                            </tr>
-                        </tbody>
                     </table>
-                </div><!-- Signature Ability Upgrades -->
-            </fieldset>
+                    <fieldset class="repeating_signature">
+                        <table class="sheet-talent">
+                            <tbody>
+                            <tr>
+                                <td style="width:50%" colspan="5">
+                                    <input type="text" name="attr_sigabilityname" />
+                                </td>
+                                <td style="width:50%" rowspan="4">
+                                    <textarea rows="5" name="attr_sigabilitysummary"></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2"><label>Specialization attached?</label></td>
+                                <td colspan="2"><input type="text" name="attr_sigabilityspec"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Book &amp; Page:</label></td>
+                                <td><input type="text" name="attr_sigabilitypagenum" /></td>
+                                <td><label>XP Cost:</label></td>
+                                <td><input type="number" style="width:50px" name="attr_powercost" value="10" disabled /></td>
+                            </tr>
+                            <tr>
+                                <td colspan="5">
+                                    &nbsp;
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <div class="sheet-attachments-wrapper">
+                            <input type="checkbox" name="attr_sigabilityupgrades" class="sheet-view-attachments" />
+                            <label class="sheet-view-attachments">View Upgrades</label>
+                            <div class="sheet-clear"></div>
+                            <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr>
+                                    <th>Upgrade</th>
+                                    <th>Rank</th>
+                                    <th>XP Cost</th>
+                                    <th>Description</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype1'></td>
+                                    <td><input name='attr_sigabilityupgraderank1' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost1' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc1'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype2'></td>
+                                    <td><input name='attr_sigabilityupgraderank2' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost2' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc2'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype3'></td>
+                                    <td><input name='attr_sigabilityupgraderank3' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost3' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc3'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype4'></td>
+                                    <td><input name='attr_sigabilityupgraderank4' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost4' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc4'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype5'></td>
+                                    <td><input name='attr_sigabilityupgraderank5' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost5' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc5'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype6'></td>
+                                    <td><input name='attr_sigabilityupgraderank6' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost6' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc6'></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name='attr_sigabilityupgradetype7'></td>
+                                    <td><input name='attr_sigabilityupgraderank7' type="number" /></td>
+                                    <td><input name='attr_sigabilityupgradecost7' type="number" /></td>
+                                    <td><textarea rows="3" name='attr_sigabilityupgradedesc7'></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div><!-- Signature Ability Upgrades -->
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
         </div><!-- Signature Abilities -->
     </div><!-- Combat Tab-->
     <div class="sheet-tab-content sheet-tab-weapons">
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
-                <h3>Armor</h3><br />
-                <fieldset class="repeating_armors">
-                    <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                <h3 class="sheet-section-header">Armor</h3>
+                <input name="attr_character-Armor" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-armor-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-armor-section">
+                    <fieldset class="repeating_armors">
+                        <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td></td>
                                 <td>
@@ -4260,10 +2197,10 @@
                                 </td>
                                 <td></td>
                             </tr>
-                        </tbody>
-                    </table><!-- Armor Top Stats -->
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                            </tbody>
+                        </table><!-- Armor Top Stats -->
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Make / Model:</label></td>
                                 <td><input name='attr_armormake' type="text" /></td>
@@ -4282,7 +2219,7 @@
                             <tr>
                                 <td><label>Book &amp; Page:</label></td>
                                 <td><input name='attr_armor_bookpage' type="text" /></td>
-                                <td>Rarity:</td>
+                                <td><label>Rarity:</label></td>
                                 <td><input name='attr_armor_rarity' type="number" min="1" max="10" /></td>
                             </tr>
                             <tr>
@@ -4293,88 +2230,93 @@
                                         <option value="yes">Yes</option>
                                     </select>
                                 </td>
-                                <td>Value:</td>
+                                <td><label>Value:</label></td>
                                 <td><input name='attr_armor_value' type="text" /></td>
                             </tr>
                             <tr>
-                                <td></td>
-                                <td></td>
-                                <td><label>Special:</label></td>
-                                <td><textarea rows="3" type="text" name="attr_armorspecial"></textarea></td>
+                                <td><label>Features:</label></td>
+                                <td><textarea rows="2" name="attr_armorfeatures"></textarea></td>
+                                <td><label>Qualities:</label></td>
+                                <td><textarea rows="3" name="attr_armorspecial"></textarea></td>
                             </tr>
-                        </tbody>
-                    </table><!-- Armor Info -->
-                    <div class="sheet-attachments-wrapper">
+                            <tr><td colspan="4">&nbsp;</td></tr>
+                            </tbody>
+                        </table><!-- Armor Info -->
                         <div class="sheet-attachments-wrapper">
                             <input type="checkbox" name="attr_armorattchments" class="sheet-view-attachments" />
                             <label class="sheet-view-attachments">View Attachments</label>
                             <div class="sheet-clear"></div>
                             <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
                                 <thead>
-                                    <tr>
-                                        <th>Attachment Name</th>
-                                        <th>Hard Points</th>
-                                        <th>Base Modifiers</th>
-                                        <th>Modifications</th>
-                                    </tr>
+                                <tr>
+                                    <th>Attachment Name</th>
+                                    <th>Hard Points</th>
+                                    <th>Base Modifiers</th>
+                                    <th>Modifications</th>
+                                </tr>
                                 </thead>
                                 <tbody>
-                                    <tr>
-                                        <td><input name='attr_armorattch1' type="text" /></td>
-                                        <td><input name='attr_armorattachp1' type="number" /></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachbase1"></textarea></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachmod1"></textarea></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input name='attr_armorattch2' type="text" /></td>
-                                        <td><input name='attr_armorattachp2' type="number" /></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachbase2"></textarea></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachmod2"></textarea></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input name='attr_armorattch3' type="text" /></td>
-                                        <td><input name='attr_armorattachp3' type="number" /></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachbase3"></textarea></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachmod3"></textarea></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input name='attr_armorattch4' type="text" /></td>
-                                        <td><input name='attr_armorattachp4' type="number" /></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachbase4"></textarea></td>
-                                        <td><textarea rows="3" type="text" name="attr_armorattachmod4"></textarea></td>
-                                    </tr>
+                                <tr>
+                                    <td><input name='attr_armorattch1' type="text" /></td>
+                                    <td><input name='attr_armorattachp1' type="number" /></td>
+                                    <td><textarea rows="3" name="attr_armorattachbase1"></textarea></td>
+                                    <td><textarea rows="3" name="attr_armorattachmod1"></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input name='attr_armorattch2' type="text" /></td>
+                                    <td><input name='attr_armorattachp2' type="number" /></td>
+                                    <td><textarea rows="3" name="attr_armorattachbase2"></textarea></td>
+                                    <td><textarea rows="3" name="attr_armorattachmod2"></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input name='attr_armorattch3' type="text" /></td>
+                                    <td><input name='attr_armorattachp3' type="number" /></td>
+                                    <td><textarea rows="3" name="attr_armorattachbase3"></textarea></td>
+                                    <td><textarea rows="3" name="attr_armorattachmod3"></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td><input name='attr_armorattch4' type="text" /></td>
+                                    <td><input name='attr_armorattachp4' type="number" /></td>
+                                    <td><textarea rows="3" name="attr_armorattachbase4"></textarea></td>
+                                    <td><textarea rows="3" name="attr_armorattachmod4"></textarea></td>
+                                </tr>
                                 </tbody>
                             </table>
-                        </div>
-                        <br />
-                    </div><!-- Armor Attachments -->
-                </fieldset>
-            </div><!-- Armor -->
+                            <div class="sheet-clear"></div>
+                        </div><!-- Armor Attachments -->
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
+        </div><!-- Armor -->
+        <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
-                <h3>Cybernetics</h3>
-                <table class="sheet-cybernetics" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
+                <h3 class="sheet-section-header">Cybernetics</h3>
+                <input name="attr_character-Cybernetics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-cybernetics-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-cybernetics-section">
+                    <table class="sheet-cybernetics" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
                             <th style="width:50%">Make/Model</th>
                             <th style="width:50%">Bonus</th>
                         </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_cyber">
-                    <table class="sheet-cybernetics">
-                        <tbody>
+                        </thead>
+                    </table>
+                    <fieldset class="repeating_cyber">
+                        <table class="sheet-cybernetics">
+                            <tbody>
                             <tr>
                                 <td style="width:50%" colspan="4">
                                     <input type="text" name="attr_cyberneticname" />
                                 </td>
                                 <td style="width:50%" rowspan="5">
-                                    <textarea rows="4" type="text" name="attr_cyberneticbonus"></textarea>
+                                    <textarea rows="4" name="attr_cyberneticbonus"></textarea>
                                 </td>
                             </tr>
                             <tr>
                                 <td><label>Book &amp; Page:</label></td>
                                 <td><input name='attr_cybernetics_bookpage' type="text" /></td>
-                                <td>Rarity:</td>
+                                <td><label>Rarity</label></td>
                                 <td><input name='attr_cybernetics_rarity' type="number" min="1" max="10" /></td>
                             </tr>
                             <tr>
@@ -4398,856 +2340,174 @@
                                 <td><label>Value:</label></td>
                                 <td><input name='attr_cybernetics_value' type="text" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div><!-- Cybernetics -->
-            <div class="sheet-row">
-                <div class="sheet-small-12 sheet-column">
-                    <h3>Tools</h3>
-                    <table class="sheet-tools" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr>
-                                <th style="width:50%">Tool Name</th>
-                                <th style="width:50%">Bonus/Description</th>
-                            </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_tools">
-                        <table class="sheet-tools">
-                            <tbody>
-                                <tr>
-                                    <td style="width:50%" colspan="5">
-                                        <input type="text" name="attr_toolname" />
-                                    </td>
-                                    <td style="width:50%" rowspan="2">
-                                        <textarea colspan="2" rows="3" type="text" name="attr_toolbonus"></textarea>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>Encumbrance:</td>
-                                    <td><input name='attr_tool-encumb' type="text" /></td>
-                                    <td>Rarity:</td>
-                                    <td><input name='attr_tool_rarity' type="number" min="1" max="10" /></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Restricted:</label></td>
-                                    <td>
-                                        <select name='attr_tool_restrict'>
-                                            <option value="no">No</option>
-                                            <option value="yes">Yes</option>
-                                        </select>
-                                    </td>
-                                    <td>Value:</td>
-                                    <td><input name='attr_tool_value' type="text" /></td>
-                                    <td><label>Book &amp; Page:</label></td>
-                                    <td><input name='attr_tool_bookpage' type="text" /></td>
-                                </tr>
                             </tbody>
                         </table>
                         <br />
                     </fieldset>
                 </div>
-                <div class="sheet-clear"></div>
-            </div><!-- Tools -->
-            <div class="sheet-row">
-                <div class="sheet-small-12 sheet-column">
-                    <h3>Other Gear</h3><br />
+            </div>
+            <div class="sheet-clear"></div>
+        </div><!-- Cybernetics -->
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Tools</h3>
+                <input name="attr_character-Tools" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-tools-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-tools-section">
+                    <table class="sheet-tools" cellspacing="0" cellpadding="0" border="0">
+                        <thead>
+                        <tr>
+                            <th style="width:50%">Tool Name</th>
+                            <th style="width:50%">Bonus/Description</th>
+                        </tr>
+                        </thead>
+                    </table>
+                    <fieldset class="repeating_tools">
+                        <table class="sheet-tools">
+                            <tbody>
+                            <tr>
+                                <td style="width:50%" colspan="5">
+                                    <input type="text" name="attr_toolname" />
+                                </td>
+                                <td style="width:50%" rowspan="2">
+                                    <textarea rows="3" name="attr_toolbonus"></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><label>Encumbrance</label></td>
+                                <td><input name='attr_tool-encumb' type="text" /></td>
+                                <td><label>Rarity</label></td>
+                                <td><input name='attr_tool_rarity' type="number" min="1" max="10" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Restricted:</label></td>
+                                <td>
+                                    <select name='attr_tool_restrict'>
+                                        <option value="no">No</option>
+                                        <option value="yes">Yes</option>
+                                    </select>
+                                </td>
+                                <td><label>Value</label></td>
+                                <td><input name='attr_tool_value' type="text" /></td>
+                                <td><label>Book &amp; Page:</label></td>
+                                <td><input name='attr_tool_bookpage' type="text" /></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <br />
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-clear"></div>
+        </div><!-- Tools -->
+        <div class="sheet-row">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Other Gear</h3>
+                <input name="attr_character-Other-Gear" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-other-gear-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-other-gear-section">
                     <div class="sheet-small-6 sheet-column">
                         <table cellspacing="0" cellpadding="0" border="0">
                             <thead>
-                                <tr><th>Personal Gear</th></tr>
+                            <tr><th>Personal Gear</th></tr>
                             </thead>
                             <tbody>
-                                <tr><td><textarea rows="5" name="attr_personalgear"></textarea></td></tr>
+                            <tr><td><textarea rows="5" name="attr_personalgear"></textarea></td></tr>
                             </tbody>
                         </table>
                     </div><!-- Personal Gear -->
                     <div class="sheet-small-6 sheet-column">
                         <table cellspacing="0" cellpadding="0" border="0">
                             <thead>
-                                <tr><th>Assets & Resources</th></tr>
+                            <tr><th>Assets &amp; Resources</th></tr>
                             </thead>
                             <tbody>
-                                <tr><td><textarea rows="5" name="attr_assets"></textarea></td></tr>
+                            <tr><td><textarea rows="5" name="attr_assets"></textarea></td></tr>
                             </tbody>
                         </table>
                     </div> <!-- Assets & Resources -->
-                    <div class="sheet-clear"></div>
                 </div>
                 <div class="sheet-clear"></div>
-            </div><!-- Other Gear -->
+            </div>
+            <div class="sheet-clear"></div>
+        </div><!-- Other Gear -->
+        <div class="sheet-clear"></div>
+    </div><!-- Inventory Tab -->
+    <div class="sheet-tab-content sheet-tab-critical">
+        <div class="sheet-row sheet-show-critical-table">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Critical Injuries</h3>
+            </div>
+            <div class="sheet-small-9 sheet-column">
+                <div class="sheet-repeating-critical">
+                    <input type="hidden" name="attr_character-critTotal" value="0" />
+                    <fieldset class="repeating_critcharacter">
+                        <input type="hidden" name="attr_character-critId" />
+                        <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td width="70%"><input type="text" name="attr_character-critName" readonly="readonly" /></td>
+                                <td width="30%"><input type="text" name="attr_character-critRange" readonly="readonly" /></td>
+                                <td class="sheet-crit-dice-bg">
+                                    <input type="hidden" name="attr_character-character-critDice" />
+                                    <input class="sheet-pd" value="4" type="hidden" name="attr_character-critSeverity" /><span></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2" rowspan="2"><textarea rows="3" name="attr_character-critSummary" readonly="readonly"></textarea></td>
+                                <td>
+                                    <label>Effect:</label>
+                                    <div class="sheet-switch">
+                                        <input type="radio" class="sheet-switch-input-on" name="attr_character-critEffect" value="on" title="On" checked="checked">
+                                        <input type="radio" class="sheet-switch-input-off" name="attr_character-critEffect" value="off" title="Off">
+                                        <span class="switch-selection"></span>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|character|@{character-critId})">Heal</button></td></tr>
+                            </tbody>
+                        </table>
+                    </fieldset>
+                </div>
+            </div>
+            <div class="sheet-small-3 sheet-column">
+                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                    <tr>
+                        <td><label>Critical roll offset:</label></td>
+                        <td><input type="text" name="attr_character-critAddOffset" value="" /></td>
+                    </tr>
+                    <tr><td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll|character)">Roll Critical</button></td></tr>
+                    <tr>
+                        <td>
+                            <label>Critical number:</label>
+                            <input type="text" name="attr_character-critAddRangeNum" value="" />
+                        </td>
+                        <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|character|@{character-critAddRangeNum})">Add Critical</button></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
             <div class="sheet-clear"></div>
         </div>
-    </div><!-- Inventory Tab -->
+    </div><!-- Character Critical Injuries-->
     <div class="sheet-tab-content sheet-tab-notes">
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
-                <h3>Notes</h3><br />
+                <h3 class="sheet-section-header">Notes</h3><br />
                 <table>
                     <tbody><tr><td><textarea rows="50" name="attr_notes"></textarea></td></tr></tbody>
                 </table>
             </div>
         </div>
     </div><!-- Notes Tab -->
-</div><!-- Player Character sheet -->
+</div>
 <div class="sheet-tab-content sheet-tab-ship-sheet">
-    <div class="sheet-row sheet-section-1">
-        <div class="sheet-small-12 sheet-column">
-            <h3 class="sheet-section-header">Dice Pool</h3>
-            <table class="sheet-dice-pool" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
-                    <tr>
-                        <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png" /><input name="attr_b" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png" /><input name="attr_g" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Proficiency/ProficiencyBlank.png" /><input name="attr_y" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-force"><img src="http://galacticcampaigns.com/images/EotE/Force/ForceL.png" /><input name="attr_w" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-dark"><img src="http://galacticcampaigns.com/images/EotE/Setback/SetBackBlank.png" /><input name="attr_blk" type="number" step="1" max="9" min="-9" value="0"></td>
-                        <td class="sheet-dark"><img src="http://galacticcampaigns.com/images/EotE/Difficulty/DifficultyBlank.png" /><input name="attr_p" type="number" step="1" max="9" min="-7" value="0"></td>
-                        <td class="sheet-dark"><img src="http://galacticcampaigns.com/images/EotE/Challenge/ChallengeBlank.png" /><input name="attr_r" type="number" step="1" max="9" min="-7" value="0"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3" class="sheet-upgrade sheet-light">
-                            <label>
-                                &nbsp;&nbsp;&nbsp;&nbsp;Upgrade:
-                                <input name="attr_upgradeAbility" type="number" step="1" max="9" min="0" value="0">
-                            </label>
-                            <label>
-                                <input name="attr_downgradeProficiency" type="number" step="1" max="9" min="0" value="0">
-                                :Downgrade
-                            </label>
-                        </td>
-                        <td class="sheet-force">
-                            <input type="hidden" name='attr_dicePool' value='@{g}g @{y}y @{p}p @{r}r @{b}b @{blk}blk @{w}w upgrade(ability|@{upgradeAbility}) downgrade(proficiency|@{downgradeProficiency}) upgrade(difficulty|@{upgradeDifficulty}) downgrade(challenge|@{downgradeChallenge})' />
-                            <button type='roll' name='roll_DicePool' value='!eed characterID(@{character_id}) label(Dice:Dice Pool) @{dicePool} (gmdice)'></button>
-                            <button type='roll' name='roll_ResetDicePool' value='!eed resetdice characterID(@{character_id})'></button>
-                        </td>
-                        <td colspan="3" class="sheet-downgrade sheet-dark">
-                            <label>
-                                &nbsp;&nbsp;&nbsp;&nbsp;Upgrade:
-                                <input name="attr_upgradeDifficulty" type="number" step="1" max="9" min="0" value="0">
-                            </label>
-                            <label>
-                                <input name="attr_downgradeChallenge" type="number" step="1" max="9" min="0" value="0">
-                                Downgrade:
-                            </label>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div><!-- Dice Pool -->
-        <div class="sheet-clear"></div>
-    </div><!-- Dice Pool on Vehicle Tab -->
-
+    <br/>
     <input type="radio" name="attr_v-sheet" class="sheet-tab-new sheet-tab-transport-space" value="1" checked="checked" />
     <span class="sheet-tab-new">&emsp;Starship&emsp;</span>
     <input type="radio" name="attr_v-sheet" class="sheet-tab-new sheet-tab-transport-planetary" value="2" />
     <span class="sheet-tab-new">&emsp;Planetary&emsp;</span>
     <input type="radio" name="attr_v-sheet" class="sheet-tab-new sheet-tab-transport-beast" value="3" />
     <span class="sheet-tab-new">&emsp;Beast&emsp;</span>
-    <div class="sheet-small-12 sheet-column">
-        <br />
-        <br />
-        <div class="sheet-clear"></div>
-        <div class="sheet-attachments-wrapper">
-            <input type="checkbox" name="attr_old-vehicle-tabs" class="sheet-view-attachments" />
-            <label class="sheet-view-attachments">Show Old Vehicle Tabs</label>
-            <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
-                    <tr>
-                        <td>
-                            <div>
-                                <div class="sheet-row">
-                                    <div class="sheet-small-12 sheet-column">
-                                        <table class="sheet-ship" cellspacing="0" cellpadding="0" border="0">
-                                            <tr>
-                                                <td class="sheet-ship-char-bg">
-                                                    <label>Silhouette</label>
-                                                    <input name='attr_silhouette' type="number" max="99" min="0" value="0" />
-                                                </td>
-                                                <td class="sheet-ship-char-thre-bg-speed">
-                                                    <label class="sheet-label-title">Speed</label>
-                                                    <input name="attr_speed" type="number" max="99" min="-99" value="0" />
-                                                    <input name="attr_speed_current" type="number" max="99" min="-99" value="0" /><br />
-                                                    <label class="sheet-label-threshold-speed">Max</label>
-                                                    <label class="sheet-label-current-speed">Current</label>
-                                                </td>
-                                                <td class="sheet-ship-char-bg">
-                                                    <label>Handling</label>
-                                                    <input name='attr_handling' type="number" max="99" min="0" value="0" />
-                                                </td>
-                                                <td rowspan="2" class="sheet-ship-defense">
-                                                    <div style="width:302px; height:1px;"></div>
-                                                    <label class="sheet-def-label">Defense</label>
-                                                    <div class="sheet-fore">
-                                                        <label>Fore</label>
-                                                        <input name='attr_deffore' type="number" max="99" min="0" value="0" />
-                                                    </div>
-                                                    <div class="sheet-starboard">
-                                                        <label>Starboard</label>
-                                                        <input name='attr_defstarboard' type="number" max="99" min="0" value="0" />
-                                                    </div>
-                                                    <div class="sheet-aft">
-                                                        <label>Aft</label>
-                                                        <input name='attr_defaft' type="number" max="99" min="0" value="0" />
-                                                    </div>
-                                                    <div class="sheet-port">
-                                                        <label>Port</label>
-                                                        <input name='attr_defport' type="number" max="99" min="0" value="0" />
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="sheet-ship-char-thre-bg">
-                                                    <label class="sheet-label-title">Armor</label>
-                                                    <input name="attr_ship_armor" type="number" max="99" min="-99" value="0">
-                                                </td>
-                                                <td class="sheet-ship-char-thre-bg">
-                                                    <label class="sheet-label-title">Hull Trauma</label>
-                                                    <input name="attr_hull_trauma_max" type="number" max="99" min="-99" value="0" />
-                                                    <input name="attr_hull_trauma" type="number" max="99" min="-99" value="0" /><br />
-                                                    <label class="sheet-label-threshold">Threshold</label>
-                                                    <label class="sheet-label-current">Current</label>
-                                                </td>
-                                                <td class="sheet-ship-char-thre-bg">
-                                                    <label class="sheet-label-title">Sys Strain</label>
-                                                    <input name="attr_system_strain_max" type="number" max="99" min="-99" value="0" />
-                                                    <input name="attr_system_strain" type="number" max="99" min="-99" value="0" /><br />
-                                                    <label class="sheet-label-threshold">Threshold</label>
-                                                    <label class="sheet-label-current">Current</label>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </div><!-- end column -->
-                                    <div class="sheet-clear"></div>
-                                </div><!-- Depreciated Vehicle Top Stats -->
-
-                                <input type="radio" name="attr_old-sheet" class="sheet-tab-new sheet-tab-v-details" value="1" checked="checked" />
-                                <span class="sheet-tab-new">&emsp;Details&emsp;</span>
-                                <input type="radio" name="attr_old-sheet" class="sheet-tab-new sheet-tab-v-weapons" value="2" />
-                                <span class="sheet-tab-new">&emsp;Weapons&emsp;</span>
-
-                                <div class="sheet-tab-content sheet-tab-v-details">
-                                    <div class="sheet-row">
-                                        <div class="sheet-small-12 sheet-column">
-                                            <br />
-                                            <input type="radio" name="attr_opt-vehicle-ship" class="sheet-opt sheet-opt-vehicle" value="1" title="Vehicle" checked="checked" />
-                                            <input type="radio" name="attr_opt-vehicle-ship" class="sheet-opt sheet-opt-ship" value="2" title="Ship" />
-                                            <br /><br />
-                                            <h3 class="sheet-section-header">Details</h3>
-                                            <table cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td><label>Name:</label></td>
-                                                        <td><input name="attr_v-s-name" type="text" /></td>
-                                                        <td><label>Hard Points:</label></td>
-                                                        <td><input name="attr_hard-points" type="text" /></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle"><label>Vehicle Type/Model:</label></td>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-type-model" type="text" /></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Hull Type/Class:</label></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_hull-type-class" type="text" /></td>
-                                                        <td><label>Sensor Range:</label></td>
-                                                        <td>
-                                                            <select name="attr_sensor-range">
-                                                                <option value="none">None</option>
-                                                                <option value="Close">Close</option>
-                                                                <option value="Short">Short</option>
-                                                                <option value="Medium">Medium</option>
-                                                                <option value="Long">Long</option>
-                                                                <option value="Extreme">Extreme</option>
-                                                            </select>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td><label>Manufacturer:</label></td>
-                                                        <td><input name="attr_manufacturer" type="text" /></td>
-                                                        <td><label>Encumbrance Capacity:</label></td>
-                                                        <td><input name="attr_encum-capacity" type="text" /></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td><label>Passenger Capacity:</label></td>
-                                                        <td><input name="attr_pass-capacity" type="text" /></td>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle"><label>Maximum Altitude:</label></td>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-max-altiude" type="text" /></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Navicomputer: </label></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_ship-navicomputer" type="checkbox" value="1" /></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle"><label>Crew:</label></td>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-crew" type="text" /></td>
-                                                        <td class="sheet-opt-content sheet-opt-vehicle" colspan="2">&nbsp;</td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Ship's Complement:</label></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_ships-complement" type="text" /></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Hyperdrive Primary Class:</label></td>
-                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_hyperdrive-primary" type="text" /></td>
-                                                    </tr>
-                                                    <tr class="sheet-opt-content sheet-opt-ship">
-                                                        <td><label>Consumables:</label></td>
-                                                        <td><input name="attr_ship-consumables" type="text" /></td>
-                                                        <td><label>Hyperdrive Backup Class:</label></td>
-                                                        <td><input name="attr_hyperdrive-backup" type="text" /></td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <br />
-                                        </div><!-- end column -->
-                                        <div class="sheet-clear"></div>
-                                    </div><!-- Vehicle General Info -->
-                                    <div class="sheet-row">
-                                        <div class="sheet-small-12 sheet-column">
-                                            <h3 class="sheet-section-header">Attachments</h3>
-                                            <table cellspacing="0" cellpadding="0" border="0">
-                                                <thead>
-                                                    <tr>
-                                                        <th style="width:25%">Name</th>
-                                                        <th style="width:25%">Hard points</th>
-                                                        <th style="width:25%">Base Modifiers</th>
-                                                        <th style="width:25%">Modifications</th>
-                                                    </tr>
-                                                </thead>
-                                            </table>
-                                            <fieldset class="repeating_shipAttachments">
-                                                <table cellspacing="0" cellpadding="0" border="0">
-                                                    <tbody>
-                                                        <tr>
-                                                            <td style="width:25%"><input name='attr_shipAttachName' type="text" /></td>
-                                                            <td style="width:25%"><input name='attr_shipAttachHP' type="text" /></td>
-                                                            <td style="width:25%"><input name='attr_shipAttachBaseMod' type="text" /></td>
-                                                            <td style="width:25%"><input name='attr_shipAttachMod' type="text" /></td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </fieldset>
-                                        </div>
-                                        <div class="sheet-clear"></div>
-                                    </div><!-- Vehicle Attachments -->
-                                    <div class="sheet-row sheet-show-critical-table">
-                                        <div class="sheet-small-12 sheet-column">
-                                            <h3 class="sheet-section-header">Vehicle Critical</h3>
-                                        </div><!-- column -->
-                                        <div class="sheet-small-9 sheet-column">
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn1" value="1" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName1" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange1" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice1" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity1" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea row="3" name="attr_critShipSummary1" readonly="readonly"></textarea></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect1" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect1" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn2" value="2" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName2" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange2" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice2" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity2" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary2" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect2" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect2" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr></tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn3" value="3" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName3" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange3" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice3" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity3" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary3" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect3" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect3" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn4" value="4" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName4" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange4" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice4" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity4" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary4" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect4" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect4" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn5" value="5" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName5" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange5" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice5" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity5" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary5" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect5" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect5" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn6" value="6" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName6" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange6" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice6" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity6" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary6" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect6" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect6" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn7" value="7" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName7" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange7" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice7" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity7" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary7" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect7" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect7" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn8" value="8" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName8" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange8" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice8" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity8" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary8" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect8" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect8" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn9" value="9" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName9" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange9" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice9" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity9" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary9" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect9" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect9" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn10" value="10" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName10" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange10" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice10" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity10" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary10" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect10" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect10" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn11" value="11" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName11" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange11" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice11" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity11" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary11" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect11" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect11" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn12" value="12" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName12" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange12" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice12" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity12" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary12" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect12" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect12" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn13" value="13" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName13" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange13" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice13" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity13" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary13" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect13" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect13" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn14" value="14" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName14" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange14" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice14" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity14" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary14" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect14" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect14" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn15" value="15" />
-                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td width="70%"><input type="text" name="attr_critShipName15" readonly="readonly" /></td>
-                                                        <td width="30%"><input type="text" name="attr_critShipRange15" readonly="readonly" /></td>
-                                                        <td class="sheet-crit-dice-bg">
-                                                            <input type="hidden" name="attr_critShipDice15" />
-                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity15" /><span></span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary15" readonly="readonly" /></td>
-                                                        <td>
-                                                            <label>Effect:</label>
-                                                            <div class="sheet-switch">
-                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect15" value="on" title="On" checked="checked">
-                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect15" value="off" title="Off">
-                                                                <span class="switch-selection"></span>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div><!-- column -->
-                                        <div class="sheet-small-3 sheet-column">
-                                            <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
-                                                <tbody>
-                                                    <tr>
-                                                        <td><label>Critcal roll offset:</label></td>
-                                                        <td><input type="text" name="attr_critShipAddOffset" value="" /></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <label>Critical number:</label>
-                                                            <input type="text" name="attr_critShipAddRangeNum" value="" />
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div><!-- column -->
-                                        <div class="sheet-clear"></div>
-                                    </div><!-- Vehicle Criticals -->
-                                    <div class="sheet-row">
-                                        <div class="sheet-small-12 sheet-column">
-                                            <h3 class="sheet-section-header">Cargo Hold</h3>
-                                            <table cellspacing="0" cellpadding="0" border="0">
-                                                <tbody><tr><td><textarea name="attr_carho-hold" rows="6"></textarea></td></tr></tbody>
-                                            </table>
-                                        </div>
-                                        <div class="sheet-clear"></div>
-                                    </div><!-- Cargo Hold -->
-                                </div><!-- Depreciated Vehicle Details -->
-                                <div class="sheet-tab-content sheet-tab-v-weapons">
-                                    <br />
-                                    <h3 class="sheet-section-header">Crew Roles</h3>
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:180px;">Character Name</th>
-                                                <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
-                                                <th><span style="float:left">Dice</span></th>
-                                                <th>Special</th>
-                                                <th colspan="2">Skill</th>
-                                            </tr>
-                                        </thead>
-                                    </table>
-                                    <fieldset class="repeating_shipCrewRoles">
-                                        <table cellspacing="0" cellpadding="0" border="0">
-                                            <tbody>
-                                                <tr>
-                                                    <td style="width:180px;"><input name='attr_shipRoleCharacterName' type="text" /></td>
-                                                    <td style="width:180px;"><input name='attr_shipRoleName' type="text" /></td>
-                                                    <td><input name='attr_shipRoleDice' type="text" /></td>
-                                                    <td><input name='attr_shipRoleSpecial' type="text" /></td>
-                                                    <td>
-                                                        <select name='attr_shipRoleSkill'>
-                                                            <option value="" disabled>Skills</option>
-                                                            <option value="skill:intellect,rankAstrogation">&nbsp;&nbsp;&nbsp;&nbsp;Astrogation</option>
-                                                            <option value="skill:brawn,rankAthletics">&nbsp;&nbsp;&nbsp;&nbsp;Athletics</option>
-                                                            <option value="skill:presence,rankCoercion">&nbsp;&nbsp;&nbsp;&nbsp;Coercion</option>
-                                                            <option value="skill:intellect,rankComputers">&nbsp;&nbsp;&nbsp;&nbsp;Computers</option>
-                                                            <option value="skill:presence,rankCool">&nbsp;&nbsp;&nbsp;&nbsp;Cool</option>
-                                                            <option value="encum|skill:agility,rankCoordination">&nbsp;&nbsp;&nbsp;&nbsp;Coordination</option>
-                                                            <option value="skill:cunning,rankDeception">&nbsp;&nbsp;&nbsp;&nbsp;Deception</option>
-                                                            <option value="skill:willpower,rankDiscipline">&nbsp;&nbsp;&nbsp;&nbsp;Discipline</option>
-                                                            <option value="skill:presence,rankLeadership">&nbsp;&nbsp;&nbsp;&nbsp;Leadership</option>
-                                                            <option value="skill:intellect,rankMechanics">&nbsp;&nbsp;&nbsp;&nbsp;Mechanics</option>
-                                                            <option value="skill:intellect,rankMedicine">&nbsp;&nbsp;&nbsp;&nbsp;Medicine</option>
-                                                            <option value="skill:presence,rankNegotiation">&nbsp;&nbsp;&nbsp;&nbsp;Negotiation</option>
-                                                            <option value="skill:cunning,rankPerception">&nbsp;&nbsp;&nbsp;&nbsp;Perception</option>
-                                                            <option value="encum|skill:agility,rankPlanetary">&nbsp;&nbsp;&nbsp;&nbsp;Piloting - Planetary</option>
-                                                            <option value="encum|skill:agility,rankSpace">&nbsp;&nbsp;&nbsp;&nbsp;Piloting - Space</option>
-                                                            <option value="skill:brawn,rankResilience">&nbsp;&nbsp;&nbsp;&nbsp;Resilience</option>
-                                                            <option value="skill:cunning,rankSkulduggery">&nbsp;&nbsp;&nbsp;&nbsp;Skulduggery</option>
-                                                            <option value="encum|skill:agility,rankStealth">&nbsp;&nbsp;&nbsp;&nbsp;Stealth</option>
-                                                            <option value="skill:cunning,rankStreetwise">&nbsp;&nbsp;&nbsp;&nbsp;Streetwise</option>
-                                                            <option value="skill:cunning,rankSurvival">&nbsp;&nbsp;&nbsp;&nbsp;Survival</option>
-                                                            <option value="skill:willpower,rankVigilance">&nbsp;&nbsp;&nbsp;&nbsp;Vigilance</option>
-                                                            <option value="" disabled>Combat Skills</option>
-                                                            <option value="skill:brawn,rankBrawl">&nbsp;&nbsp;&nbsp;&nbsp;Brawl</option>
-                                                            <option value="encum|skill:agility,rankGunnery">&nbsp;&nbsp;&nbsp;&nbsp;Gunnery</option>
-                                                            <option value="skill:brawn,rankMelee">&nbsp;&nbsp;&nbsp;&nbsp;Melee</option>
-                                                            <option value="encum|skill:agility,rankLight">&nbsp;&nbsp;&nbsp;&nbsp;Ranged - Light</option>
-                                                            <option value="encum|skill:agility,rankHeavy">&nbsp;&nbsp;&nbsp;&nbsp;Ranged - Heavy</option>
-                                                            <option value="" disabled>Knowledge Skills</option>
-                                                            <option value="skill:intellect,rankCore">&nbsp;&nbsp;&nbsp;&nbsp;Core Worlds</option>
-                                                            <option value="skill:intellect,rankEducation">&nbsp;&nbsp;&nbsp;&nbsp;Education</option>
-                                                            <option value="skill:intellect,rankLore">&nbsp;&nbsp;&nbsp;&nbsp;Lore</option>
-                                                            <option value="skill:intellect,rankOuter">&nbsp;&nbsp;&nbsp;&nbsp;Outer Rim</option>
-                                                            <option value="skill:intellect,rankUnderworld">&nbsp;&nbsp;&nbsp;&nbsp;Underworld</option>
-                                                            <option value="skill:intellect,rankXenology">&nbsp;&nbsp;&nbsp;&nbsp;Xenology</option>
-                                                            <option value="skill:intellect,rankWarfare">&nbsp;&nbsp;&nbsp;&nbsp;Warfare</option>
-                                                        </select>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </fieldset>
-                                    <br />
-                                    <h3 class="sheet-section-header">Weapons</h3>
-                                    <fieldset class="repeating_shipWeapons">
-                                        <table cellspacing="0" cellpadding="0" border="0">
-                                            <thead>
-                                                <tr>
-                                                    <th>Character Name</th>
-                                                    <th>Weapon Name</th>
-                                                    <th>Arc</th>
-                                                    <th>Crit</th>
-                                                    <th>Dmg</th>
-                                                    <th colspan="2">Range/Skill</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <tr>
-                                                    <td><input name='attr_shipWeaponCharacterName' type="text" /></td>
-                                                    <td><input name='attr_shipWeaponName' type="text" /></td>
-                                                    <td class="sheet-firearc-field">
-                                                        <input name='attr_fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
-                                                        <input name='attr_fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
-                                                        <input name='attr_fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
-                                                        <input name='attr_fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
-                                                        <span class="sheet-fireArcForeImg"></span>
-                                                        <span class="sheet-fireArcStarboardImg"></span>
-                                                        <span class="sheet-fireArcAftImg"></span>
-                                                        <span class="sheet-fireArcPortImg"></span>
-                                                    </td>
-                                                    <td style="width:50px"><input name='attr_shipWeaponCrit' type="number" max="99" min="-99" value="0" /></td>
-                                                    <td style="width:50px"><input name='attr_shipWeaponDmg' type="number" max="99" min="-99" value="0" /></td>
-                                                    <td style="width:150px">
-                                                        <select name='attr_shipWeaponRange'>
-                                                            <option value="Close">Close</option>
-                                                            <option value="Short">Short</option>
-                                                            <option value="Medium">Medium</option>
-                                                            <option value="Long">Long</option>
-                                                            <option value="Extreme">Extreme</option>
-                                                        </select>
-                                                    </td>
-                                                    <td>&nbsp;</td>
-                                                </tr>
-                                                <tr>
-                                                    <td><label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_shipWeaponDice' type="text" /></td>
-                                                    <td colspan="4"><label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_shipWeaponSpecial' type="text" /></td>
-                                                    <td>
-                                                        <select name='attr_shipWeaponSkill'>
-                                                            <option value="skill:agility,rankGunnery">Gunnery</option>
-                                                            <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
-                                                        </select>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </fieldset>
-                                </div><!-- Depreciated Vehicle Weapons -->
-                                <label>End of Old Vehicle Tabs</label>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div><!--Old Vehicle Tabs-->
 
     <div class="sheet-tab-content sheet-tab-transport-space">
         <div class="sheet-row">
@@ -5291,7 +2551,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class="sheet-ship-char-thre-bg">
+                        <td class="sheet-ship-char-bg sheet-armor">
                             <label class="sheet-label-title">Armor</label>
                             <input name="attr_space-ship_armor" type="number" max="99" min="0" value="0">
                         </td>
@@ -5314,178 +2574,32 @@
             </div><!-- Space Ship Stats Pictures -->
             <div class="sheet-clear"></div>
         </div><!-- Starship Top Stats -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Space Vehicle Details</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tr>
-                        <td><label>Name:</label></td>
-                        <td><input name="attr_transport-space-name" type="text" /></td>
-                        <td><label>Hard Points:</label></td>
-                        <td><input name="attr_transport-space-hp" type="number" min="0" max="9" value="0" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Hull Type/Class:</label></td>
-                        <td><input name="attr_transport-space-hulltype" type="text" /></td>
-                        <td><label>Sensor Range:</label></td>
-                        <td>
-                            <select name="attr_transport-space-sensrang">
-                                <option value="none">None</option>
-                                <option value="Close">Close</option>
-                                <option value="Short">Short</option>
-                                <option value="Medium">Medium</option>
-                                <option value="Long">Long</option>
-                                <option value="Extreme">Extreme</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label>Manufacturer:</label></td>
-                        <td><input name="attr_transport-space-manufact" type="text" /></td>
-                        <td><label>Ship's Complement:</label></td>
-                        <td><input name="attr_transport-space-compliment" type="text" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Hyperdrive Primary Class:</label></td>
-                        <td><input name="attr_transport-space-hyper-class" type="number" min="0" max="20" /></td>
-                        <td><label>Hyperdrive Backup Class:</label></td>
-                        <td><input name="attr_transport-space-hyper-backclass" type="number" min="0" max="20" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Consumables:</label></td>
-                        <td><input name="attr_transport-space-consumable" type="text" /></td>
-                        <td><label>Navicomputer:</label></td>
-                        <td><input name="attr_transport-space-navi" type="checkbox" value="1" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Book &amp; Page:</label></td>
-                        <td><input name='attr_space-vehicle_bookpage' type="text" /></td>
-                        <td>Rarity:</td>
-                        <td><input name='attr_space-vehicle_rarity' type="number" min="1" max="10" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Restricted:</label></td>
-                        <td>
-                            <select name='attr_space-vehicle_restrict'>
-                                <option value="no">No</option>
-                                <option value="yes">Yes</option>
-                            </select>
-                        </td>
-                        <td>Value</td>
-                        <td><input name='attr_space-vehicle_value' type="text" /></td>
-                    </tr>
-                </table>
-            </div>
-        </div><!-- Starship Info -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <br />
-                <h3 class="sheet-section-header">Crew Roles</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th style="width:180px;">Character Name</th>
-                            <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
-                            <th><span style="float:left">Dice</span></th>
-                            <th colspan="2"><span style="float:left">Skill</span></th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_spaceCrewRoles">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+
+        <input type="radio" name="attr_space-criticals" style="width: 145px ; margin: -2px -30px 0 4px" class="sheet-tab-new sheet-tab-transport-space-general" value="1" checked="checked" />
+        <span class="sheet-tab-new">&emsp;General Information&emsp;</span>
+        <input type="radio" name="attr_space-criticals" class="sheet-tab-new sheet-tab-transport-space-critical" value="2" />
+        <span class="sheet-tab-new">&emsp;Critical Hits&emsp;</span>
+
+        <div class="sheet-tab-content sheet-tab-transport-space-general">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Space Vehicle Details</h3>
+                    <input name="attr_starship-Space-Vehicle-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-details-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
                             <tr>
-                                <td style="width:180px;"><input name='attr_spaceRoleCharacterName' type="text" /></td>
-                                <td style="width:180px;"><input name='attr_spaceRoleName' type="text" /></td>
-                                <td><input name='attr_spaceRoleDice' type="text" /></td>
-                                <td>
-                                    <select name='attr_spaceRoleSkill'>
-                                        <!--brawn agility intellect cunning willpower presence -->
-                                        <option value="" disabled>General Skills</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankAstrogation) label(skill:Astrogation|Vehicle:@{transport-space-name}|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Astrogation</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankAthletics) label(skill:Athletics|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Athletics</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankCharm) label(skill:Charm|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Charm</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankCoercion) label(skill:Coercion|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Coercion</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankComputers) label(skill:Computers|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Computers</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankCool) label(skill:Cool|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Cool</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankCoordination) label(skill:Coordination|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Coordination</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankDeception) label(skill:Deception|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Deception</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:willpower,rankDiscipline) label(skill:Discipline|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Discipline</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankLeadership) label(skill:Leadership|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Leadership</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankMechanics) label(skill:Mechanics|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Mechanics</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankMedicine) label(skill:Medicine|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Medicine</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankNegotiation) label(skill:Negotiation|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Negotiation</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankPerception) label(skill:Perception|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Perception</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankPlanetary) label(skill:Piloting-Planetary|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Piloting (Planetary)</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankSpace) label(skill:Piloting-Space|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Piloting (Space)</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankResilience) label(skill:Resilience|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Resilience</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankSkulduggery) label(skill:Skulduggery|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Skulduggery</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankStealth) label(skill:Stealth|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Stealth</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankStreetwise) label(skill:Streetwise|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Streetwise</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankSurvival) label(skill:Survival|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Survival</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:willpower,rankVigilance) label(skill:Vigilance|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Vigilance</option>
-                                        <option value="" disabled>Combat Skills</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankBrawl) label(skill:Brawl|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Brawl</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankGunnery) label(skill:Gunnery|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Gunnery</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankMelee) label(skill:Melee|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Melee</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:charLightsaber,rankLightsaber) label(skill:Lightsaber|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Lightsaber</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankLight) label(skill:Ranged-Light|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Ranged (Light)</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankHeavy) label(skill:Ranged-Heavy|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Ranged (Heavy)</option>
-                                        <option value="" disabled>Knowledge Skills</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankCore) label(skill:Core Worlds|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Core Worlds</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankEducation) label(skill:Education|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Education</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankLore) label(skill:Lore|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Lore</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankOuter) label(skill:Outer Rim|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Outer Rim</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankUnderworld) label(skill:Underworld|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Underworld</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankXenology) label(skill:Xenology|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Xenology</option>
-                                        <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankWarfare) label(skill:Warfare|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Warfare</option>
-                                    </select>
-                                </td>
-                                <td><button type='roll' name='roll_space-shipRole' value=@{spaceRoleSkill}></button></td>
+                                <td><label>Name:</label></td>
+                                <td><input name="attr_transport-space-name" type="text" /></td>
+                                <td><label>Hard Points:</label></td>
+                                <td><input name="attr_transport-space-hp" type="number" min="0" max="9" value="0" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                </fieldset>
-                <br />
-            </div>
-        </div><!-- Starship Crew Roles -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <br />
-                <h3 class="sheet-section-header">Weapons</h3>
-                <div class="sheet-clear"></div>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th>Character Name</th>
-                            <th>Weapon Name</th>
-                            <th>Arc</th>
-                            <th>Crit</th>
-                            <th>Dmg</th>
-                            <th colspan="2">Range/Skill</th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_spaceWeapons">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
                             <tr>
-                                <td><input name='attr_spaceWeaponCharacterName' type="text" /></td>
-                                <td><input name='attr_spaceWeaponName' type="text" /></td>
-                                <td class="sheet-firearc-field">
-                                    <input name='attr_space-fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
-                                    <input name='attr_space-fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
-                                    <input name='attr_space-fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
-                                    <input name='attr_space-fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
-                                    <span class="sheet-fireArcForeImg"></span>
-                                    <span class="sheet-fireArcStarboardImg"></span>
-                                    <span class="sheet-fireArcAftImg"></span>
-                                    <span class="sheet-fireArcPortImg"></span>
-                                </td>
-                                <td style="width:50px"><input name='attr_spaceWeaponCrit' type="number" max="99" min="0" value="0" /></td>
-                                <td style="width:50px"><input name='attr_spaceWeaponDmg' type="number" max="99" min="0" value="0" /></td>
-                                <td style="width:150px">
-                                    <select name='attr_spaceWeaponRange'>
+                                <td><label>Hull Type/Class:</label></td>
+                                <td><input name="attr_transport-space-hulltype" type="text" /></td>
+                                <td><label>Sensor Range:</label></td>
+                                <td>
+                                    <select name="attr_transport-space-sensrang">
+                                        <option value="none">None</option>
                                         <option value="Close">Close</option>
                                         <option value="Short">Short</option>
                                         <option value="Medium">Medium</option>
@@ -5493,630 +2607,428 @@
                                         <option value="Extreme">Extreme</option>
                                     </select>
                                 </td>
-                                <td>&nbsp;</td>
                             </tr>
                             <tr>
-                                <td><label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_spaceWeaponDice' type="text" /></td>
-                                <td colspan="4"><label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_spaceWeaponSpecial' type="text" /></td>
-                                <td>
-                                    <select name='attr_spaceWeaponSkill'>
-                                        <option value="skill:agility,rankGunnery">Gunnery</option>
-                                        <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
-                                    </select>
-                                </td>
-                                <td><button type='roll' name='roll_space-shipWeapon' value='!eed rollPlayer(character:@{spaceWeaponCharacterName}|encum|@{spaceWeaponSkill}) label(Weapon:@{spaceWeaponName}|Vehicle:@{transport-space-name}|Damage:@{spaceWeaponDmg}|Critical:@{spaceWeaponCrit}|Range:@{spaceWeaponRange}|Special:@{spaceWeaponSpecial}) @{spaceWeaponDice} @{dicePool} (gmdice)'></button></td>
+                                <td><label>Manufacturer:</label></td>
+                                <td><input name="attr_transport-space-manufact" type="text" /></td>
+                                <td><label>Ship's Complement:</label></td>
+                                <td><input name="attr_transport-space-compliment" type="text" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Hyperdrive Primary Class:</label></td>
+                                <td><input name="attr_transport-space-hyper-class" type="number" min="0" max="20" /></td>
+                                <td><label>Hyperdrive Backup Class:</label></td>
+                                <td><input name="attr_transport-space-hyper-backclass" type="number" min="0" max="20" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Consumables:</label></td>
+                                <td><input name="attr_transport-space-consumable" type="text" /></td>
+                                <td><label>Navicomputer:</label></td>
+                                <td><input name="attr_transport-space-navi" type="checkbox" value="1" /></td>
                             </tr>
                             <tr>
                                 <td><label>Book &amp; Page:</label></td>
-                                <td><input name='attr_space-weapon_bookpage' type="text" /></td>
-                                <td>Rarity:</td>
-                                <td><input name='attr_space-weapon_rarity' type="number" min="1" max="10" /></td>
+                                <td><input name='attr_space-vehicle_bookpage' type="text" /></td>
+                                <td><label>Rarity</label></td>
+                                <td><input name='attr_space-vehicle_rarity' type="number" min="1" max="10" /></td>
+                            </tr>
+                            <tr>
                                 <td><label>Restricted:</label></td>
                                 <td>
-                                    <select name='attr_space-weapon_restrict'>
+                                    <select name='attr_space-vehicle_restrict'>
                                         <option value="no">No</option>
                                         <option value="yes">Yes</option>
                                     </select>
                                 </td>
+                                <td><label>Value:</label></td>
+                                <td><input name='attr_space-vehicle_value' type="text" /></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Starship Info -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Crew Roles</h3>
+                    <input name="attr_starship-Crew-Roles" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-roles-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-roles-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th style="width:180px;">Character Name</th>
+                                <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
+                                <th><span style="float:left">Dice</span></th>
+                                <th colspan="2"><span style="float:left">Skill</span></th>
+                            </tr>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_spaceCrewRoles">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td style="width:180px;"><input name='attr_spaceRoleCharacterName' type="text" /></td>
+                                    <td style="width:180px;"><input name='attr_spaceRoleName' type="text" /></td>
+                                    <td><input name='attr_spaceRoleDice' type="text" /></td>
+                                    <td>
+                                        <select name='attr_spaceRoleSkill'>
+                                            <!--brawn agility intellect cunning willpower presence -->
+                                            <optgroup label="General Skills">
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankAstrogation) label(skill:Astrogation|Vehicle:@{transport-space-name}|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Astrogation</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankAthletics) label(skill:Athletics|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Athletics</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankCharm) label(skill:Charm|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Charm</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankCoercion) label(skill:Coercion|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Coercion</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankComputers) label(skill:Computers|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Computers</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankCool) label(skill:Cool|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Cool</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankCoordination) label(skill:Coordination|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Coordination</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankDeception) label(skill:Deception|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Deception</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:willpower,rankDiscipline) label(skill:Discipline|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Discipline</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankLeadership) label(skill:Leadership|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Leadership</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankMechanics) label(skill:Mechanics|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Mechanics</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankMedicine) label(skill:Medicine|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Medicine</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:presence,rankNegotiation) label(skill:Negotiation|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Negotiation</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankPerception) label(skill:Perception|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Perception</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankPlanetary) label(skill:Piloting-Planetary|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Piloting (Planetary)</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankSpace) label(skill:Piloting-Space|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Piloting (Space)</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankResilience) label(skill:Resilience|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Resilience</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankSkulduggery) label(skill:Skulduggery|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Skulduggery</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankStealth) label(skill:Stealth|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Stealth</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankStreetwise) label(skill:Streetwise|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Streetwise</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:cunning,rankSurvival) label(skill:Survival|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Survival</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:willpower,rankVigilance) label(skill:Vigilance|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Vigilance</option>
+                                            </optgroup>
+                                            <optgroup label="Combat Skills">
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankBrawl) label(skill:Brawl|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Brawl</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankGunnery) label(skill:Gunnery|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Gunnery</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:brawn,rankMelee) label(skill:Melee|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Melee</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:charLightsaber,rankLightsaber) label(skill:Lightsaber|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Lightsaber</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankLight) label(skill:Ranged-Light|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Ranged (Light)</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|encum|skill:agility,rankHeavy) label(skill:Ranged-Heavy|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) combat(vehicle) @{spaceRoleDice} @{dicePool} (gmdice)">Ranged (Heavy)</option>
+                                            </optgroup>
+                                            <optgroup label="Knowledge Skills">
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankCore) label(skill:Core Worlds|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Core Worlds</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankEducation) label(skill:Education|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Education</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankLore) label(skill:Lore|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Lore</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankOuter) label(skill:Outer Rim|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Outer Rim</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankUnderworld) label(skill:Underworld|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Underworld</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankXenology) label(skill:Xenology|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Xenology</option>
+                                                <option value="!eed rollPlayer(character:@{spaceRoleCharacterName}|skill:intellect,rankWarfare) label(skill:Warfare|Vehicle:@{transport-space-name}|Role:@{spaceRoleName}) @{spaceRoleDice} @{dicePool} (gmdice)">Warfare</option>
+                                            </optgroup>
+                                        </select>
+                                    </td>
+                                    <td><button type='roll' name='roll_space-shipRole' value=@{spaceRoleSkill}></button></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Starship Crew Roles -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Weapons</h3>
+                    <input name="attr_starship-Weapons" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-weapon-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-weapon-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Character Name</th>
+                                <th>Weapon Name</th>
+                                <th>Arc</th>
+                                <th>Crit</th>
+                                <th>Dmg</th>
+                                <th colspan="2">Range/Skill</th>
+                            </tr>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_spaceWeapons">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><input name='attr_spaceWeaponCharacterName' type="text" /></td>
+                                    <td><input name='attr_spaceWeaponName' type="text" /></td>
+                                    <td class="sheet-firearc-field">
+                                        <input name='attr_space-fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
+                                        <input name='attr_space-fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
+                                        <input name='attr_space-fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
+                                        <input name='attr_space-fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
+                                        <span class="sheet-fireArcForeImg"></span>
+                                        <span class="sheet-fireArcStarboardImg"></span>
+                                        <span class="sheet-fireArcAftImg"></span>
+                                        <span class="sheet-fireArcPortImg"></span>
+                                    </td>
+                                    <td style="width:50px"><input name='attr_spaceWeaponCrit' type="number" max="99" min="0" value="0" /></td>
+                                    <td style="width:50px"><input name='attr_spaceWeaponDmg' type="number" max="99" min="0" value="0" /></td>
+                                    <td style="width:150px">
+                                        <select name='attr_spaceWeaponRange'>
+                                            <option value="Close">Close</option>
+                                            <option value="Short">Short</option>
+                                            <option value="Medium">Medium</option>
+                                            <option value="Long">Long</option>
+                                            <option value="Extreme">Extreme</option>
+                                        </select>
+                                    </td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td><label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_spaceWeaponDice' type="text" /></td>
+                                    <td colspan="4"><label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_spaceWeaponSpecial' type="text" /></td>
+                                    <td>
+                                        <select name='attr_spaceWeaponSkill'>
+                                            <option value="skill:agility,rankGunnery">Gunnery</option>
+                                            <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
+                                        </select>
+                                    </td>
+                                    <td><button type='roll' name='roll_space-shipWeapon' value='!eed rollPlayer(character:@{spaceWeaponCharacterName}|encum|@{spaceWeaponSkill}) label(Weapon:@{spaceWeaponName}|Vehicle:@{transport-space-name}|Damage:@{spaceWeaponDmg}|Critical:@{spaceWeaponCrit}|Range:@{spaceweaponrange}|Qualities:@{spaceWeaponSpecial}) combat(vehicle) @{spaceWeaponDice} @{dicePool} (gmdice)'></button></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input name='attr_space-weapon_bookpage' type="text" /></td>
+                                    <td><label>Rarity</label></td>
+                                    <td><input name='attr_space-weapon_rarity' type="number" min="1" max="10" /></td>
+                                    <td><label>Restricted:</label></td>
+                                    <td>
+                                        <select name='attr_space-weapon_restrict'>
+                                            <option value="no">No</option>
+                                            <option value="yes">Yes</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Value:</label></td>
+                                    <td><input name='attr_space-weapon_value' type="text" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <br />
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Starship Weapons -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Attachments</h3>
+                    <input name="attr_starship-Attachments" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-attachments-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-attachments-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <th style="width:25%">Name</th>
+                                <th style="width:25%">Hard points</th>
+                                <th style="width:25%">Base Modifiers</th>
+                                <th style="width:25%">Modifications</th>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <fieldset class="repeating_space-attachments">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td style="width:25%"><input name='attr_SpaceAttachName' type="text" /></td>
+                                    <td style="width:25%"><input name='attr_SpaceAttachHP' type="text" /></td>
+                                    <td style="width:25%"><input name='attr_SpaceAttachBaseMod' type="text" /></td>
+                                    <td style="width:25%"><input name='attr_SpaceAttachMod' type="text" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input name='attr_space-attach_bookpage' type="text" /></td>
+                                    <td><label>Rarity</label></td>
+                                    <td><input name='attr_space-attach_rarity' type="number" min="1" max="10" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Restricted:</label></td>
+                                    <td>
+                                        <select name='attr_space-attach_restrict'>
+                                            <option value="no">No</option>
+                                            <option value="yes">Yes</option>
+                                        </select>
+                                    </td>
+                                    <td><label>Value:</label></td>
+                                    <td><input name='attr_space-attach_value' type="text" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <br />
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Starship Attachments Section -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Cargo Hold</h3>
+                    <input name="attr_starship-Cargo-Hold" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-cargo-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-cargo-section">
+                        <table>
+                            <tr>
+                                <td><label>Encumbrance Capacity</label></td>
+                                <td><input name="attr_space-encumbrance_max" type="text" value="0" /></td>
+                                <td><label>Current Encumbrance</label></td>
+                                <td><input name="attr_space-encumbrance_current" type="text" value="0" /></td>
+                            </tr>
+                        </table><!--Encumbrance Stats-->
+                        <fieldset class="repeating_space-cargo">
+                            <br />
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><label>Cargo Type</label></td>
+                                    <td>
+                                        <select name='attr_space-cargo-type'>
+                                            <option value="lowtech">Low Tech</option>
+                                            <option value="midtech">Mid Tech</option>
+                                            <option value="hightech">High Tech</option>
+                                            <option value="weapons">Weapons</option>
+                                            <option value="illicitmaterials">Illicit Materials</option>
+                                            <option value="metals">Metals</option>
+                                            <option value="minerals">Minerals</option>
+                                            <option value="foodstuffs">Foodstuffs</option>
+                                            <option value="medicine">Medicine</option>
+                                            <option value="custom">Custom</option>
+                                        </select>
+                                    </td>
+                                    <td><label>Legal?</label></td>
+                                    <td>
+                                        <select name='attr_space-cargo-legal'>
+                                            <option value="yes">Yes</option>
+                                            <option value="no">No</option>
+                                            <option value="maybe">Maybe?</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Quantity</label></td>
+                                    <td><input name="attr_space-cargo_quantity" type="number" min="0" value="0" />
+                                    <td><label>Encumbrance</label></td>
+                                    <td><input name="attr_space-cargo_encumbrance" type="text" min="0" value="0" />
+                                </tr>
+                                <tr>
+                                    <td><label>Pickup</label></td>
+                                    <td><input name="attr_space-cargo_pickup" type="text" />
+                                    <td><label>Dropoff</label></td>
+                                    <td><input name="attr_space-cargo_dropoff" type="text" />
+                                </tr>
+                                <tr>
+                                    <td><label>Value</label></td>
+                                    <td><input name="attr_space-cargo_value" type="text" value="0" />
+                                    <td><label>Misc Info</label></td>
+                                    <td><textarea name="attr_space-cargo_misc" rows="2"></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </fieldset><!--Cargo Specifics-->
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Space Vehicle Cargo Hold Section -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Passengers</h3>
+                    <input name="attr_starship-Passengers" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-passengers-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-passengers-section">
+                        <table>
+                            <tr>
+                                <td><label><b>Capacity</b></label></td>
+                                <td><input name="attr_space-passengers_max" type="text" value="0" /></td>
+                                <td><label><b>Current</b></label></td>
+                                <td><input name="attr_space-passengers_current" type="text" value="0" /></td>
+                            </tr>
+                        </table><!--Passengers Stat-->
+                        <fieldset class="repeating_space-passengers">
+                            <br />
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><label>Passenger Name</label></td>
+                                    <td><input name="attr_space-passenger_name" type="text" /></td>
+                                    <td><label>Wanted?</label></td>
+                                    <td>
+                                        <select name='attr_space-passenger-legal'>
+                                            <option value="yes">Yes</option>
+                                            <option value="no">No</option>
+                                            <option value="maybe">Maybe?</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Role</label></td>
+                                    <td><input name="attr_space-passenger_role" type="text" /></td>
+                                    <td><label>Value <span style="font-size:10px">(if known)</span></label></td>
+                                    <td><input name="attr_space-passenger_value" type="text" value="0" /></td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                    <td><label>Destination</label></td>
+                                    <td><input name="attr_space-passenger_destination" type="text" /></td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </fieldset><!--Passenger Specifics-->
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Space Vehicle Passenger Section -->
+        </div><!-- Starship General Information -->
+        <div class="sheet-tab-content sheet-tab-transport-space-critical">
+            <div class="sheet-row sheet-show-critical-table">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Starship Critical</h3>
+                </div>
+                <div class="sheet-small-9 sheet-column">
+                    <input type="hidden" name="attr_starship-critTotal" value="0" />
+                    <fieldset class="repeating_critstarship">
+                        <input type="hidden" name="attr_starship-critId" />
+                        <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td width="70%"><input type="text" name="attr_starship-critName" readonly="readonly" /></td>
+                                <td width="30%"><input type="text" name="attr_starship-critRange" readonly="readonly" /></td>
+                                <td class="sheet-crit-dice-bg">
+                                    <input class="sheet-pd" value="4" type="hidden" name="attr_starship-critSeverity" /><span></span>
+                                </td>
                             </tr>
                             <tr>
-                                <td>Value</td>
-                                <td><input name='attr_space-weapon_value' type="text" /></td>
+                                <td colspan="2" rowspan="2"><textarea rows="3" name="attr_starship-critSummary" readonly="readonly"></textarea></td>
+                                <td>
+                                    <label>Effect:</label>
+                                    <div class="sheet-switch">
+                                        <input type="radio" class="sheet-switch-input-on" name="attr_starship-critEffect" value="on" title="On" checked="checked">
+                                        <input type="radio" class="sheet-switch-input-off" name="attr_starship-critEffect" value="off" title="Off">
+                                        <span class="switch-selection"></span>
+                                    </div>
+                                </td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div>
-        </div><!-- Starship Weapons -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Attachments</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <th style="width:25%">Name</th>
-                            <th style="width:25%">Hard points</th>
-                            <th style="width:25%">Base Modifiers</th>
-                            <th style="width:25%">Modifications</th>
-                        </tr>
-                    </tbody>
-                </table>
-                <fieldset class="repeating_space-attachments">
-                    <table cellspacing="0" cellpadding="0" border="0">
+                            <tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|starship|@{starship-critId})">Repair</button></td></tr>
+                            </tbody>
+                        </table>
+                    </fieldset>                
+                </div>
+                <div class="sheet-small-3 sheet-column">
+                    <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
                         <tbody>
-                            <tr>
-                                <td style="width:25%"><input name='attr_SpaceAttachName' type="text" /></td>
-                                <td style="width:25%"><input name='attr_SpaceAttachHP' type="text" /></td>
-                                <td style="width:25%"><input name='attr_SpaceAttachBaseMod' type="text" /></td>
-                                <td style="width:25%"><input name='attr_SpaceAttachMod' type="text" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Book &amp; Page:</label></td>
-                                <td><input name='attr_space-attach_bookpage' type="text" /></td>
-                                <td>Rarity:</td>
-                                <td><input name='attr_space-attach_rarity' type="number" min="1" max="10" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Restricted:</label></td>
-                                <td>
-                                    <select name='attr_space-attach_restrict'>
-                                        <option value="no">No</option>
-                                        <option value="yes">Yes</option>
-                                    </select>
-                                </td>
-                                <td>Value</td>
-                                <td><input name='attr_space-attach_value' type="text" /></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Starship Attachments Section -->
-        <div class="sheet-row sheet-show-critical-table">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Starship Critical</h3>
-            </div>
-            <div class="sheet-small-9 sheet-column">
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn1" value="1" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName1" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange1" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice1" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity1" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect1" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect1" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn1})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn2" value="2" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName2" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange2" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice2" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity2" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary2" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect2" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect2" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn2})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn3" value="3" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName3" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange3" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice3" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity3" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary3" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect3" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect3" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn3})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn4" value="4" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName4" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange4" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice4" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity4" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary4" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect4" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect4" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn4})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn5" value="5" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName5" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange5" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice5" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity5" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary5" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect5" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect5" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn5})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn6" value="6" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName6" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange6" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice6" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity6" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary6" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect6" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect6" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn6})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn7" value="7" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName7" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange7" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice7" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity7" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary7" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect7" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect7" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn7})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn8" value="8" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName8" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange8" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice8" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity8" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary8" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect8" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect8" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn8})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn9" value="9" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName9" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange9" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice9" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity9" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary9" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect9" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect9" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn9})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn10" value="10" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName10" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange10" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice10" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity10" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary10" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect10" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect10" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn10})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn11" value="11" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName11" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange11" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice11" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity11" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary11" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect11" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect11" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn11})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn12" value="12" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName12" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange12" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice12" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity12" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary12" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect12" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect12" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn12})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn13" value="13" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName13" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange13" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice13" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity13" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary13" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect13" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect13" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn13})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn14" value="14" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName14" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange14" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice14" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity14" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary14" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect14" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect14" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn14})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn15" value="15" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName15" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange15" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice15" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity15" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary15" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect15" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect15" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn15})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-small-3 sheet-column">
-                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
                         <tr>
                             <td><label>Critical roll offset:</label></td>
-                            <td><input type="text" name="attr_critShipAddOffset" value="" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) critship(roll)">Roll Critical</button></td>
+                            <td><input type="text" name="attr_starship-critAddOffset" value="" /></td>
                         </tr>
+                        <tr><td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) critship(roll|starship)">Roll Critical</button></td></tr>
                         <tr>
                             <td>
                                 <label>Critical number:</label>
-                                <input type="text" name="attr_critShipAddRangeNum" value="" />
+                                <input type="text" name="attr_starship-critShipAddRangeNum" value="" />
+                            </td>
+                            <td valign="bottom">
+                                <button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) critship(add|starship|@{starship-critShipAddRangeNum})">Add Critical</button>
                             </td>
-                            <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) critship(add|@{critShipAddRangeNum})">Add Critical</button></td>
                         </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Starship Critical Section -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Cargo Hold</h3>
-                <table>
-                    <tr>
-                        <td><label>Encumbrance Capacity</label></td>
-                        <td><input name="attr_space-encumbrance_max" type="text" value="0" /></td>
-                        <td><label>Current Encumbrance</label></td>
-                        <td><input name="attr_space-encumbrance_current" type="text" value="0" /></td>
-                    </tr>
-                </table><!--Encumbrance Stats-->
-                <fieldset class="repeating_space-cargo">
-                    <br />
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><label>Cargo Type</label></td>
-                                <td>
-                                    <select name='attr_space-cargo-type'>
-                                        <option value="lowtech">Low Tech</option>
-                                        <option value="midtech">Mid Tech</option>
-                                        <option value="hightech">High Tech</option>
-                                        <option value="weapons">Weapons</option>
-                                        <option value="illicitmaterials">Illicit Materials</option>
-                                        <option value="metals">Metals</option>
-                                        <option value="minerals">Minerals</option>
-                                        <option value="foodstuffs">Foodstuffs</option>
-                                        <option value="medicine">Medicine</option>
-                                        <option value="custom">Custom</option>
-                                    </select>
-                                </td>
-                                <td><label>Legal?</label></td>
-                                <td>
-                                    <select name='attr_space-cargo-legal'>
-                                        <option value="yes">Yes</option>
-                                        <option value="no">No</option>
-                                        <option value="maybe">Maybe?</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Quantity</label></td>
-                                <td><input name="attr_space-cargo_quantity" type="number" min="0" value="0" />
-                                <td><label>Encumbrance</label></td>
-                                <td><input name="attr_space-cargo_encumbrance" type="text" min="0" value="0" />
-                            </tr>
-                            <tr>
-                                <td><label>Pickup</label></td>
-                                <td><input name="attr_space-cargo_pickup" type="text" />
-                                <td><label>Dropoff</label></td>
-                                <td><input name="attr_space-cargo_dropoff" type="text" />
-                            </tr>
-                            <tr>
-                                <td><label>Value</label></td>
-                                <td><input name="attr_space-cargo_value" type="text" value="0" />
-                                <td><label>Misc Info</label></td>
-                                <td><textarea name="attr_space-cargo_misc" rows="2"></textarea></td>
-                            </tr>
                         </tbody>
                     </table>
-                </fieldset><!--Cargo Specifics-->
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Space Vehicle Cargo Hold Section -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Passengers</h3>
-                <table>
-                    <tr>
-                        <td><label><bold>Capacity</bold></label></td>
-                        <td><input name="attr_space-passengers_max" type="text" value="0" /></td>
-                        <td><label><bold>Current</bold></label></td>
-                        <td><input name="attr_space-passengers_current" type="text" value="0" /></td>
-                    </tr>
-                </table><!--Passengers Stat-->
-                <fieldset class="repeating_space-passengers">
-                    <br />
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><label>Passenger Name</label></td>
-                                <td><input name="attr_space-passenger_name" type="text" /></td>
-                                <td><label>Wanted?</label></td>
-                                <td>
-                                    <select name='attr_space-passenger-legal'>
-                                        <option value="yes">Yes</option>
-                                        <option value="no">No</option>
-                                        <option value="maybe">Maybe?</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Role</label></td>
-                                <td><input name="attr_space-passenger_role" type="text" /></td>
-                                <td><label>Value <span style="font-size:10px">(if known)</span></label></td>
-                                <td><input name="attr_space-passenger_value" type="text" value="0" /></td>
-                            </tr>
-                            <tr>
-                                <td>&nbsp;</td>
-                                <td><label>Destination</label></td>
-                                <td><input name="attr_space-passenger_destination" type="text" /></td>
-                                <td>&nbsp;</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </fieldset><!--Passenger Specifics-->
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Space Vehicle Passenger Section -->
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Vehicle Critical Table -->
+        </div><!-- Starship Critical Hits -->
     </div><!--Space-->
     <div class="sheet-tab-content sheet-tab-transport-planetary">
         <div class="sheet-row">
@@ -6138,7 +3050,7 @@
                             <label>Handling</label>
                             <input name='attr_planetary-handling' type="number" max="99" min="-9" value="0" />
                         </td>
-                        <td rowspan="2" class="sheet-ship-defense">
+                        <td rowspan="2" class="sheet-planetary-vehicle-defense">
                             <div style="width:302px; height:1px;"></div>
                             <label class="sheet-def-label">Defense</label>
                             <div class="sheet-fore">
@@ -6160,7 +3072,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class="sheet-ship-char-thre-bg">
+                        <td class="sheet-ship-char-bg sheet-armor">
                             <label class="sheet-label-title">Armor</label>
                             <input name="attr_planetary-ship_armor" type="number" max="99" min="0" value="0">
                         </td>
@@ -6183,1106 +3095,844 @@
             </div><!-- Space Ship Stats Pictures -->
             <div class="sheet-clear"></div>
         </div><!-- Planetary Vehicle Top Stats -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Planetary Vehicle Details</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tr>
-                        <td><label>Name:</label></td>
-                        <td><input name="attr_transport-planetary-name" type="text" /></td>
-                        <td><label>Hard Points:</label></td>
-                        <td><input name="attr_transport-planetary-hp" type="text" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Vehicle Type/Model:</label></td>
-                        <td><input name="attr_transport-planetary-type" type="text" /></td>
-                        <td><label>Sensor Range:</label></td>
-                        <td><input name="attr_transport-planetary-sensrang" type="text" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Manufacturer:</label></td>
-                        <td><input name="attr_transport-planetary-manufact" type="text" /></td>
-                        <td><label>Maximum Altitude:</label></td>
-                        <td><input name="attr_transport-planetary-altitude" type="text" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Crew:</label></td>
-                        <td><input name="attr_transport-planetary-crew" type="text" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Book &amp; Page:</label></td>
-                        <td><input name='attr_planetary-vehicle_bookpage' type="text" /></td>
-                        <td>Rarity:</td>
-                        <td><input name='attr_planetary-vehicle_rarity' type="number" min="1" max="10" /></td>
-                    </tr>
-                    <tr>
-                        <td><label>Restricted:</label></td>
-                        <td>
-                            <select name='attr_planetary-vehicle_restrict'>
-                                <option value="no">No</option>
-                                <option value="yes">Yes</option>
-                            </select>
-                        </td>
-                        <td>Value</td>
-                        <td><input name='attr_planetary-vehicle_value' type="text" /></td>
-                    </tr>
-                </table>
-            </div>
-        </div><!-- Planetary Vehicle Info -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <br />
-                <h3 class="sheet-section-header">Crew Roles</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th style="width:180px;">Character Name</th>
-                            <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
-                            <th><span style="float:left">Dice</span></th>
-                            <th colspan="2"><span style="float:left">Skill</span></th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_spaceCrewRoles">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+
+        <input type="radio" name="attr_planetary-criticals" style="width: 145px ; margin: -2px -30px 0 4px" class="sheet-tab-new sheet-tab-transport-planetary-general" value="1" checked="checked" />
+        <span class="sheet-tab-new">&emsp;General Information&emsp;</span>
+        <input type="radio" name="attr_planetary-criticals" class="sheet-tab-new sheet-tab-transport-planetary-critical" value="2" />
+        <span class="sheet-tab-new">&emsp;Critical Hits&emsp;</span>
+
+        <div class="sheet-tab-content sheet-tab-transport-planetary-general">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Planetary Vehicle Details</h3>
+                    <input name="attr_planetary-Planetary-Vehicle-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-details-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
                             <tr>
-                                <td style="width:180px;"><input name='attr_planetaryRoleCharacterName' type="text" /></td>
-                                <td style="width:180px;"><input name='attr_planetaryRoleName' type="text" /></td>
-                                <td><input name='attr_planetaryRoleDice' type="text" /></td>
-                                <td>
-                                    <select name='attr_planetaryRoleSkill'>
-                                        <option value="" disabled>General Skills</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankAstrogation) label(skill:Astrogation|Vehicle:@{transport-planetary-name}|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Astrogation</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankAthletics) label(skill:Athletics|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Athletics</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankCharm) label(skill:Charm|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Charm</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankCoercion) label(skill:Coercion|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Coercion</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankComputers) label(skill:Computers|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Computers</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankCool) label(skill:Cool|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Cool</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankCoordination) label(skill:Coordination|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Coordination</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankDeception) label(skill:Deception|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Deception</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:willpower,rankDiscipline) label(skill:Discipline|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Discipline</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankLeadership) label(skill:Leadership|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Leadership</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankMechanics) label(skill:Mechanics|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Mechanics</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankMedicine) label(skill:Medicine|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Medicine</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankNegotiation) label(skill:Negotiation|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Negotiation</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankPerception) label(skill:Perception|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Perception</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankPlanetary) label(skill:Piloting-Planetary|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Piloting (Planetary)</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankSpace) label(skill:Piloting-Space|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Piloting (Space)</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankResilience) label(skill:Resilience|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Resilience</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankSkulduggery) label(skill:Skulduggery|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Skulduggery</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankStealth) label(skill:Stealth|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Stealth</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankStreetwise) label(skill:Streetwise|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Streetwise</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankSurvival) label(skill:Survival|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Survival</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:willpower,rankVigilance) label(skill:Vigilance|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Vigilance</option>
-                                        <option value="" disabled>Combat Skills</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankBrawl) label(skill:Brawl|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Brawl</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankGunnery) label(skill:Gunnery|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Gunnery</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankMelee) label(skill:Melee|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Melee</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:charLightsaber,rankLightsaber) label(skill:Lightsaber|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Lightsaber</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankLight) label(skill:Ranged-Light|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Ranged (Light)</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankHeavy) label(skill:Ranged-Heavy|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Ranged (Heavy)</option>
-                                        <option value="" disabled>Knowledge Skills</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankCore) label(skill:Core Worlds|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Core Worlds</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankEducation) label(skill:Education|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Education</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankLore) label(skill:Lore|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Lore</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankOuter) label(skill:Outer Rim|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Outer Rim</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankUnderworld) label(skill:Underworld|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Underworld</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankXenology) label(skill:Xenology|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Xenology</option>
-                                        <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankWarfare) label(skill:Warfare|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Warfare</option>
-                                    </select>
-                                </td>
-                                <td><button type='roll' name='roll_space-shipRole' value=@{planetaryRoleSkill}></button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </fieldset>
-                <br />
-            </div>
-        </div><!-- Planetary Vehicle Crew Roles -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <br />
-                <h3 class="sheet-section-header">Weapons</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th>Character Name</th>
-                            <th>Weapon Name</th>
-                            <th>Arc</th>
-                            <th>Crit</th>
-                            <th>Dmg</th>
-                            <th colspan="2">Range/Skill</th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_planetaryWeapons">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><input name='attr_planetaryWeaponCharacterName' type="text" /></td>
-                                <td><input name='attr_planetaryWeaponName' type="text" /></td>
-                                <td class="sheet-firearc-field">
-                                    <input name='attr_planetary-fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
-                                    <input name='attr_planetary-fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
-                                    <input name='attr_planetary-fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
-                                    <input name='attr_planetary-fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
-                                    <span class="sheet-fireArcForeImg"></span>
-                                    <span class="sheet-fireArcStarboardImg"></span>
-                                    <span class="sheet-fireArcAftImg"></span>
-                                    <span class="sheet-fireArcPortImg"></span>
-                                </td>
-                                <td style="width:50px"><input name='attr_planetaryWeaponCrit' type="number" max="99" min="-99" value="0" /></td>
-                                <td style="width:50px"><input name='attr_planetaryWeaponDmg' type="number" max="99" min="-99" value="0" /></td>
-                                <td style="width:150px">
-                                    <select name='attr_planetaryWeaponRange'>
-                                        <option value="Close">Close</option>
-                                        <option value="Short">Short</option>
-                                        <option value="Medium">Medium</option>
-                                        <option value="Long">Long</option>
-                                        <option value="Extreme">Extreme</option>
-                                    </select>
-                                </td>
-                                <td>&nbsp;</td>
+                                <td><label>Name:</label></td>
+                                <td><input name="attr_transport-planetary-name" type="text" /></td>
+                                <td><label>Hard Points:</label></td>
+                                <td><input name="attr_transport-planetary-hp" type="number" min="0" max="9" value="0" /></td>
                             </tr>
                             <tr>
-                                <td>
-                                    <label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_planetaryWeaponDice' type="text" />
-                                </td>
-                                <td colspan="4">
-                                    <label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_planetaryWeaponSpecial' type="text" />
-                                </td>
-                                <td>
-                                    <select name='attr_planetaryWeaponSkill'>
-                                        <option value="skill:agility,rankGunnery">Gunnery</option>
-                                        <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
-                                    </select>
-                                </td>
-                                <td><button type='roll' name='roll_planetary-shipWeapon' value='!eed rollPlayer(character:@{planetaryWeaponCharacterName}|encum|@{planetaryWeaponSkill}) label(Weapon:@{planetaryWeaponName}|Vehicle:@{transport-planetary-name}|Damage:@{planetaryWeaponDmg}|Critical:@{planetaryWeaponCrit}|Range:@{planetaryWeaponRange}|Special:@{planetaryWeaponSpecial}) @{planetaryWeaponDice} @{dicePool} (gmdice)'></button></td>
+                                <td><label>Vehicle Type/Model:</label></td>
+                                <td><input name="attr_transport-planetary-type" type="text" /></td>
+                                <td><label>Sensor Range:</label></td>
+                                <td><input name="attr_transport-planetary-sensrang" type="text" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Manufacturer:</label></td>
+                                <td><input name="attr_transport-planetary-manufact" type="text" /></td>
+                                <td><label>Maximum Altitude:</label></td>
+                                <td><input name="attr_transport-planetary-altitude" type="text" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Crew:</label></td>
+                                <td><input name="attr_transport-planetary-crew" type="text" /></td>
                             </tr>
                             <tr>
                                 <td><label>Book &amp; Page:</label></td>
-                                <td><input name='attr_planetary-weapon_bookpage' type="text" /></td>
-                                <td>Rarity:</td>
-                                <td><input name='attr_planetary-weapon_rarity' type="number" min="1" max="10" /></td>
-                                <td><label>Restricted:</label></td>
-                                <td>
-                                    <select name='attr_planetary-weapon_restrict'>
-                                        <option value="no">No</option>
-                                        <option value="yes">Yes</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Value</td>
-                                <td><input name='attr_planetary-weapon_value' type="text" /></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div>
-        </div><!-- Planetary Vehicle Weapons -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Attachments</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <th style="width:25%">Name</th>
-                            <th style="width:25%">Hard points</th>
-                            <th style="width:25%">Base Modifiers</th>
-                            <th style="width:25%">Modifications</th>
-                        </tr>
-                    </tbody>
-                </table>
-                <fieldset class="repeating_planetary-attachments">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td style="width:25%"><input name='attr_planetary-AttachName' type="text" /></td>
-                                <td style="width:25%"><input name='attr_planetary-AttachHP' type="text" /></td>
-                                <td style="width:25%"><input name='attr_planetary-AttachBaseMod' type="text" /></td>
-                                <td style="width:25%"><input name='attr_planetary-AttachMod' type="text" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Book &amp; Page:</label></td>
-                                <td><input name='attr_planetary-attach_bookpage' type="text" /></td>
-                                <td>Rarity:</td>
-                                <td><input name='attr_planetary-attach_rarity' type="number" min="1" max="10" /></td>
+                                <td><input name='attr_planetary-vehicle_bookpage' type="text" /></td>
+                                <td><label>Rarity</label></td>
+                                <td><input name='attr_planetary-vehicle_rarity' type="number" min="1" max="10" /></td>
                             </tr>
                             <tr>
                                 <td><label>Restricted:</label></td>
                                 <td>
-                                    <select name='attr_planetary-attach_restrict'>
+                                    <select name='attr_planetary-vehicle_restrict'>
                                         <option value="no">No</option>
                                         <option value="yes">Yes</option>
                                     </select>
                                 </td>
-                                <td>Value</td>
-                                <td><input name='attr_planetary-attach_value' type="text" /></td>
+                                <td><label>Value:</label></td>
+                                <td><input name='attr_planetary-vehicle_value' type="text" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Planetary Vehicle Attachments Section -->
-        <div class="sheet-row sheet-show-critical-table">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Planetary Vehicle Critical</h3>
-            </div>
-            <div class="sheet-small-9 sheet-column">
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn1" value="1" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName1" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange1" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice1" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity1" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect1" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect1" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn1})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn2" value="2" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName2" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange2" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice2" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity2" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary2" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect2" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect2" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn2})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn3" value="3" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName3" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange3" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice3" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity3" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary3" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect3" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect3" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn3})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn4" value="4" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName4" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange4" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice4" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity4" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary4" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect4" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect4" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn4})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn5" value="5" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName5" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange5" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice5" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity5" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary5" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect5" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect5" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn5})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn6" value="6" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName6" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange6" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice6" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity6" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary6" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect6" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect6" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn6})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn7" value="7" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName7" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange7" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice7" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity7" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary7" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect7" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect7" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn7})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn8" value="8" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName8" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange8" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice8" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity8" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary8" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect8" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect8" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn8})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn9" value="9" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName9" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange9" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice9" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity9" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary9" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect9" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect9" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn9})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn10" value="10" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName10" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange10" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice10" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity10" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary10" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect10" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect10" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn10})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn11" value="11" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName11" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange11" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice11" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity11" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary11" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect11" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect11" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn11})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn12" value="12" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName12" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange12" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice12" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity12" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary12" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect12" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect12" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn12})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn13" value="13" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName13" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange13" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice13" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity13" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary13" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect13" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect13" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn13})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn14" value="14" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName14" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange14" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice14" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity14" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary14" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect14" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect14" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn14})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn15" value="15" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName15" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange15" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice15" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity15" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary15" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect15" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect15" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) critship(heal|@{critShipOn15})">Repair</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-small-3 sheet-column">
-                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Planetary Vehicle Info -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Crew Roles</h3>
+                    <input name="attr_planetary-Crew-Roles" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-roles-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-roles-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th style="width:180px;">Character Name</th>
+                                <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
+                                <th><span style="float:left">Dice</span></th>
+                                <th colspan="2"><span style="float:left">Skill</span></th>
+                            </tr>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_spaceCrewRoles">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td style="width:180px;"><input name='attr_planetaryRoleCharacterName' type="text" /></td>
+                                    <td style="width:180px;"><input name='attr_planetaryRoleName' type="text" /></td>
+                                    <td><input name='attr_planetaryRoleDice' type="text" /></td>
+                                    <td>
+                                        <select name='attr_planetaryRoleSkill'>
+                                            <option value="" disabled>General Skills</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankAstrogation) label(skill:Astrogation|Vehicle:@{transport-planetary-name}|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Astrogation</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankAthletics) label(skill:Athletics|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Athletics</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankCharm) label(skill:Charm|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Charm</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankCoercion) label(skill:Coercion|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Coercion</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankComputers) label(skill:Computers|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Computers</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankCool) label(skill:Cool|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Cool</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankCoordination) label(skill:Coordination|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Coordination</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankDeception) label(skill:Deception|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Deception</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:willpower,rankDiscipline) label(skill:Discipline|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Discipline</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankLeadership) label(skill:Leadership|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Leadership</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankMechanics) label(skill:Mechanics|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Mechanics</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankMedicine) label(skill:Medicine|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Medicine</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:presence,rankNegotiation) label(skill:Negotiation|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Negotiation</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankPerception) label(skill:Perception|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Perception</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankPlanetary) label(skill:Piloting-Planetary|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Piloting (Planetary)</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankSpace) label(skill:Piloting-Space|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Piloting (Space)</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankResilience) label(skill:Resilience|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Resilience</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankSkulduggery) label(skill:Skulduggery|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Skulduggery</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankStealth) label(skill:Stealth|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Stealth</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankStreetwise) label(skill:Streetwise|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Streetwise</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:cunning,rankSurvival) label(skill:Survival|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Survival</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:willpower,rankVigilance) label(skill:Vigilance|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Vigilance</option>
+                                            <option value="" disabled>Combat Skills</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankBrawl) label(skill:Brawl|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Brawl</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankGunnery) label(skill:Gunnery|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Gunnery</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:brawn,rankMelee) label(skill:Melee|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Melee</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:charLightsaber,rankLightsaber) label(skill:Lightsaber|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Lightsaber</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankLight) label(skill:Ranged-Light|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Ranged (Light)</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|encum|skill:agility,rankHeavy) label(skill:Ranged-Heavy|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Ranged (Heavy)</option>
+                                            <option value="" disabled>Knowledge Skills</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankCore) label(skill:Core Worlds|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Core Worlds</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankEducation) label(skill:Education|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Education</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankLore) label(skill:Lore|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Lore</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankOuter) label(skill:Outer Rim|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Outer Rim</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankUnderworld) label(skill:Underworld|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Underworld</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankXenology) label(skill:Xenology|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Xenology</option>
+                                            <option value="!eed rollPlayer(character:@{planetaryRoleCharacterName}|skill:intellect,rankWarfare) label(skill:Warfare|Vehicle:@{transport-planetary-name}|Role:@{planetaryRoleName}) @{planetaryRoleDice} @{dicePool} (gmdice)">Warfare</option>
+                                        </select>
+                                    </td>
+                                    <td><button type='roll' name='roll_space-shipRole' value=@{planetaryRoleSkill}></button></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Planetary Vehicle Crew Roles -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Weapons</h3>
+                    <input name="attr_planetary-Weapons" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-weapon-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-weapon-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Character Name</th>
+                                <th>Weapon Name</th>
+                                <th>Arc</th>
+                                <th>Crit</th>
+                                <th>Dmg</th>
+                                <th colspan="2">Range/Skill</th>
+                            </tr>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_planetaryWeapons">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><input name='attr_planetaryWeaponCharacterName' type="text" /></td>
+                                    <td><input name='attr_planetaryWeaponName' type="text" /></td>
+                                    <td class="sheet-firearc-field">
+                                        <input name='attr_planetary-fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
+                                        <input name='attr_planetary-fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
+                                        <input name='attr_planetary-fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
+                                        <input name='attr_planetary-fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
+                                        <span class="sheet-fireArcForeImg"></span>
+                                        <span class="sheet-fireArcStarboardImg"></span>
+                                        <span class="sheet-fireArcAftImg"></span>
+                                        <span class="sheet-fireArcPortImg"></span>
+                                    </td>
+                                    <td style="width:50px"><input name='attr_planetaryWeaponCrit' type="number" max="99" min="-99" value="0" /></td>
+                                    <td style="width:50px"><input name='attr_planetaryWeaponDmg' type="number" max="99" min="-99" value="0" /></td>
+                                    <td style="width:150px">
+                                        <select name='attr_planetaryWeaponRange'>
+                                            <option value="Close">Close</option>
+                                            <option value="Short">Short</option>
+                                            <option value="Medium">Medium</option>
+                                            <option value="Long">Long</option>
+                                            <option value="Extreme">Extreme</option>
+                                        </select>
+                                    </td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_planetaryWeaponDice' type="text" />
+                                    </td>
+                                    <td colspan="4">
+                                        <label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_planetaryWeaponSpecial' type="text" />
+                                    </td>
+                                    <td>
+                                        <select name='attr_planetaryWeaponSkill'>
+                                            <option value="skill:agility,rankGunnery">Gunnery</option>
+                                            <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
+                                        </select>
+                                    </td>
+                                    <td><button type='roll' name='roll_planetary-shipWeapon' value='!eed rollPlayer(character:@{planetaryWeaponCharacterName}|encum|@{planetaryWeaponSkill}) label(Weapon:@{planetaryWeaponName}|Vehicle:@{transport-planetary-name}|Damage:@{planetaryWeaponDmg}|Critical:@{planetaryWeaponCrit}|Range:@{planetaryweaponrange}|Qualities:@{planetaryWeaponSpecial}) @{planetaryWeaponDice} @{dicePool} (gmdice)'></button></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input name='attr_planetary-weapon_bookpage' type="text" /></td>
+                                    <td><label>Rarity</label></td>
+                                    <td><input name='attr_planetary-weapon_rarity' type="number" min="1" max="10" /></td>
+                                    <td><label>Restricted:</label></td>
+                                    <td>
+                                        <select name='attr_planetary-weapon_restrict'>
+                                            <option value="no">No</option>
+                                            <option value="yes">Yes</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Value:</label></td>
+                                    <td><input name='attr_planetary-weapon_value' type="text" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <br />
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Planetary Vehicle Weapons -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Attachments</h3>
+                    <input name="attr_planetary-Attachments" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-attachments-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-attachments-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <th style="width:25%">Name</th>
+                                <th style="width:25%">Hard points</th>
+                                <th style="width:25%">Base Modifiers</th>
+                                <th style="width:25%">Modifications</th>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <fieldset class="repeating_planetary-attachments">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td style="width:25%"><input name='attr_planetary-AttachName' type="text" /></td>
+                                    <td style="width:25%"><input name='attr_planetary-AttachHP' type="text" /></td>
+                                    <td style="width:25%"><input name='attr_planetary-AttachBaseMod' type="text" /></td>
+                                    <td style="width:25%"><input name='attr_planetary-AttachMod' type="text" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input name='attr_planetary-attach_bookpage' type="text" /></td>
+                                    <td><label>Rarity</label></td>
+                                    <td><input name='attr_planetary-attach_rarity' type="number" min="1" max="10" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Restricted:</label></td>
+                                    <td>
+                                        <select name='attr_planetary-attach_restrict'>
+                                            <option value="no">No</option>
+                                            <option value="yes">Yes</option>
+                                        </select>
+                                    </td>
+                                    <td><label>Value:</label></td>
+                                    <td><input name='attr_planetary-attach_value' type="text" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <br />
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Planetary Vehicle Attachments Section -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Cargo Hold</h3>
+                    <input name="attr_planetary-Cargo-Hold" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-cargo-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-cargo-section">
+                        <table>
+                            <tr>
+                                <td><label><b>Encumbrance Capacity</b></label></td>
+                                <td><input name="attr_planetary-encumbrance_max" type="text" value="0" /></td>
+                                <td><label><b>Current Encumbrance</b></label></td>
+                                <td><input name="attr_planetary-encumbrance_current" type="text" value="0" /></td>
+                            </tr>
+                        </table><!--Encumbrance Stats-->
+                        <fieldset class="repeating_space-cargo">
+                            <br />
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><label>Cargo Type</label></td>
+                                    <td>
+                                        <select name='attr_planetary-cargo-type'>
+                                            <option value="lowtech">Low Tech</option>
+                                            <option value="midtech">Mid Tech</option>
+                                            <option value="hightech">High Tech</option>
+                                            <option value="weapons">Weapons</option>
+                                            <option value="illicitmaterials">Illicit Materials</option>
+                                            <option value="metals">Metals</option>
+                                            <option value="minerals">Minerals</option>
+                                            <option value="foodstuffs">Foodstuffs</option>
+                                            <option value="medicine">Medicine</option>
+                                            <option value="custom">Custom</option>
+                                        </select>
+                                    </td>
+                                    <td><label>Legal?</label></td>
+                                    <td>
+                                        <select name='attr_planetary-cargo-legal'>
+                                            <option value="yes">Yes</option>
+                                            <option value="no">No</option>
+                                            <option value="maybe">Maybe?</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Quantity</label></td>
+                                    <td><input name="attr_planetary-cargo_quantity" type="number" min="0" value="0" />
+                                    <td><label>Encumbrance</label></td>
+                                    <td><input name="attr_planetary-cargo_encumbrance" type="text" min="0" value="0" />
+                                </tr>
+                                <tr>
+                                    <td><label>Pickup</label></td>
+                                    <td><input name="attr_planetary-cargo_pickup" type="text" />
+                                    <td><label>Dropoff</label></td>
+                                    <td><input name="attr_planetary-cargo_dropoff" type="text" />
+                                </tr>
+                                <tr>
+                                    <td><label>Value</label></td>
+                                    <td><input name="attr_planetary-cargo_value" type="text" value="0" />
+                                    <td><label>Misc Info</label></td>
+                                    <td><textarea name="attr_planetary-cargo_misc" rows="2"></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </fieldset><!--Cargo Specifics-->
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Planetary Vehicle Cargo Hold Section -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Passengers</h3>
+                    <input name="attr_planetary-Passengers" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-passengers-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-passengers-section">
+                        <table>
+                            <tr>
+                                <td><label><b>Capacity</b></label></td>
+                                <td><input name="attr_planetary-passengers_max" type="text" value="0" /></td>
+                                <td><label><b>Current</b></label></td>
+                                <td><input name="attr_planetary-passengers_current" type="text" value="0" /></td>
+                            </tr>
+                        </table><!--Passengers Stat-->
+                        <fieldset class="repeating_space-passengers">
+                            <br />
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><label>Passenger Name</label></td>
+                                    <td><input name="attr_planetary-passenger_name" type="text" /></td>
+                                    <td><label>Wanted?</label></td>
+                                    <td>
+                                        <select name='attr_planetary-passenger-legal'>
+                                            <option value="yes">Yes</option>
+                                            <option value="no">No</option>
+                                            <option value="maybe">Maybe?</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Role</label></td>
+                                    <td><input name="attr_planetary-passenger_role" type="text" /></td>
+                                    <td><label>Value <span style="font-size:10px">(if known)</span></label></td>
+                                    <td><input name="attr_planetary-passenger_value" type="text" value="0" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Destination</label></td>
+                                    <td><input name="attr_planetary-passenger_destination" type="text" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </fieldset><!--Passenger Specifics-->
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Planetary Vehicle Passenger Section -->
+        </div><!-- Planetary Vehicle General Information -->
+        <div class="sheet-tab-content sheet-tab-transport-planetary-critical">
+            <div class="sheet-row sheet-show-critical-table">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Planetary Vehicle Critical</h3>
+                </div>
+                <div class="sheet-small-9 sheet-column">
+                    <input type="hidden" name="attr_vehicle-critTotal" value="0" />
+                    <fieldset class="repeating_critvehicle">
+                        <input type="hidden" name="attr_vehicle-critId" />
+                        <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td width="70%"><input type="text" name="attr_vehicle-critName" readonly="readonly" /></td>
+                                <td width="30%"><input type="text" name="attr_vehicle-critRange" readonly="readonly" /></td>
+                                <td class="sheet-crit-dice-bg">
+                                    <input class="sheet-pd" value="4" type="hidden" name="attr_vehicle-critSeverity" /><span></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2" rowspan="2"><textarea rows="3" name="attr_vehicle-critSummary" readonly="readonly"></textarea></td>
+                                <td>
+                                    <label>Effect:</label>
+                                    <div class="sheet-switch">
+                                        <input type="radio" class="sheet-switch-input-on" name="attr_vehicle-critEffect" value="on" title="On" checked="checked">
+                                        <input type="radio" class="sheet-switch-input-off" name="attr_vehicle-critEffect" value="off" title="Off">
+                                        <span class="switch-selection"></span>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|vehicle|@{vehicle-critId})">Repair</button></td></tr>
+                            </tbody>
+                        </table>
+                    </fieldset>    
+                </div>
+                <div class="sheet-small-3 sheet-column">
+                    <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
+                        <tbody>
                         <tr>
                             <td><label>Critical roll offset:</label></td>
-                            <td><input type="text" name="attr_critShipAddOffset" value="" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) critship(roll)">Roll Critical</button></td>
+                            <td><input type="text" name="attr_vehicle-critAddOffset" value="" /></td>
                         </tr>
+                        <tr><td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) critship(roll|vehicle)">Roll Critical</button></td></tr>
                         <tr>
                             <td>
                                 <label>Critical number:</label>
-                                <input type="text" name="attr_critShipAddRangeNum" value="" />
+                                <input type="text" name="attr_vehicle-critShipAddRangeNum" value="" />
                             </td>
-                            <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) critship(add|@{critShipAddRangeNum})">Add Critical</button></td>
+                            <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) critship(add|vehicle|@{vehicle-critShipAddRangeNum})">Add Critical</button></td>
                         </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Planetary Vehicle Critical Section -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Cargo Hold</h3>
-                <table>
-                    <tr>
-                        <td><label><bold>Encumbrance Capacity</bold></label></td>
-                        <td><input name="attr_planetary-encumbrance_max" type="text" value="0" /></td>
-                        <td><label><bold>Current Encumbrance</bold></label></td>
-                        <td><input name="attr_planetary-encumbrance_current" type="text" value="0" /></td>
-                    </tr>
-                </table><!--Encumbrance Stats-->
-                <fieldset class="repeating_space-cargo">
-                    <br />
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><label>Cargo Type</label></td>
-                                <td>
-                                    <select name='attr_planetary-cargo-type'>
-                                        <option value="lowtech">Low Tech</option>
-                                        <option value="midtech">Mid Tech</option>
-                                        <option value="hightech">High Tech</option>
-                                        <option value="weapons">Weapons</option>
-                                        <option value="illicitmaterials">Illicit Materials</option>
-                                        <option value="metals">Metals</option>
-                                        <option value="minerals">Minerals</option>
-                                        <option value="foodstuffs">Foodstuffs</option>
-                                        <option value="medicine">Medicine</option>
-                                        <option value="custom">Custom</option>
-                                    </select>
-                                </td>
-                                <td><label>Legal?</label></td>
-                                <td>
-                                    <select name='attr_planetary-cargo-legal'>
-                                        <option value="yes">Yes</option>
-                                        <option value="no">No</option>
-                                        <option value="maybe">Maybe?</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Quantity</label></td>
-                                <td><input name="attr_planetary-cargo_quantity" type="number" min="0" value="0" />
-                                <td><label>Encumbrance</label></td>
-                                <td><input name="attr_planetary-cargo_encumbrance" type="text" min="0" value="0" />
-                            </tr>
-                            <tr>
-                                <td><label>Pickup</label></td>
-                                <td><input name="attr_planetary-cargo_pickup" type="text" />
-                                <td><label>Dropoff</label></td>
-                                <td><input name="attr_planetary-cargo_dropoff" type="text" />
-                            </tr>
-                            <tr>
-                                <td><label>Value</label></td>
-                                <td><input name="attr_planetary-cargo_value" type="text" value="0" />
-                                <td><label>Misc Info</label></td>
-                                <td><textarea name="attr_planetary-cargo_misc" rows="2"></textarea></td>
-                            </tr>
                         </tbody>
                     </table>
-                </fieldset><!--Cargo Specifics-->
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Planetary Vehicle Cargo Hold Section -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Passengers</h3>
-                <table>
-                    <tr>
-                        <td><label><bold>Capacity</bold></label></td>
-                        <td><input name="attr_planetary-passengers_max" type="text" value="0" /></td>
-                        <td><label><bold>Current</bold></label></td>
-                        <td><input name="attr_planetary-passengers_current" type="text" value="0" /></td>
-                    </tr>
-                </table><!--Passengers Stat-->
-                <fieldset class="repeating_space-passengers">
-                    <br />
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><label>Passenger Name</label></td>
-                                <td><input name="attr_planetary-passenger_name" type="text" /></td>
-                                <td><label>Wanted?</label></td>
-                                <td>
-                                    <select name='attr_planetary-passenger-legal'>
-                                        <option value="yes">Yes</option>
-                                        <option value="no">No</option>
-                                        <option value="maybe">Maybe?</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Role</label></td>
-                                <td><input name="attr_planetary-passenger_role" type="text" /></td>
-                                <td><label>Value <span style="font-size:10px">(if known)</span></label></td>
-                                <td><input name="attr_planetary-passenger_value" type="text" value="0" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Destination</label></td>
-                                <td><input name="attr_planetary-passenger_destination" type="text" /></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </fieldset><!--Passenger Specifics-->
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Planetary Vehicle Passenger Section -->
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Vehicle Critical Table -->
+        </div><!-- Planetary Vehicle Critical Hits -->
     </div><!--Planetary-->
     <div class="sheet-tab-content sheet-tab-transport-beast">
-        <div class="sheet-row sheet-section-1">
+        <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <table class="sheet-swsd sheet-beast" cellspacing="0" cellpadding="0" border="0">
                     <tbody>
-                        <tr>
-                            <td>
-                                <label class="sheet-label-title">Wounds</label>
-                                <input name="attr_transport-beast-wounds_max" type="number" min="1" value="1" />
-                                <input name="attr_transport-beast-wounds" type="number" min="0" value="0" /><br />
-                                <label class="sheet-label-threshold">Threshold</label>
-                                <label class="sheet-label-current">Current</label>
-                            </td>
-                            <td>
-                                <label class="sheet-label-title">Strain</label>
-                                <input name="attr_transport-beast-strain_max" type="number" min="1" value="1" />
-                                <input name="attr_transport-beast-strain" type="number" min="0" value="0" /><br />
-                                <label class="sheet-label-threshold">Threshold</label>
-                                <label class="sheet-label-current">Current</label>
-                            </td>
-                            <td rowspan="2">
-                                <label class="sheet-label-title">Defense</label>
-                                <input name="attr_transport-beast-rangeddefense" type="number" max="99" min="0" value="0" />
-                                <input name="attr_transport-beast-meleedefense" type="number" max="99" min="0" value="0" /><br />
-                                <label class="sheet-label-range">Range</label>
-                                <label class="sheet-label-melee">Melee</label>
-                            </td>
-                            <td rowspan="2">
-                                <label class="sheet-label-title">Encum</label>
-                                <input name="attr_transport-beast-encumbrance_max" type="number" min="1" value="1" />
-                                <input name="attr_transport-beast-encumbrancemax" type="hidden" value="@{transport-beast-encumbrance|max}" disabled />
-                                <input name="attr_transport-beast-encumbrance" type="number" max="99" min="0" value="0" /><br />
-                                <label class="sheet-label-threshold">Threshold</label>
-                                <label class="sheet-label-current">Current</label>
-                            </td>
-                            <td rowspan="2">
-                                <label class="sheet-label-title">Silhouette</label>
-                                <input name="attr_transport-beast-silhouette" type="number" max="10" min="0" value="1" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                <label class="sheet-label-title">Soak</label>
-                                <input name="attr_transport-beast-soak" type="number" max="99" min="1" value="1" />
-                            </td>
-                        </tr>
+                    <tr>
+                        <td>
+                            <label class="sheet-label-title">Wounds</label>
+                            <input name="attr_transport-beast-wounds_max" type="number" min="1" value="1" />
+                            <input name="attr_transport-beast-wounds" type="number" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td>
+                            <label class="sheet-label-title">Strain</label>
+                            <input name="attr_transport-beast-strain_max" type="number" min="0" value="0" />
+                            <input name="attr_transport-beast-strain" type="number" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Defense</label>
+                            <input name="attr_transport-beast-rangeddefense" type="number" max="99" min="0" value="0" />
+                            <input name="attr_transport-beast-meleedefense" type="number" max="99" min="0" value="0" /><br />
+                            <label class="sheet-label-range">Range</label>
+                            <label class="sheet-label-melee">Melee</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Encum</label>
+                            <input name="attr_transport-beast-encumbrance_max" type="number" min="1" value="1" />
+                            <input name="attr_transport-beast-encumbrancemax" type="hidden" value="@{transport-beast-encumbrance|max}" disabled />
+                            <input name="attr_transport-beast-encumbrance" type="number" max="99" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Silhouette</label>
+                            <input name="attr_transport-beast-silhouette" type="number" max="10" min="0" value="1" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">
+                            <label class="sheet-label-title">Soak</label>
+                            <input name="attr_transport-beast-soak" type="number" max="99" min="1" value="1" />
+                        </td>
+                    </tr>
                     </tbody>
                 </table>
-            </div><!-- Beast Top Stats -->
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Riding Beast Details</h3>
-                <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Name:</label></td>
-                            <td><input type="text" name="attr_beast-name" /></td>
-                            <td><label>Species:</label></td>
-                            <td><input type="text" name="attr_beast-species" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Book &amp; Page:</label></td>
-                            <td><input name='attr_beast_bookpage' type="text" /></td>
-                            <td>Rarity:</td>
-                            <td><input name='attr_beast_rarity' type="number" min="1" max="10" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Restricted:</label></td>
-                            <td>
-                                <select name='attr_beast_restrict'>
-                                    <option value="no">No</option>
-                                    <option value="yes">Yes</option>
-                                </select>
-                            </td>
-                            <td>Value</td>
-                            <td><input name='attr_beast_value' type="text" /></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div><!-- Top Info -->
-            <div class="sheet-row">
-                <div class="sheet-small-6 sheet-column">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr>
-                                <th colspan="2">Description</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td><label>Gender:</label></td>
-                                <td><input type="text" name="attr_beast-chargender" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Age:</label></td>
-                                <td><input type="text" name="attr_beast-charage" /></td>
-                            </tr>
-                            <tr>
-                                <td><label>Height:</label></td>
-                                <td><input type="text" name="attr_beast-charheight" /></td>
-                            </tr>
-                        </tbody>
-                    </table>
+            </div>
+        </div><!-- Beast Top Stats -->
+
+        <input type="radio" name="attr_beast-criticals" style="width: 145px ; margin: -2px -30px 0 4px" class="sheet-tab-new sheet-tab-transport-beast-general" value="1" checked="checked" />
+        <span class="sheet-tab-new">&emsp;General Information&emsp;</span>
+        <input type="radio" name="attr_beast-criticals" class="sheet-tab-new sheet-tab-transport-beast-critical" value="2" />
+        <span class="sheet-tab-new">&emsp;Critical Hits&emsp;</span>
+
+        <div class="sheet-tab-content sheet-tab-transport-beast-general">
+            <b>Initiative</b><input name="attr_beast-Initiative" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-initiative-toggle-small" type="checkbox"/><span></span>
+            <div class="sheet-initiative-toggle-small">
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Initiative</h3>
+                        <input name="attr_beast-Initiative" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-initiative-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-initiative-section">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <table>
+                                            <tr>
+                                                <td><label>What kind of Initiative Slot?</label></td>
+                                                <td><label>PC<input type="radio" name="attr_beast-npc-pc" value="pcinit" checked="checked" /></label></td>
+                                                <td><label>NPC<input type="radio" name="attr_beast-npc-pc" value="npcinit" /></label></td>
+                                                <td><label></label></td>
+                                                <td><label></label></td>
+                                                <td><label></label></td>
+                                                <td><label></label></td>
+                                                <td><label></label></td>
+                                                <td><label></label></td>
+                                            </tr>
+                                        </table>
+                                        <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
+                                            <tr>
+                                                <td><label>Cool (if prepared):</label></td>
+                                                <td>
+                                                    <input class="sheet-yd" type="hidden" name="attr_beast-yCoolInit" value="(@{beast-yCool})" disabled><span></span>
+                                                    <input class="sheet-gd" type="hidden" name="attr_beast-gCoolInit" value="(@{beast-gCool})" disabled><span></span>
+                                                </td>
+                                                <td><label>Modifiers</label><input name='attr_beast-initiativeCoolDice' type="text" /></td>
+                                                <td><button type='roll' name='roll_beast-CoolInit' value='!eed @{beast-npc-pc} characterID(@{character_id}) label(skill:Riding Beast-Initiative Cool) skill(@{beast-rankCool}|@{beast-presence}) @{beast-initiativeCoolDice} @{dicePool}'></button></td>
+                                            </tr>
+                                            <tr>
+                                                <td><label>Vigilance (if unexpected):</label></td>
+                                                <td>
+                                                    <input class="sheet-yd" type="hidden" name="attr_beast-yVigilanceInit" value="(@{beast-yVigilance})" disabled><span></span>
+                                                    <input class="sheet-gd" type="hidden" name="attr_beast-gVigilanceInit" value="(@{beast-gVigilance})" disabled><span></span>
+                                                </td>
+                                                <td><label>Modifiers</label><input name='attr_beast-initiativeVigDice' type="text" /></td>
+                                                <td><button type='roll' name='roll_beast-VigilanceInit' value='!eed @{beast-npc-pc} characterID(@{character_id}) label(skill: Riding Beast-Initiative Vigilance) skill(@{beast-rankVigilance}|@{beast-willpower}) @{beast-initiativeVigDice} @{dicePool}'></button></td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
-                <div class="sheet-small-6 sheet-column">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr>
-                                <th>Notable Features</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td><textarea rows="4" name="attr_beast-charfeatures"></textarea></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr>
-                                <th>Other Information</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td><textarea rows="4" name="attr_beast-charother"></textarea></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div><!-- Description -->
+            </div><!-- Initiative -->
+            <div class="sheet-clear"></div>
+            <div class="sheet-section-spacer sheet-initiative-toggle-small"></div>
+
             <div class="sheet-row">
                 <div class="sheet-small-12 sheet-column">
-                    <div class="sheet-small-12 sheet-column">
-                        <br />
-                        <br />
+                    <h3 class="sheet-section-header">Riding Beast Details</h3>
+                    <input name="attr_beast-Riding-Beast-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-details-section">
+                        <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td><label>Name:</label></td>
+                                <td><input type="text" name="attr_beast-name" /></td>
+                                <td><label>Species:</label></td>
+                                <td><input type="text" name="attr_beast-species" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Book &amp; Page:</label></td>
+                                <td><input name='attr_beast_bookpage' type="text" /></td>
+                                <td><label>Rarity</label></td>
+                                <td><input name='attr_beast_rarity' type="number" min="1" max="10" /></td>
+                            </tr>
+                            <tr>
+                                <td><label>Restricted:</label></td>
+                                <td>
+                                    <select name='attr_beast_restrict'>
+                                        <option value="no">No</option>
+                                        <option value="yes">Yes</option>
+                                    </select>
+                                </td>
+                                <td><label>Value:</label></td>
+                                <td><input name='attr_beast_value' type="text" /></td>
+                            </tr>
+                            </tbody>
+                        </table><!-- Top Info -->
                         <div class="sheet-clear"></div>
-                        <div class="sheet-attachments-wrapper">
-                            <input type="checkbox" name="attr_beast_init" class="sheet-view-attachments" />
-                            <label class="sheet-view-attachments">Show Initiative</label>
-                            <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                                <tbody>
+                        <div class="sheet-row">
+                            <div class="sheet-small-6 sheet-column">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
                                     <tr>
-                                        <td>
-                                            <table>
-                                                <tr>
-                                                    <td><label>What kind of Initiative Slot?</label></td>
-                                                    <td><label>PC<input type="radio" name="attr_beast-npc-pc" value="pcinit" checked="checked" /></label></td>
-                                                    <td><label>NPC<input type="radio" name="attr_beast-npc-pc" value="npcinit" /></label></td>
-                                                    <td><label></label></td>
-                                                    <td><label></label></td>
-                                                    <td><label></label></td>
-                                                    <td><label></label></td>
-                                                    <td><label></label></td>
-                                                    <td><label></label></td>
-                                                </tr>
-                                            </table>
-                                            <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
-                                                <tr>
-                                                    <td><label>Cool (if prepared):</label></td>
-                                                    <td>
-                                                        <input class="sheet-yd" type="hidden" name="attr_beast-yCoolInit" value="(((@{beast-presence} + @{beast-rankCool}) - abs(@{beast-presence} - @{beast-rankCool})) / 2)" disabled><span></span>
-                                                        <input class="sheet-gd" type="hidden" name="attr_beast-gCoolInit" value="((((@{beast-presence} + @{beast-rankCool}) + abs(@{beast-presence} - @{beast-rankCool})) / 2) - @{beast-yCoolInit})" disabled><span></span>
-                                                    </td>
-                                                    <td><label>Modifiers</label><input name='attr_beast-initiativeCoolDice' type="text" /></td>
-                                                    <td>
-                                                        <button type='roll' name='roll_beast-VigilanceInit' value='!eed @{beast-npc-pc} characterID(@{character_id}) label(skill:Riding Beast-Initiative Cool) skill(@{beast-rankCool}|@{beast-presence}) @{beast-initiativeCoolDice} @{dicePool}'></button>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td><label>Vigilance (if unexpected):</label></td>
-                                                    <td>
-                                                        <input class="sheet-yd" type="hidden" name="attr_beast-yVigilanceInit" value="(((@{beast-willpower} + @{beast-rankVigilance}) - abs(@{beast-willpower} - @{beast-rankVigilance})) / 2)" disabled><span></span>
-                                                        <input class="sheet-gd" type="hidden" name="attr_beast-gVigilanceInit" value="((((@{beast-willpower} + @{beast-rankVigilance}) + abs(@{beast-willpower} - @{beast-rankVigilance})) / 2) - @{beast-yVigilanceInit})" disabled><span></span>
-                                                    </td>
-                                                    <td><label>Modifiers</label><input name='attr_beast-initiativeVigDice' type="text" /></td>
-                                                    <td>
-                                                        <button type='roll' name='roll_beast-VigilanceInit' value='!eed @{beast-npc-pc} characterID(@{character_id}) label(skill:Riding Beast-Initiative Vigilance) skill(@{beast-rankVigilance}|@{beast-willpower}) @{beast-initiativeVigDice} @{dicePool}'></button>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
+                                        <th colspan="2">Description</th>
                                     </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div><!-- Initiative -->
-                    <div class="sheet-row" style="margin-top:10px">
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Gender:</label></td>
+                                        <td><input type="text" name="attr_beast-chargender" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Age:</label></td>
+                                        <td><input type="text" name="attr_beast-charage" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Height:</label></td>
+                                        <td><input type="text" name="attr_beast-charheight" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="sheet-small-6 sheet-column">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th>Notable Features</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td><textarea rows="4" name="attr_beast-charfeatures"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th>Other Information</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td><textarea rows="4" name="attr_beast-charother"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div><!-- Description -->
+                        <div class="sheet-clear"></div>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Details -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Characteristics</h3>
+                    <input name="attr_beast-Characteristics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-characteristic-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-characteristic-section">
                         <div class="sheet-small-12 sheet-column">
-                            <!-- -------------------------------------------------- Characteristics -->
                             <table class="sheet-characteristics" cellspacing="0" cellpadding="0" border="0">
                                 <tbody>
-                                    <tr>
-                                        <td>
-                                            <label>Brawn</label>
-                                            <input name='attr_beast-brawn' type="number" max="7" min="1" value="1" />
-                                        </td>
-                                        <td></td>
-                                        <td>
-                                            <label>Agility</label>
-                                            <input name='attr_beast-agility' type="number" max="7" min="1" value="1" />
-                                        </td>
-                                        <td></td>
-                                        <td>
-                                            <label>Intellect</label>
-                                            <input name='attr_beast-intellect' type="number" max="7" min="1" value="1" />
-                                        </td>
-                                        <td></td>
-                                        <td>
-                                            <label>Cunning</label>
-                                            <input name='attr_beast-cunning' type="number" max="7" min="1" value="1" />
-                                        </td>
-                                        <td></td>
-                                        <td>
-                                            <label>Willpower</label>
-                                            <input name='attr_beast-willpower' type="number" max="7" min="1" value="1" />
-                                        </td>
-                                        <td></td>
-                                        <td>
-                                            <label>Presence</label>
-                                            <input name='attr_beast-presence' type="number" max="7" min="1" value="1" />
-                                        </td>
-                                    </tr>
+                                <tr>
+                                    <td>
+                                        <label>Brawn</label>
+                                        <input name='attr_beast-brawn' type="number" max="7" min="1" value="1" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>Agility</label>
+                                        <input name='attr_beast-agility' type="number" max="7" min="1" value="1" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>Intellect</label>
+                                        <input name='attr_beast-intellect' type="number" max="7" min="1" value="1" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>Cunning</label>
+                                        <input name='attr_beast-cunning' type="number" max="7" min="1" value="1" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>Willpower</label>
+                                        <input name='attr_beast-willpower' type="number" max="7" min="1" value="1" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>Presence</label>
+                                        <input name='attr_beast-presence' type="number" max="7" min="1" value="1" />
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
-                        <div class="sheet-clear"></div>
-                    </div><!-- Characteristics -->
-                    <div>
-                        <h3 class="sheet-section-header">Skills</h3>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Characteristics -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Skills</h3>
+                    <input name="attr_beast-Skills" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-skills-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-skills-section">
                         <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
                             <thead>
-                                <tr>
-                                    <th>Skill Name</th>
-                                    <th>Career</th>
-                                    <th colspan="2">Rank</th>
-                                    <th colspan="2">
-                                        <span style="float:left">Modifiers</span>
-                                    </th>
-                                </tr>
+                            <tr>
+                                <th>Skill Name</th>
+                                <th>Career</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">
+                                    <span style="float:left">Modifiers</span>
+                                </th>
+                            </tr>
                             </thead>
                             <tbody>
-                                <tr>
-                                    <td>
-                                        <label>Cool (Pr)</label>
-                                    </td>
-                                    <td><input name='attr_beast-careerskillCool' type="checkbox" value="1"></td>
-                                    <td><input type="number" name="attr_beast-rankCool" max="6" min="0" value="0" /></td>
-                                    <td>
-                                        <input class="sheet-yd" type="hidden" name="attr_beast-yCool" value="(((@{beast-presence} + @{beast-rankCool}) - abs(@{beast-presence} - @{beast-rankCool})) / 2)" disabled><span></span>
-                                        <input class="sheet-gd" type="hidden" name="attr_beast-gCool" value="((((@{beast-presence} + @{beast-rankCool}) + abs(@{beast-presence} - @{beast-rankCool})) / 2) - @{beast-yCool})" disabled><span></span>
-                                    </td>
-                                    <td>
-                                        <div class="sheet-dice-icon"></div>
-                                        <div class="sheet-dice-input">
-                                            <input type="text" name="attr_beast-diceCool" />
-                                        </div>
-                                    </td>
-                                    <td><button type='roll' name='roll_beast-Cool' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Cool) @{beast-diceCool} skill(@{beast-rankCool}|@{beast-presence}) @{dicePool} (gmdice)'></button></td>
-                                </tr><!--Cool-->
-                                <tr>
-                                    <td>
-                                        <label>Vigilance (Will)</label>
-                                    </td>
-                                    <td><input name='attr_beast-careerskillVigilance' type="checkbox" value="1"></td>
-                                    <td><input type="number" name="attr_beast-rankVigilance" max="6" min="0" value="0" /></td>
-                                    <td>
-                                        <input class="sheet-yd" type="hidden" name="attr_beast-yVigilance" value="(((@{beast-willpower} + @{beast-rankVigilance}) - abs(@{beast-willpower} - @{beast-rankVigilance})) / 2)" disabled><span></span>
-                                        <input class="sheet-gd" type="hidden" name="attr_beast-gVigilance" value="((((@{beast-willpower} + @{beast-rankVigilance}) + abs(@{beast-willpower} - @{beast-rankVigilance})) / 2) - @{beast-yVigilance})" disabled><span></span>
-                                    </td>
-                                    <td>
-                                        <div class="sheet-dice-icon"></div>
-                                        <div class="sheet-dice-input">
-                                            <input type="text" name="attr_beast-diceVigilance" />
-                                        </div>
-                                    </td>
-                                    <td><button type='roll' name='roll_beast-Vigilance' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Vigilance) @{beast-diceVigilance} skill(@{beast-rankVigilance}|@{beast-willpower}) @{dicePool} (gmdice)'></button></td>
-                                </tr><!--Vigilance-->
-                                <tr>
-                                    <td>
-                                        <label>Brawl (Br)</label>
-                                    </td>
-                                    <td><input name='attr_beast-careerskillBrawl' type="checkbox" value="1"></td>
-                                    <td><input type="number" name="attr_beast-rankBrawl" max="6" min="0" value="0" /></td>
-                                    <td>
-                                        <input class="sheet-yd" type="hidden" name="attr_beast-yBrawl" value="(((@{beast-brawn} + @{beast-rankBrawl}) - abs(@{beast-brawn} - @{beast-rankBrawl})) / 2)" disabled><span></span>
-                                        <input class="sheet-gd" type="hidden" name="attr_beast-gBrawl" value="((((@{beast-brawn} + @{beast-rankBrawl}) + abs(@{beast-brawn} - @{beast-rankBrawl})) / 2) - @{beast-yBrawl})" disabled><span></span>
-                                    </td>
-                                    <td>
-                                        <div class="sheet-dice-icon"></div>
-                                        <div class="sheet-dice-input">
-                                            <input type="text" name="attr_beast-diceBrawl" />
-                                        </div>
-                                    </td>
-                                    <td><button type='roll' name='roll_Brawl' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Brawl) @{beast-diceBrawl} encum(@{transport-beast-encumbrancemax}|@{transport-beast-encumbrance}) skill(@{beast-rankBrawl}|@{beast-brawn}) @{dicePool} (gmdice)'></button></td>
-                                </tr><!--Brawl-->
+                            <tr>
+                                <td>
+                                    <label>Athletics (Br)</label>
+                                </td>
+                                <td><input name='attr_beast-careerskillAthletics' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_beast-rankAthletics" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_beast-yAthletics" value="(((@{beast-brawn} + @{beast-rankAthletics}) - abs(@{beast-brawn} - @{beast-rankAthletics})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_beast-gAthletics" value="((((@{beast-brawn} + @{beast-rankAthletics}) + abs(@{beast-brawn} - @{beast-rankAthletics})) / 2) - @{beast-yAthletics})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_beast-diceAthletics" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Athletics' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Athletics) @{beast-diceAthletics} encum(@{encumbrancemax}|@{encumbrance}) skill(@{beast-rankAthletics}|@{beast-brawn}|Athletics) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Athletics-->
+                            <tr>
+                                <td>
+                                    <label>Brawl (Br)</label>
+                                </td>
+                                <td><input name='attr_beast-careerskillBrawl' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_beast-rankBrawl" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_beast-yBrawl" value="(((@{beast-brawn} + @{beast-rankBrawl}) - abs(@{beast-brawn} - @{beast-rankBrawl})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_beast-gBrawl" value="((((@{beast-brawn} + @{beast-rankBrawl}) + abs(@{beast-brawn} - @{beast-rankBrawl})) / 2) - @{beast-yBrawl})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_beast-diceBrawl" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Brawl' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Brawl) @{beast-diceBrawl} encum(@{transport-beast-encumbrancemax}|@{transport-beast-encumbrance}) skill(@{beast-rankBrawl}|@{beast-brawn}|Brawl) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Brawl-->
+                            <tr>
+                                <td>
+                                    <label>Cool (Pr)</label>
+                                </td>
+                                <td><input name='attr_beast-careerskillCool' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_beast-rankCool" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_beast-yCool" value="(((@{beast-presence} + @{beast-rankCool}) - abs(@{beast-presence} - @{beast-rankCool})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_beast-gCool" value="((((@{beast-presence} + @{beast-rankCool}) + abs(@{beast-presence} - @{beast-rankCool})) / 2) - @{beast-yCool})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_beast-diceCool" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_beast-Cool' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Cool) @{beast-diceCool} skill(@{beast-rankCool}|@{beast-presence}|Cool) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Cool-->
+                            <tr>
+                                <td>
+                                    <label>Survival (Cun)</label>
+                                </td>
+                                <td><input name='attr_beast-careerskillSurvival' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_beast-rankSurvival" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_beast-ySurvival" value="(((@{beast-cunning} + @{beast-rankSurvival}) - abs(@{beast-cunning} - @{beast-rankSurvival})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_beast-gSurvival" value="((((@{beast-cunning} + @{beast-rankSurvival}) + abs(@{beast-cunning} - @{beast-rankSurvival})) / 2) - @{beast-ySurvival})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_beast-diceSurvival" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Survival' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Survival) @{beast-diceSurvival} skill(@{beast-rankSurvival}|@{beast-cunning}|Survival) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Survival-->
+                            <tr>
+                                <td>
+                                    <label>Vigilance (Will)</label>
+                                </td>
+                                <td><input name='attr_beast-careerskillVigilance' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_beast-rankVigilance" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_beast-yVigilance" value="(((@{beast-willpower} + @{beast-rankVigilance}) - abs(@{beast-willpower} - @{beast-rankVigilance})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_beast-gVigilance" value="((((@{beast-willpower} + @{beast-rankVigilance}) + abs(@{beast-willpower} - @{beast-rankVigilance})) / 2) - @{beast-yVigilance})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_beast-diceVigilance" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_beast-Vigilance' value='!eed characterID(@{character_id}) label(skill:Riding Beast-Vigilance) @{beast-diceVigilance} skill(@{beast-rankVigilance}|@{beast-willpower}|Vigilance) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Vigilance-->
                             </tbody>
                         </table><!--Cool, Vigilance, Brawl-->
                         <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
                             <thead>
-                                <tr>
-                                    <th>Other Skills </th>
-                                    <th>Char</th>
-                                    <th>Career</th>
-                                    <th colspan="2">Rank</th>
-                                    <th colspan="2">Mods</th>
-                                </tr>
+                            <tr>
+                                <th>Other Skills </th>
+                                <th>Char</th>
+                                <th>Career</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">Mods</th>
+                            </tr>
                             </thead>
                             <tbody>
+                            <tr>
+                                <td><input type="text" name="attr_beast-customskillname" /></td>
+                                <td>
+                                    <select name="attr_beast-charcustomskillname">
+                                        <option value="@{beast-brawn}">Brawn</option><!-- encum not working -->
+                                        <option value="@{beast-agility}">Agility</option>
+                                        <option value="@{beast-intellect}">Intellect</option>
+                                        <option value="@{beast-cunning}">Cunning</option>
+                                        <option value="@{beast-willpower}">Willpower</option>
+                                        <option value="@{beast-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_beast-careerskillcustomskillname' type="checkbox" value=""></td>
+                                <td><input type="number" name="attr_beast-rankcustomskillname" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_beast-ycustomskillname" value="(((@{beast-charcustomskillname} + @{beast-rankcustomskillname}) - abs(@{beast-charcustomskillname} - @{beast-rankcustomskillname})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_beast-gcustomskillname" value="((((@{beast-charcustomskillname} + @{beast-rankcustomskillname}) + abs(@{beast-charcustomskillname} - @{beast-rankcustomskillname})) / 2) - @{beast-ycustomskillname})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_beast-dicecustomskillname" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_beast-customskillname' value='!eed characterID(@{character_id}) label(skill:Riding Beast-@{beast-customskillname}) @{beast-dicecustomskillname} skill(@{beast-rankcustomskillname}|@{beast-charcustomskillname}|customskillname) @{dicePool} (gmdice)'></button></td>
+                            </tr>
+                            </tbody>
+                        </table><!--Custom Skill-->
+                        <fieldset class="repeating_beast-skills">
+                            <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
                                 <tr>
-                                    <td><input type="text" name="attr_beast-customskillname" /></td>
+                                    <td><input type="text" name="attr_beast-customskillname1" /></td>
                                     <td>
-                                        <select name="attr_beast-charcustomskillname">
-                                            <option value="@{beast-brawn}">Brawn</option><!-- encum not working -->
+                                        <select name="attr_beast-charcustomskillname1">
+                                            <option value="@{beast-brawn}">Brawn</option>
                                             <option value="@{beast-agility}">Agility</option>
                                             <option value="@{beast-intellect}">Intellect</option>
                                             <option value="@{beast-cunning}">Cunning</option>
@@ -7290,78 +3940,49 @@
                                             <option value="@{beast-presence}">Presence</option>
                                         </select>
                                     </td>
-                                    <td><input name='attr_beast-careerskillcustomskillname' type="checkbox" value=""></td>
-                                    <td><input type="number" name="attr_beast-rankcustomskillname" max="6" min="0" value="0" /></td>
+                                    <td><input name='attr_beast-careerskillcustomskillname1' type="checkbox" value=""></td>
+                                    <td><input type="number" name="attr_beast-rankcustomskillname1" max="6" min="0" value="0" /></td>
                                     <td>
-                                        <input class="sheet-yd" type="hidden" name="attr_beast-ycustomskillname" value="(((@{beast-charcustomskillname} + @{beast-rankcustomskillname}) - abs(@{beast-charcustomskillname} - @{beast-rankcustomskillname})) / 2)" disabled><span></span>
-                                        <input class="sheet-gd" type="hidden" name="attr_beast-gcustomskillname" value="((((@{beast-charcustomskillname} + @{beast-rankcustomskillname}) + abs(@{beast-charcustomskillname} - @{beast-rankcustomskillname})) / 2) - @{beast-ycustomskillname})" disabled><span></span>
+                                        <input class="sheet-yd" type="hidden" name="attr_beast-ycustomskillname1" value="(((@{beast-charcustomskillname1} + @{beast-rankcustomskillname1}) - abs(@{beast-charcustomskillname1} - @{beast-rankcustomskillname1})) / 2)" disabled><span></span>
+                                        <input class="sheet-gd" type="hidden" name="attr_beast-gcustomskillname1" value="((((@{beast-charcustomskillname1} + @{beast-rankcustomskillname1}) + abs(@{beast-charcustomskillname1} - @{beast-rankcustomskillname1})) / 2) - @{beast-ycustomskillname1})" disabled><span></span>
                                     </td>
                                     <td>
                                         <div class="sheet-dice-icon"></div>
                                         <div class="sheet-dice-input">
-                                            <input type="text" name="attr_beast-dicecustomskillname" />
+                                            <input type="text" name="attr_beast-dicecustomskillname1" />
                                         </div>
                                     </td>
-                                    <td><button type='roll' name='roll_beast-customskillname' value='!eed characterID(@{character_id}) label(skill:Riding Beast-@{beast-customskillname}) @{beast-dicecustomskillname} skill(@{beast-rankcustomskillname}|@{beast-charcustomskillname}) @{dicePool} (gmdice)'></button></td>
+                                    <td><button type='roll' name='roll_beast-customskillname1' value='!eed characterID(@{character_id}) label(skill:Riding Beast-@{beast-customskillname1}) @{beast-dicecustomskillname1} skill(@{beast-rankcustomskillname1}|@{beast-charcustomskillname1}|@{beast-customskillname1}) @{dicePool} (gmdice)'></button></td>
                                 </tr>
-                            </tbody>
-                        </table><!--Custom Skill-->
-                        <fieldset class="repeating_beast-skills">
-                            <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
-                                <tbody>
-                                    <tr>
-                                        <td><input type="text" name="attr_beast-customskillname" /></td>
-                                        <td>
-                                            <select name="attr_beast-charcustomskillname">
-                                                <option value="@{beast-brawn}">Brawn</option><!-- encum not working -->
-                                                <option value="@{beast-agility}">Agility</option>
-                                                <option value="@{beast-intellect}">Intellect</option>
-                                                <option value="@{beast-cunning}">Cunning</option>
-                                                <option value="@{beast-willpower}">Willpower</option>
-                                                <option value="@{beast-presence}">Presence</option>
-                                            </select>
-                                        </td>
-                                        <td><input name='attr_beast-careerskillcustomskillname' type="checkbox" value=""></td>
-                                        <td><input type="number" name="attr_beast-rankcustomskillname" max="6" min="0" value="0" /></td>
-                                        <td>
-                                            <input class="sheet-yd" type="hidden" name="attr_beast-ycustomskillname" value="(((@{beast-charcustomskillname} + @{beast-rankcustomskillname}) - abs(@{beast-charcustomskillname} - @{beast-rankcustomskillname})) / 2)" disabled><span></span>
-                                            <input class="sheet-gd" type="hidden" name="attr_beast-gcustomskillname" value="((((@{beast-charcustomskillname} + @{beast-rankcustomskillname}) + abs(@{beast-charcustomskillname} - @{beast-rankcustomskillname})) / 2) - @{beast-ycustomskillname})" disabled><span></span>
-                                        </td>
-                                        <td>
-                                            <div class="sheet-dice-icon"></div>
-                                            <div class="sheet-dice-input">
-                                                <input type="text" name="attr_beast-dicecustomskillname" />
-                                            </div>
-                                        </td>
-                                        <td><button type='roll' name='roll_beast-customskillname' value='!eed characterID(@{character_id}) label(skill:Riding Beast-@{beast-customskillname}) @{beast-dicecustomskillname} skill(@{beast-rankcustomskillname}|@{beast-charcustomskillname}) @{dicePool} (gmdice)'></button></td>
-                                    </tr>
                                 </tbody>
                             </table>
                         </fieldset><!--Custom Skills (Repeating)-->
-                    </div><!-- Skills -->
+                    </div>
                 </div>
                 <div class="sheet-clear"></div>
-            </div><!-- Skills List -->
+            </div><!-- Skills -->
             <div class="sheet-row">
                 <div class="sheet-small-12 sheet-column">
-                    <h3>Abilities</h3>
-                    <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                    <h3 class="sheet-section-header">Abilities</h3>
+                    <input name="attr_beast-Abilities" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-talents-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-talents-section">
+                        <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th style="width:50%">Name</th>
                                 <th style="width:50%">Ability Summary</th>
                             </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_beast-skills">
-                        <table class="sheet-talent">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_beast-skills">
+                            <table class="sheet-talent">
+                                <tbody>
                                 <tr>
                                     <td style="width:50%" colspan="5">
                                         <input type="text" name="attr_beast-talentname" />
                                     </td>
                                     <td style="width:50%" rowspan="2">
-                                        <textarea rows="3" type="text" name="attr_beast-talentsummary"></textarea>
+                                        <textarea rows="3" name="attr_beast-talentsummary"></textarea>
                                     </td>
                                 </tr>
                                 <tr>
@@ -7377,577 +3998,200 @@
                                     <td><label>Page:</label></td>
                                     <td><input type="text" name="attr_beast-talentpagenum" /></td>
                                 </tr>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div><!-- Abilities -->
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Attacks</h3>
+                    <input name="attr_beast-Attacks" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-weapon-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-weapon-section">
+                        <fieldset class="repeating_beast-weapons">
+                            <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td></td>
+                                    <td>
+                                        <label>Damage</label>
+                                        <input name='attr_beast-damage' type="text" value="0" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>Critical</label>
+                                        <input name='attr_beast-critical' type="text" value="0" />
+                                    </td>
+                                    <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(skill: Riding Beast-@{beast-name}|Weapon:@{beast-weaponmake}|Damage:@{beast-damage}|Critical:@{beast-critical}|Range:@{beast-weaponrange}|Qualities:@{beast-weaponspecial}) @{beast-weapondice} encum(@{transport-beast-encumbrancemax}|@{transport-beast-encumbrance}) @{beast-weaponskill} @{beast-weaponcondition} @{dicePool} (gmdice)'></button></td>
+                                    <td>
+                                        <label>Encum</label>
+                                        <input name='attr_beast-encum' type="text" value="0" />
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <label>HP</label>
+                                        <input name='attr_beast-hp' type="text" value="0" />
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><label>Make / Model:</label></td>
+                                    <td><input name='attr_beast-weaponmake' type="text" /></td>
+                                    <td><label>Range:</label></td>
+                                    <td>
+                                        <select name='attr_beast-weaponrange'>
+                                            <option value="Engaged">Engaged</option>
+                                            <option value="Short">Short</option>
+                                            <option value="Medium">Medium</option>
+                                            <option value="Long">Long</option>
+                                            <option value="Extreme">Extreme</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Weapon Type:</label></td>
+                                    <td><input name='attr_beast-weapontype' type="text" /></td>
+                                    <td><label>Skill:</label></td>
+                                    <td>
+                                        <select name='attr_beast-weaponskill'>
+                                            <option value="skill(@{beast-rankBrawl}|@{beast-brawn})">Brawl</option>
+                                            <option value="skill(@{beast-rankcustomskillname}|@{beast-charcustomskillname})">Custom Skill 1</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Dice:</label></td>
+                                    <td><input name='attr_beast-weapondice' type="text" /></td>
+                                    <td><label>Condition:</label></td>
+                                    <td>
+                                        <select name='attr_beast-weaponcondition'>
+                                            <option value="">New</option>
+                                            <option value="1blk">Minor</option>
+                                            <option value="1p">Moderate</option>
+                                            <option value="unusableWeapon">Major</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2">&nbsp;</td>
+                                    <td><label>Special:</label></td>
+                                    <td><textarea rows="3" name="attr_beast-weaponspecial"></textarea></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <div class="sheet-attachments-wrapper">
+                                <input type="checkbox" name="attr_beast-weaponattchments" class="sheet-view-attachments" />
+                                <label class="sheet-view-attachments">View Attachments</label>
+                                <div class="sheet-clear"></div>
+                                <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th>Attachment Name</th>
+                                        <th>Hard Points</th>
+                                        <th>Base Modifiers</th>
+                                        <th>Modifications</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td><input name='attr_beast-weaponattch1' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachp1' type="number" /></td>
+                                        <td><input name='attr_beast-weaponattachbase1' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachmod1' type="text" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input name='attr_beast-weaponattch2' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachp2' type="number" /></td>
+                                        <td><input name='attr_beast-weaponattachbase2' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachmod2' type="text" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input name='attr_beast-weaponattch3' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachp3' type="number" /></td>
+                                        <td><input name='attr_beast-weaponattachbase3' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachmod3' type="text" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input name='attr_beast-weaponattch4' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachp4' type="number" /></td>
+                                        <td><input name='attr_beast-weaponattachbase4' type="text" /></td>
+                                        <td><input name='attr_beast-weaponattachmod4' type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div><!-- Weapon Attachments -->
+                            <br />
+                        </fieldset>
+                    </div>
+                </div>
+            </div><!-- Attacks -->
+        </div><!-- Beast General Information -->
+        <div class="sheet-tab-content sheet-tab-transport-beast-critical">
+            <div class="sheet-row sheet-show-critical-table">
+                <div class="sheet-small-12 sheet-column"><h3 class="sheet-section-header">Beast Critical Injuries</h3></div>
+                <div class="sheet-small-9 sheet-column">
+                    <input type="hidden" name="attr_beast-critTotal" value="0" />
+                    <fieldset class="repeating_critbeast">
+                        <input type="hidden" name="attr_beast-critId" />
+                        <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td width="70%"><input type="text" name="attr_beast-critName" readonly="readonly" /></td>
+                                <td width="30%"><input type="text" name="attr_beast-critRange" readonly="readonly" /></td>
+                                <td class="sheet-crit-dice-bg">
+                                    <input class="sheet-pd" value="4" type="hidden" name="attr_beast-critSeverity" /><span></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2" rowspan="2"><textarea rows="3" name="attr_beast-critSummary" readonly="readonly"></textarea></td>
+                                <td>
+                                    <label>Effect:</label>
+                                    <div class="sheet-switch">
+                                        <input type="radio" class="sheet-switch-input-on" name="attr_beast-critEffect" value="on" title="On" checked="checked">
+                                        <input type="radio" class="sheet-switch-input-off" name="attr_beast-critEffect" value="off" title="Off">
+                                        <span class="switch-selection"></span>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|beast|@{beast-critId})">Heal</button></td></tr>
                             </tbody>
                         </table>
                     </fieldset>
                 </div>
-                <div class="sheet-clear"></div>
-            </div><!-- Abilities -->
-            <div class="sheet-small-12 sheet-column">
-                <h3>Attacks</h3><br />
-                <fieldset class="repeating_beast-weapons">
-                    <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td></td>
-                                <td>
-                                    <label>Damage</label>
-                                    <input name='attr_beast-damage' type="text" value="0" />
-                                </td>
-                                <td></td>
-                                <td>
-                                    <label>Critical</label>
-                                    <input name='attr_beast-critical' type="text" value="0" />
-                                </td>
-                                <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(skill: Riding Beast-@{beast-name}|Weapon:@{beast-weaponmake}|Damage:@{beast-damage}|Critical:@{beast-critical}|Range:@{beast-weaponrange}|Special:@{beast-weaponspecial}) @{beast-weapondice} encum(@{transport-beast-encumbrancemax}|@{transport-beast-encumbrance}) @{beast-weaponskill} @{beast-weaponcondition} @{dicePool} (gmdice)'></button></td>
-                                <td>
-                                    <label>Encum</label>
-                                    <input name='attr_beast-encum' type="text" value="0" />
-                                </td>
-                                <td></td>
-                                <td>
-                                    <label>HP</label>
-                                    <input name='attr_beast-hp' type="text" value="0" />
-                                </td>
-                                <td></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td><label>Make / Model:</label></td>
-                                <td><input name='attr_beast-weaponmake' type="text" /></td>
-                                <td><label>Range:</label></td>
-                                <td>
-                                    <select name='attr_beast-weaponrange'>
-                                        <option value="Engaged">Engaged</option>
-                                        <option value="Short">Short</option>
-                                        <option vaule="Medium">Medium</option>
-                                        <option value="Long">Long</option>
-                                        <option value="Extreme">Extreme</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Weapon Type:</label></td>
-                                <td><input name='attr_beast-weapontype' type="text" /></td>
-                                <td><label>Skill:</label></td>
-                                <td>
-                                    <select name='attr_beast-weaponskill'>
-                                        <option value="skill(@{beast-rankBrawl}|@{beast-brawn})">Brawl</option>
-                                        <option value="skill(@{beast-rankGunnery}|@{beast-agility})">Gunnery</option>
-                                        <option value="skill(@{beast-rankMelee}|@{beast-brawn})">Melee</option>
-                                        <option value="skill(@{beast-rankLight}|@{beast-agility})">Ranged - Light</option>
-                                        <option value="skill(@{beast-rankHeavy}|@{beast-agility})">Ranged - Heavy</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Dice:</label></td>
-                                <td><input name='attr_beast-weapondice' type="text" /></td>
-                                <td><label>Condition:</label></td>
-                                <td>
-                                    <select name='attr_beast-weaponcondition'>
-                                        <option value="">New</option>
-                                        <option value="1blk">Minor</option>
-                                        <option value="1p">Moderate</option>
-                                        <option value="unusableWeapon">Major</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2">&nbsp;</td>
-                                <td><label>Special:</label></td>
-                                <td><textarea rows="3" type="text" name="attr_beast-weaponspecial"></textarea></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div class="sheet-attachments-wrapper">
-                        <input type="checkbox" name="attr_beast-weaponattchments" class="sheet-view-attachments" />
-                        <label class="sheet-view-attachments">View Attachments</label>
-                        <div class="sheet-clear"></div>
-                        <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                            <thead>
-                                <tr>
-                                    <th>Attachment Name</th>
-                                    <th>Hard Points</th>
-                                    <th>Base Modifiers</th>
-                                    <th>Modifications</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td><input name='attr_beast-weaponattch1' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachp1' type="number" /></td>
-                                    <td><input name='attr_beast-weaponattachbase1' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachmod1' type="text" /></td>
-                                </tr>
-                                <tr>
-                                    <td><input name='attr_beast-weaponattch2' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachp2' type="number" /></td>
-                                    <td><input name='attr_beast-weaponattachbase2' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachmod2' type="text" /></td>
-                                </tr>
-                                <tr>
-                                    <td><input name='attr_beast-weaponattch3' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachp3' type="number" /></td>
-                                    <td><input name='attr_beast-weaponattachbase3' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachmod3' type="text" /></td>
-                                </tr>
-                                <tr>
-                                    <td><input name='attr_beast-weaponattch4' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachp4' type="number" /></td>
-                                    <td><input name='attr_beast-weaponattachbase4' type="text" /></td>
-                                    <td><input name='attr_beast-weaponattachmod4' type="text" /></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div><!-- Weapon Attachments -->
-                    <br />
-                </fieldset>
-            </div><!-- Attacks -->
-            <div class="sheet-row sheet-show-critical-table">
-                <div class="sheet-small-12 sheet-column">
-                    <h3 class="sheet-section-header">Beast Critical Injuries</h3>
-                </div>
-                <div class="sheet-small-9 sheet-column">
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn1" value="1" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName1" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange1" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice1" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity1" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea row="3" name="attr_critSummary1" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect1" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect1" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn1})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn2" value="2" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName2" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange2" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice2" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity2" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary2" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect2" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect2" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn2})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn3" value="3" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName3" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange3" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice3" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity3" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary3" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect3" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect3" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn3})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn4" value="4" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName4" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange4" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice4" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity4" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary4" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect4" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect4" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn4})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn5" value="5" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName5" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange5" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice5" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity5" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary5" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect5" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect5" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn5})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn6" value="6" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName6" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange6" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice6" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity6" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary6" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect6" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect6" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn6})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn7" value="7" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName7" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange7" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice7" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity7" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary7" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect7" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect7" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn7})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn8" value="8" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName8" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange8" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice8" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity8" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary8" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect8" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect8" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn8})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn9" value="9" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName9" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange9" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice9" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity9" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary9" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect9" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect9" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn9})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn10" value="10" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName10" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange10" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice10" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity10" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary10" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect10" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect10" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn10})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn11" value="11" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName11" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange11" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice11" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity11" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary11" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect11" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect11" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn11})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn12" value="12" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName12" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange12" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice12" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity12" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary12" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect12" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect12" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn12})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn13" value="13" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName13" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange13" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice13" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity13" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary13" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect13" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect13" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn13})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn14" value="14" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName14" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange14" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice14" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity14" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary14" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect14" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect14" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn14})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn15" value="15" />
-                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td width="70%"><input type="text" name="attr_critName15" readonly="readonly" /></td>
-                                <td width="30%"><input type="text" name="attr_critRange15" readonly="readonly" /></td>
-                                <td class="sheet-crit-dice-bg">
-                                    <input type="hidden" name="attr_critDice15" />
-                                    <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity15" /><span></span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary15" readonly="readonly"></textarea></td>
-                                <td>
-                                    <label>Effect:</label>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_critEffect15" value="on" title="On" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_critEffect15" value="off" title="Off">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn15})">Heal</button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
                 <div class="sheet-small-3 sheet-column">
                     <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
                         <tbody>
-                            <tr>
-                                <td><label>Critical roll offset:</label></td>
-                                <td><input type="text" name="attr_critAddOffset" value="" /></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll)">Roll Critical</button></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <label>Critical number:</label>
-                                    <input type="text" name="attr_critAddRangeNum" value="" />
-                                </td>
-                                <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|@{critAddRangeNum})">Add Critical</button></td>
-                            </tr>
+                        <tr>
+                            <td><label>Critical roll offset:</label></td>
+                            <td><input type="text" name="attr_beast-critAddOffset" value="" /></td>
+                        </tr>
+                        <tr><td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll|beast)">Roll Critical</button></td></tr>
+                        <tr>
+                            <td>
+                                <label>Critical number:</label>
+                                <input type="text" name="attr_beast-critAddRangeNum" value="" />
+                            </td>
+                            <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|beast|@{beast-critAddRangeNum})">Add Critical</button></td>
+                        </tr>
                         </tbody>
                     </table>
                 </div>
                 <div class="sheet-clear"></div>
-            </div><!-- Beast Critical Table -->
-        </div>
+            </div><!-- Living Being Critical Table -->
+        </div><!-- Beast Critical Injuries -->
     </div><!--Beast-->
 </div><!-- Player Vehicle sheet -->
 <div class="sheet-tab-content sheet-tab-base-sheet">
-    <br /><br /><br /><br /><br /><br /><br />
-    <input type="radio" name="attr_base-sheet" class="sheet-tab-new sheet-tab-base-details" value="1" checked="checked" />
+    <br />
+    <input type="radio" name="attr_base-sheet" style="width: 145px ; margin: -2px -30px 0 4px" class="sheet-tab-new sheet-tab-base-details" value="1" checked="checked" />
     <span class="sheet-tab-new">&emsp;Base of Operations &emsp;</span>
-    <input type="radio" name="attr_base-sheet" class="sheet-tab-new sheet-tab-base-shared" value="2" />
+    <input type="radio" name="attr_base-sheet" style="width: 145px ; margin: -2px -30px 0 4px" class="sheet-tab-new sheet-tab-base-shared" value="2" />
     <span class="sheet-tab-new">&emsp;Shared Resources &emsp;</span>
 
     <div class="sheet-tab-content sheet-tab-base-details">
@@ -7958,17 +4202,19 @@
                 <input type="radio" name="attr_opt-base-type" class="sheet-opt sheet-opt-business" value="2" title="Business" />
                 <input type="radio" name="attr_opt-base-type" class="sheet-opt sheet-opt-homestead" value="3" title="Homestead" />
 
-                <div class="sheet-tab-content sheet-opt-rebel">
+                <div class="sheet-spacer sheet-tab-content sheet-opt-rebel">
                     <h3 class="sheet-section-header">Details</h3>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                    <input name="attr_boo-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-details-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Rebel Base Name:</label></td>
                                 <td><input name="attr_rebel-base-name" type="text" /></td>
                                 <td><label>Location:</label></td>
                                 <td><input name="attr_rebel-base-location" type="text" /></td>
                             </tr>
-                        <tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Core Type:</label></td>
                                 <td>
@@ -7980,63 +4226,70 @@
                                     </select>
                                 </td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_rebelbasecoredetails"></textarea></td>
+                                <td><textarea rows="2" name="attr_rebelbasecoredetails"></textarea></td>
                             </tr>
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="sheet-clear"></div>
                     <br />
                     <h3 class="sheet-section-header">NPCs</h3>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                    <input name="attr_boo-NPCs" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-npc-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-npc-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Name:</label></td>
                                 <td><input name="attr_rebel-base-NPC-name1" type="text" /></td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_rebelbase-npcdescription1"></textarea></td>
+                                <td><textarea rows="2" name="attr_rebelbase-npcdescription1"></textarea></td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Position/Role:</label></td>
                                 <td><input name="attr_rebel-base-NPC-position1" type="text" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <fieldset class="repeating_rebel-base-NPC-position">
-                        <table cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
+                            </tbody>
+                        </table>
+                        <fieldset class="repeating_rebel-base-NPC-position">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
                                 <tr>
                                     <td><label>Name:</label></td>
                                     <td><input name="attr_rebel-base-NPC-name2" type="text" /></td>
                                     <td><label>Description:</label></td>
-                                    <td><textarea rows="2" type="text" name="attr_rebelbase-npcdescription2"></textarea></td>
+                                    <td><textarea rows="2" name="attr_rebelbase-npcdescription2"></textarea></td>
                                 </tr>
-                            </tbody>
-                            <tbody>
+                                </tbody>
+                                <tbody>
                                 <tr>
                                     <td><label>Position/Role:</label></td>
                                     <td><input name="attr_rebel-base-NPC-position2" type="text" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
                     <div class="sheet-clear"></div>
                     <br />
-                    <h3>Upgrades</h3>
-                    <table class="sheet-base-upgrades" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                    <h3 class="sheet-section-header">Upgrades</h3>
+                    <input name="attr_boo-Upgrades" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-upgrades-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-upgrades-section">
+                        <table class="sheet-base-upgrades" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th style="width:50%">Upgrade Type:</th>
                                 <th style="width:50%">Description</th>
                             </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_baseupgrades">
-                        <table class="sheet-base-upgrades">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_baseupgrades">
+                            <table class="sheet-base-upgrades">
+                                <tbody>
                                 <tr>
                                     <td style="width:50%" colspan="5"><input type="text" name="attr_rebelupgradename1" /></td>
-                                    <td style="width:50%" rowspan="2"><textarea rows="3" type="text" name="attr_rebelupgradedescription1"></textarea></td>
+                                    <td style="width:50%" rowspan="2"><textarea rows="3" name="attr_rebelupgradedescription1"></textarea></td>
                                 </tr>
                                 <tr>
                                     <td><label>Cost:</label></td>
@@ -8044,23 +4297,26 @@
                                     <td><label>Number of Upgrades:</label></td>
                                     <td style="width:50px"><input name='attr_rebelupgradesnumber1' type="number" max="5" min="0" value="0" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
                     <div class="sheet-clear"></div>
                 </div><!-- Rebel Base Info -->
-                <div class="sheet-tab-content sheet-opt-business">
+                <div class="sheet-spacer sheet-tab-content sheet-opt-business">
                     <h3 class="sheet-section-header">Details</h3>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                    <input name="attr_boo-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-details-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Business Name:</label></td>
                                 <td><input name="attr_business-name" type="text" /></td>
                                 <td><label>Location:</label></td>
                                 <td><input name="attr_business-location" type="text" /></td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Type:</label></td>
                                 <td>
@@ -8087,67 +4343,73 @@
                                     </select>
                                 </td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_businessdetails"></textarea></td>
+                                <td><textarea rows="2" name="attr_businessdetails"></textarea></td>
                             </tr>
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                     <br />
                     <h3 class="sheet-section-header">NPCs</h3>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                    <input name="attr_boo-NPCs" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-npc-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-npc-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Name:</label></td>
                                 <td><input name="attr_business-NPC-name1" type="text" /></td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_business-npcdescription1"></textarea></td>
+                                <td><textarea rows="2" name="attr_business-npcdescription1"></textarea></td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Position/Role:</label></td>
                                 <td><input name="attr_business-NPC-position1" type="text" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <fieldset class="repeating_business-NPC-position">
-                        <table cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
+                            </tbody>
+                        </table>
+                        <fieldset class="repeating_business-NPC-position">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
                                 <tr>
                                     <td><label>Name:</label></td>
                                     <td><input name="attr_business-NPC-name2" type="text" /></td>
                                     <td><label>Description:</label></td>
-                                    <td><textarea rows="2" type="text" name="attr_business-npcdescription2"></textarea></td>
+                                    <td><textarea rows="2" name="attr_business-npcdescription2"></textarea></td>
                                 </tr>
-                            </tbody>
-                            <tbody>
+                                </tbody>
+                                <tbody>
                                 <tr>
                                     <td><label>Position/Role:</label></td>
                                     <td><input name="attr_business-NPC-position2" type="text" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
                     <div class="sheet-clear"></div>
                     <br />
-                    <h3>Upgrades</h3>
-                    <table class="sheet-business-upgrades" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                    <h3 class="sheet-section-header">Upgrades</h3>
+                    <input name="attr_boo-Upgrades" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-upgrades-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-upgrades-section">
+                        <table class="sheet-business-upgrades" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th style="width:50%">Upgrade Type:</th>
                                 <th style="width:50%">Description</th>
                             </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_businessupgrade">
-                        <table class="sheet-business-upgrades">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_businessupgrade">
+                            <table class="sheet-business-upgrades">
+                                <tbody>
                                 <tr>
                                     <td style="width:50%" colspan="5"><input type="text" name="attr_businessupgradename1" /></td>
-                                    <td style="width:50%" rowspan="2"><textarea rows="3" type="text" name="attr_businessupgradedescription1"></textarea></td>
+                                    <td style="width:50%" rowspan="2"><textarea rows="3" name="attr_businessupgradedescription1"></textarea></td>
                                 </tr>
                                 <tr>
                                     <td><label>Cost:</label></td>
@@ -8155,23 +4417,26 @@
                                     <td><label>Number of Upgrades:</label></td>
                                     <td style="width:50px"><input name='attr_businessupgradesnumber1' type="number" max="5" min="0" value="0" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
                     <div class="sheet-clear"></div>
                 </div><!-- Business Info -->
-                <div class="sheet-tab-content sheet-opt-homestead">
+                <div class="sheet-spacer sheet-tab-content sheet-opt-homestead">
                     <h3 class="sheet-section-header">Details</h3>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                    <input name="attr_boo-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-details-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Homestead Name:</label></td>
                                 <td><input name="attr_homestead-name" type="text" /></td>
                                 <td><label>Location:</label></td>
                                 <td><input name="attr_homestead-location" type="text" /></td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Type:</label></td>
                                 <td>
@@ -8191,67 +4456,73 @@
                                         <option value="4">Piloting (Space)</option>
                                     </select>
                                 </td>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_homesteaddetails"></textarea></td>
+                                <td><textarea rows="2" name="attr_homesteaddetails"></textarea></td>
                             </tr>
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                     <br />
                     <h3 class="sheet-section-header">NPCs</h3>
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                    <input name="attr_boo-NPCs" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-npc-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-npc-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Name:</label></td>
                                 <td><input name="attr_homestead-NPC-name1" type="text" /></td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_homestead-npcdescription1"></textarea></td>
+                                <td><textarea rows="2" name="attr_homestead-npcdescription1"></textarea></td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Position/Role:</label></td>
                                 <td><input name="attr_homestead-NPC-position1" type="text" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <fieldset class="repeating_homestead-NPC-position">
-                        <table cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
+                            </tbody>
+                        </table>
+                        <fieldset class="repeating_homestead-NPC-position">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
                                 <tr>
                                     <td><label>Name:</label></td>
                                     <td><input name="attr_homestead-NPC-name2" type="text" /></td>
                                     <td><label>Description:</label></td>
-                                    <td><textarea rows="2" type="text" name="attr_homestead-npcdescription2"></textarea></td>
+                                    <td><textarea rows="2" name="attr_homestead-npcdescription2"></textarea></td>
                                 </tr>
-                            </tbody>
-                            <tbody>
+                                </tbody>
+                                <tbody>
                                 <tr>
                                     <td><label>Position/Role:</label></td>
                                     <td><input name="attr_homestead-NPC-position2" type="text" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
                     <div class="sheet-clear"></div>
                     <br />
-                    <h3>Upgrades</h3>
-                    <table class="sheet-homestead-upgrades" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                    <h3 class="sheet-section-header">Upgrades</h3>
+                    <input name="attr_boo-Upgrades" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-upgrades-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-upgrades-section">
+                        <table class="sheet-homestead-upgrades" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th style="width:50%">Upgrade Type:</th>
                                 <th style="width:50%">Description</th>
                             </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_homesteadupgrade">
-                        <table class="sheet-homestead-upgrades">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_homesteadupgrade">
+                            <table class="sheet-homestead-upgrades">
+                                <tbody>
                                 <tr>
                                     <td style="width:50%" colspan="5"><input type="text" name="attr_homesteadupgradename1" /></td>
-                                    <td style="width:50%" rowspan="2"><textarea rows="3" type="text" name="attr_homesteadupgradedescription1"></textarea></td>
+                                    <td style="width:50%" rowspan="2"><textarea rows="3" name="attr_homesteadupgradedescription1"></textarea></td>
                                 </tr>
                                 <tr>
                                     <td><label>Cost:</label></td>
@@ -8259,9 +4530,10 @@
                                     <td><label>Number of Upgrades:</label></td>
                                     <td style="width:50px"><input name='attr_homesteadupgradesnumber1' type="number" max="5" min="0" value="0" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                        </fieldset>
+                    </div>
                 </div><!-- Homestead Info -->
             </div>
         </div>
@@ -8271,81 +4543,100 @@
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Details</h3>
-                <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
+                <input name="attr_shared-Group-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-details-section">
+                    <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
+                        <tbody>
                         <tr class="sheet-bg-grey">
                             <td colspan="2"><label style="text-align:right">Group Name:</label></td>
-                            <td colspan="2"><input type="text" name="attr_groupname" /></td>
+                            <td colspan="5"><input type="text" name="attr_groupname" /></td>
+                            <td></td>
                         </tr>
                         <tr>
                             <td><label>Group Credits:</label></td>
                             <td><input type="text" name="attr_groupcredits" disabled value='(@{grouppettycash} + @{groupsavings})' /></td>
                             <td><label>Petty Cash:</label></td>
                             <td><input name="attr_grouppettycash" type="text" value="0" /></td>
-                            <td><label>Savings:</label></td>
+                            <td><label>Group Savings:</label></td>
                             <td><input name="attr_groupsavings" type="text" value="0" /></td>
+                            <td><label>Group Expenses:</label></td>
+                            <td><input name="attr_groupexpenses" type="text" value="0" /></td>
                         </tr>
                         <tr>
-                            <td colspan="2"><label style="text-align:right">Current Location:</label></td>
-                            <td><input type="text" name="attr_grouplocation" /></td>
-                            <td><label>Nearest Hyperlane:</label></td>
-                            <td><input type="text" name="attr_groupnearesthyperlane" /></td>
+                            <td colspan="8">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label style="text-align:left">Current Location:</label></td>
+                                        <td><input type="text" name="attr_grouplocation" /></td>
+                                        <td><label style="text-align:left">Nearest Hyperlane:</label></td>
+                                        <td><input type="text" name="attr_groupnearesthyperlane" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
                         </tr>
-                    </tbody>
-                </table>
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div><!--Group Details-->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Contacts</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
+                <input name="attr_shared-Group-Contacts" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-contacts-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-contacts-section">
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <tbody>
                         <tr>
                             <td><label>Name:</label></td>
                             <td><input name="attr_groupcontacts-name1" type="text" /></td>
                             <td><label>Description:</label></td>
-                            <td><textarea rows="2" type="text" name="attr_groupcontacts-npcdescription1"></textarea></td>
+                            <td><textarea rows="2" name="attr_groupcontacts-npcdescription1"></textarea></td>
                         </tr>
-                    </tbody>
-                    <tbody>
+                        </tbody>
+                        <tbody>
                         <tr>
                             <td><label>Position/Role:</label></td>
                             <td><input name="attr_groupcontacts-position1" type="text" /></td>
                             <td><label>Location:</label></td>
                             <td><input name="attr_groupcontacts-location" type="text" /></td>
                         </tr>
-                    </tbody>
-                </table>
-                <br />
-                <fieldset class="repeating_groupcontacts-position">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                        </tbody>
+                    </table>
+                    <br />
+                    <fieldset class="repeating_groupcontacts-position">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Name:</label></td>
                                 <td><input name="attr_groupcontacts-name2" type="text" /></td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_groupcontacts-npcdescription2"></textarea></td>
+                                <td><textarea rows="2" name="attr_groupcontacts-npcdescription2"></textarea></td>
                             </tr>
-                        </tbody>
-                        <tbody>
+                            </tbody>
+                            <tbody>
                             <tr>
                                 <td><label>Position/Role:</label></td>
                                 <td><input name="attr_groupcontacts-position2" type="text" /></td>
                                 <td><label>Location:</label></td>
                                 <td><input name="attr_groupcontacts-location" type="text" /></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
+                            </tbody>
+                        </table>
+                        <br />
+                    </fieldset>
+                </div>
             </div>
         </div><!--Group Contacts-->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Tasks</h3>
-                <fieldset class="repeating_group-tasks">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                <input name="attr_shared-Group-Tasks" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-tasks-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-tasks-section">
+                    <fieldset class="repeating_group-tasks">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Task:</label></td>
                                 <td><input type="text" name="attr_grouptask1" /></td>
@@ -8363,18 +4654,21 @@
                                 <td><label>Details:</label></td>
                                 <td colspan="3" class="sheet-div-right"><textarea rows="3" name="attr_grouptaskdetails1"></textarea></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
+                            </tbody>
+                        </table>
+                        <br />
+                    </fieldset>
+                </div>
             </div>
         </div><!--Group Tasks-->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Obligations</h3>
-                <fieldset class="repeating_group-obligation">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
+                <input name="attr_shared-Group-Obligations" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-obligation-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-obligation-section">
+                    <fieldset class="repeating_group-obligation">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
                                 <td><label>Type:</label></td>
                                 <td><input type="text" name="attr_groupobligationtype1" /></td>
@@ -8385,48 +4679,57 @@
                                 <td><label>Details:</label></td>
                                 <td colspan="3" class="sheet-div-right"><textarea rows="3" name="attr_groupobligationcomp1"></textarea></td>
                             </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </fieldset>
+                            </tbody>
+                        </table>
+                        <br />
+                    </fieldset>
+                </div>
             </div>
         </div><!--Group Obligations-->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Resources</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody><tr><td><textarea name="attr_groupresources" rows="6"></textarea></td></tr></tbody>
-                </table>
+                <input name="attr_shared-Group-Resources" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-resources-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-resources-section">
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <tbody><tr><td><textarea name="attr_groupresources" rows="6"></textarea></td></tr></tbody>
+                    </table>
+                </div>
             </div>
         </div><!--Group Resources-->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Group Posessions</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody><tr><td><textarea name="attr_groupposessions" rows="6"></textarea></td></tr></tbody>
-                </table>
+                <h3 class="sheet-section-header">Group Possessions</h3>
+                <input name="attr_shared-Group-Possessions" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-possessions-section-toggle" type="checkbox" checked="checked"/>
+                <div class="sheet-possessions-section">
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <tbody><tr><td><textarea name="attr_groupposessions" rows="6"></textarea></td></tr></tbody>
+                    </table>
+                </div>
             </div>
         </div><!--Group Posessions-->
         <div class="sheet-clear"></div>
     </div><!-- Shared Resources Info -->
 </div><!-- Player Group sheet -->
 <div class="sheet-tab-content sheet-tab-companion-sheet">
-    <div class="sheet-row sheet-section-1">
-        <div class="sheet-small-12 sheet-column">
-            <table class="sheet-swsd" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
+    <b>Stats</b><input name="attr_companion-Stats" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-stats-toggle-small" type="checkbox"/><span></span>
+    <div class="sheet-stats-toggle-small">
+        <div class="sheet-row sheet-section-1">
+            <div class="sheet-small-12 sheet-column">
+                <table class="sheet-swsd" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
                     <tr>
                         <td>
                             <label class="sheet-label-title">Wounds</label>
-                            <input name="attr_companion-wounds_max" type="number" max="99" min="1" value="1" />
-                            <input name="attr_companion-wounds" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_companion-wounds_max" type="number" max="999" min="1" value="1" />
+                            <input name="attr_companion-wounds" type="number" max="999" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
                         <td>
                             <label class="sheet-label-title">Strain</label>
-                            <input name="attr_companion-strain_max" type="number" max="99" min="1" value="1" />
-                            <input name="attr_companion-strain" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_companion-strain_max" type="number" max="999" min="0" value="0" />
+                            <input name="attr_companion-strain" type="number" max="999" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
@@ -8450,7 +4753,7 @@
                             <input name="attr_companion-forcerating" type="number" max="99" min="0" value="0" />
                             <input name="attr_companion-forcecommitted" type="number" max="99" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
-                            <label class="sheet-label-current">Committed</label>
+                            <label class="sheet-label-committed">Committed</label>
                         </td>
                     </tr>
                     <tr>
@@ -8459,61 +4762,22 @@
                             <input name="attr_companion-soak" type="number" max="99" min="1" value="1" />
                         </td>
                     </tr>
-                </tbody>
-            </table>
-        </div><!-- Top Stats -->
-        <div class="sheet-small-12 sheet-column">
-            <h3 class="sheet-section-header">Dice Pool</h3>
-            <table class="sheet-dice-pool" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
-                    <tr>
-                        <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png" /><input name="attr_companion-b" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png" /><input name="attr_companion-g" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Proficiency/ProficiencyBlank.png" /><input name="attr_companion-y" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-force"><img src="http://galacticcampaigns.com/images/EotE/Force/ForceL.png" /><input name="attr_companion-w" type="number" step="1" max="9" min="0" value="0"></td>
-                        <td class="sheet-dark"><img src="http://galacticcampaigns.com/images/EotE/Setback/SetBackBlank.png" /><input name="attr_companion-blk" type="number" step="1" max="9" min="-9" value="0"></td>
-                        <td class="sheet-dark"><img src="http://galacticcampaigns.com/images/EotE/Difficulty/DifficultyBlank.png" /><input name="attr_companion-p" type="number" step="1" max="9" min="-7" value="0"></td>
-                        <td class="sheet-dark"><img src="http://galacticcampaigns.com/images/EotE/Challenge/ChallengeBlank.png" /><input name="attr_companion-r" type="number" step="1" max="9" min="-7" value="0"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3" class="sheet-upgrade sheet-light">
-                            <label>
-                                &nbsp;&nbsp;&nbsp;&nbsp;Upgrade:
-                                <input name="attr_companion-upgradeAbility" type="number" step="1" max="9" min="0" value="0">
-                            </label>
-                            <label>
-                                <input name="attr_companion-downgradeProficiency" type="number" step="1" max="9" min="0" value="0">
-                                :Downgrade
-                            </label>
-                        </td>
-                        <td class="sheet-force">
-                            <input type="hidden" name="attr_companion-dicePool" value='@{companion-g}g @{companion-y}y @{companion-p}p @{companion-r}r @{companion-b}b @{companion-blk}blk @{companion-w}w upgrade(ability|@{companion-upgradeAbility}) downgrade(proficiency|@{companion-downgradeProficiency}) upgrade(difficulty|@{companion-upgradeDifficulty}) downgrade(challenge|@{companion-downgradeChallenge})' />
-                            <button type='roll' name='roll_DicePool' value='!eed characterID(@{character_id}) label(Dice:Companion Dice Pool) @{companion-dicePool} (gmdice)'></button>
-                            <button type='roll' name='roll_ResetDicePool' value='!eed resetdice characterID(@{character_id})'></button>
-                        </td>
-                        <td colspan="3" class="sheet-downgrade sheet-dark">
-                            <label>
-                                &nbsp;&nbsp;&nbsp;&nbsp;Upgrade:
-                                <input name="attr_companion-upgradeDifficulty" type="number" step="1" max="9" min="0" value="0">
-                            </label>
-                            <label>
-                                <input name="attr_companion-downgradeChallenge" type="number" step="1" max="9" min="0" value="0">
-                                Downgrade:
-                            </label>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div><!-- Dice Pool -->
-        <div class="sheet-clear"></div>
-    </div><!-- Stats and Dice -->
+                    </tbody>
+                </table>
+            </div><!-- Top Stats -->
+        </div>
+    </div><!-- Stats -->
+    <div class="sheet-clear"></div>
 
     <input type="radio" name="attr_companion-sheet" class="sheet-tab-new sheet-tab-companion-info" value="1" checked="checked" />
     <span class="sheet-tab-new">&emsp;Companion Info&emsp;</span>
-    <input type="radio" name="attr_companion-sheet" class="sheet-tab-new sheet-tab-companion-combat" value="2" />
-    <span class="sheet-tab-new">&emsp;Skills, Talents, Weapons &amp; Powers&emsp;</span>
-    <input type="radio" name="attr_companion-sheet" class="sheet-tab-new sheet-tab-companion-inventory" value="3" />
-    <span class="sheet-tab-new">&emsp;Item Inventory&emsp;</span>
+
+    <input type="radio" name="attr_companion-sheet" class="sheet-tab-new sheet-tab-companion-combat" style="width: 249px;" value="2" />
+    <span class="sheet-tab-new" style="left: -128px;">&emsp;Skills, Talents, Weapons &amp; Powers&emsp;</span>
+    <input type="radio" name="attr_companion-sheet" class="sheet-tab-new sheet-tab-companion-inventory" style="left: -100px; margin-left: -25px;" value="3" />
+    <span class="sheet-tab-new" style="margin-left: -225px;">&emsp;Item Inventory&emsp;</span>
+    <input type="radio" name="attr_companion-sheet" class="sheet-tab-new sheet-tab-companion-critical" value="4" />
+    <span class="sheet-tab-new">&emsp;Critical Injuries&emsp;</span>
 
     <div class="sheet-tab-content sheet-tab-companion-info">
         <div class="sheet-row">
@@ -8521,241 +4785,289 @@
                 <h3 class="sheet-section-header">Companion</h3>
                 <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
                     <tbody>
-                        <tr>
-                            <td><label>Name:</label></td>
-                            <td><input type="text" name="attr_companion-name" /></td>
-                        </tr>
-                        <tr>
-                            <td><label>Species:</label></td>
-                            <td>
-                                <select name='attr_companion-species'>
-                                    <option value="Aqualish (Aquala)">Aqualish (Aquala)</option>
-                                    <option value="Aqualish (Quara)">Aqualish (Quara)</option>
-                                    <option value="Aqualish (Ualaq)">Aqualish (Ualaq)</option>
-                                    <option value="Arcona">Arcona</option>
-                                    <option value="Bothan">Bothan</option>
-                                    <option value="Caamasi">Caamasi</option>
-                                    <option value="Cerean">Cerean</option>
-                                    <option value="Chadra-Fan">Chadra-Fan</option>
-                                    <option value="Chagrian">Chagrian</option>
-                                    <option value="Chevin">Chevin</option>
-                                    <option value="Chiss">Chiss</option>
-                                    <option value="Corellian Human">Corellian Human</option>
-                                    <option value="Drall">Drall</option>
-                                    <option value="Dressellian (Primitive)">Dressellian (Primitive)</option>
-                                    <option value="Dressellian (Non-Primitive)">Dressellian (Non-Primitive)</option>
-                                    <option value="Droid">Droid</option>
-                                    <option value="Duros">Duros</option>
-                                    <option value="Falleen">Falleen</option>
-                                    <option value="Gand (With Lungs)">Gand (With Lungs)</option>
-                                    <option value="Gand (Without Lungs)">Gand (Without Lungs)</option>
-                                    <option value="Gank">Gank</option>
-                                    <option value="Gossam">Gossam</option>
-                                    <option value="Gotal">Gotal</option>
-                                    <option value="Gran">Gran</option>
-                                    <option value="Human">Human</option>
-                                    <option value="Hutt">Hutt</option>
-                                    <option value="Iktotchi">Iktotchi</option>
-                                    <option value="Ishi Tib">Ishi Tib</option>
-                                    <option value="Ithorian">Ithorian</option>
-                                    <option value="Kel Dor">Kel Dor</option>
-                                    <option value="Klatooinian">Klatooinian</option>
-                                    <option value="Lannik">Lannik</option>
-                                    <option value="Mirialan">Mirialan</option>
-                                    <option value="Mon Calamari">Mon Calamari</option>
-                                    <option value="Nautolan">Nautolan</option>
-                                    <option value="Neimodian">Neimodian</option>
-                                    <option value="Nikto (Green)">Nikto (Green)</option>
-                                    <option value="Nikto (Mountain)">Nikto (Mountain)</option>
-                                    <option value="Nikto (Pale)">Nikto (Pale)</option>
-                                    <option value="Nikto (Red)">Nikto (Red)</option>
-                                    <option value="Nikto (Southern)">Nikto (Southern)</option>
-                                    <option value="Polis Massan (With Vocal Chords)">Polis Massan (With Vocal Chords)</option>
-                                    <option value="Polis Massan (Without Vocal Chords)">Polis Massan (Without Vocal Chords)</option>
-                                    <option value="Quarren">Quarren</option>
-                                    <option value="Rodian">Rodian</option>
-                                    <option value="Sakiyan">Sakiyan</option>
-                                    <option value="Sathari">Sathari</option>
-                                    <option value="Selonian">Selonian</option>
-                                    <option value="Sullustan">Sullustan</option>
-                                    <option value="Togruta">Togruta</option>
-                                    <option value="Toydarian">Toydarian</option>
-                                    <option value="Trandosian">Trandosian</option>
-                                    <option value="Twi'lek">Twi'lek</option>
-                                    <option value="Verpine">Verpine</option>
-                                    <option value="Weequay">Weequay</option>
-                                    <option value="Whiphid">Whiphid</option>
-                                    <option value="Wookiee">Wookiee</option>
-                                    <option value="Xexto">Xexto</option>
-                                    <option value="Zabrak">Zabrak</option>
-                                </select><!--Species List-->
-                                <input type="text" name="attr_companion-species" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Credits:</label></td>
-                            <td><input type="text" name="attr_companion-credits" /></td>
-                        </tr>
+                    <tr>
+                        <td><label>Name:</label></td>
+                        <td><input type="text" name="attr_companion-name" /></td>
+                    </tr>
+                    <tr>
+                        <td><label>Species:</label></td>
+                        <td>
+                            <select name='attr_companion-species'>
+                                <option>&emsp;&emsp;</option>
+                                <option value="Aleena">Aleena</option>
+                                <option value="Anx">Anx</option>
+                                <option value="Aqualish (Aquala)">Aqualish (Aquala)</option>
+                                <option value="Aqualish (Quara)">Aqualish (Quara)</option>
+                                <option value="Aqualish (Ualaq)">Aqualish (Ualaq)</option>
+                                <option value="Arcona">Arcona</option>
+                                <option value="Bardottan">Bardottan</option>
+                                <option value="Besalisk">Besalisk</option>
+                                <option value="Bothan">Bothan</option>
+                                <option value="Caamasi">Caamasi</option>
+                                <option value="Cerean">Cerean</option>
+                                <option value="Chadra-Fan">Chadra-Fan</option>
+                                <option value="Chagrian">Chagrian</option>
+                                <option value="Chevin">Chevin</option>
+                                <option value="Chiss">Chiss</option>
+                                <option value="Corellian Human">Corellian Human</option>
+                                <option value="Devaronian">Devaronian</option>
+                                <option value="Drall">Drall</option>
+                                <option value="Dressellian (Primitive)">Dressellian (Primitive)</option>
+                                <option value="Dressellian (Non-Primitive)">Dressellian (Non-Primitive)</option>
+                                <option value="Droid">Droid</option>
+                                <option value="Dug">Dug</option>
+                                <option value="Duros">Duros</option>
+                                <option value="Falleen">Falleen</option>
+                                <option value="Gand (With Lungs)">Gand (With Lungs)</option>
+                                <option value="Gand (Without Lungs)">Gand (Without Lungs)</option>
+                                <option value="Gank">Gank</option>
+                                <option value="Gossam">Gossam</option>
+                                <option value="Gotal">Gotal</option>
+                                <option value="Gran">Gran</option>
+                                <option value="Gungan">Gungan</option>
+                                <option value="Human">Human</option>
+                                <option value="Hutt">Hutt</option>
+                                <option value="Iktotchi">Iktotchi</option>
+                                <option value="Ishi Tib">Ishi Tib</option>
+                                <option value="Ithorian">Ithorian</option>
+                                <option value="Kel Dor">Kel Dor</option>
+                                <option value="Klatooinian">Klatooinian</option>
+                                <option value="Lannik">Lannik</option>
+                                <option value="Mirialan">Mirialan</option>
+                                <option value="Mon Calamari">Mon Calamari</option>
+                                <option value="Mustafarian (Northern)">Mustafarian (Northern)</option>
+                                <option value="Mustafarian (Southern)">Mustafarian (Southern)</option>
+                                <option value="Nautolan">Nautolan</option>
+                                <option value="Neimodian">Neimodian</option>
+                                <option value="Nikto (Green)">Nikto (Green)</option>
+                                <option value="Nikto (Mountain)">Nikto (Mountain)</option>
+                                <option value="Nikto (Pale)">Nikto (Pale)</option>
+                                <option value="Nikto (Red)">Nikto (Red)</option>
+                                <option value="Nikto (Southern)">Nikto (Southern)</option>
+                                <option value="Polis Massan (With Vocal Chords)">Polis Massan (With Vocal Chords)</option>
+                                <option value="Polis Massan (Without Vocal Chords)">Polis Massan (Without Vocal Chords)</option>
+                                <option value="Quarren">Quarren</option>
+                                <option value="Quermian">Quermian</option>
+                                <option value="Rodian">Rodian</option>
+                                <option value="Sakiyan">Sakiyan</option>
+                                <option value="Sathari">Sathari</option>
+                                <option value="Selonian">Selonian</option>
+                                <option value="Sullustan">Sullustan</option>
+                                <option value="Togruta">Togruta</option>
+                                <option value="Toydarian">Toydarian</option>
+                                <option value="Trandosian">Trandosian</option>
+                                <option value="Twi'lek">Twi'lek</option>
+                                <option value="Verpine">Verpine</option>
+                                <option value="Weequay">Weequay</option>
+                                <option value="Whiphid">Whiphid</option>
+                                <option value="Wookiee">Wookiee</option>
+                                <option value="Xexto">Xexto</option>
+                                <option value="Zabrak">Zabrak</option>
+                            </select><!--Species List-->
+                            <input type="text" name="attr_companion-species" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Credits:</label></td>
+                        <td><input type="text" name="attr_companion-credits" /></td>
+                    </tr>
                     </tbody>
                 </table>
             </div>
             <div class="sheet-clear"></div>
         </div><!-- Top Info -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
+
+        <b>Career</b><input name="attr_companion-Career" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-career-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-career-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <thead>
                         <tr>
                             <th width="30%">Career</th>
                             <th width="30%"><span style="float:left">Specialization</span></th>
                             <th width="30%">Is it in your Career?</th>
                         </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><input type="text" name="attr_companion-career" value="Career" /></td>
-                            <td><input type="text" name="attr_companion-tree" value="Starting Specialization" /></td>
-                            <td><input type="text" name="attr_companion-specialization-career" value="Yes" disabled /></td>
-                            <!--<td><name="attr_specialization-cost" /></td>-->
-                        </tr>
-                    </tbody>
-                </table>
-                <fieldset class="repeating_companion-specialization">
-                    <table cellspacing="0" cellpadding="0" border="0">
+                        </thead>
                         <tbody>
+                        <tr>
+                            <td width="33.5%">
+                                <input name="attr_companion-career-name" type="text"/>
+                            </td><!--Career List-->
+                            <td width="33.5%">
+                                <input name="attr_companion-specialization" type="text"/>
+                            </td><!--Specialization List-->
+                            <td width="33.5%">
+                                <input type="text" name="attr_companion-specialization-career" value="Yes" disabled/>
+                            </td><!--Career Yes/No-->
+                        </tr>
+                        </tbody>
+                    </table>
+                    <fieldset class="repeating_companion-specialization">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
-                                <td width="33%">
+                                <td width="34%">
                                     <select name="attr_companion-career-list">
-                                        <option value="" disabled>*Edge of the Empire*</option>
-                                        <option value="Bounty Hunter">&nbsp;&nbsp;&nbsp;&nbsp;Bounty Hunter</option>
-                                        <option value="Colonist">&nbsp;&nbsp;&nbsp;&nbsp;Colonist</option>
-                                        <option value="Explorer">&nbsp;&nbsp;&nbsp;&nbsp;Explorer</option>
-                                        <option value="Hired Gun">&nbsp;&nbsp;&nbsp;&nbsp;Hired Gun</option>
-                                        <option value="Smuggler">&nbsp;&nbsp;&nbsp;&nbsp;Smuggler</option>
-                                        <option value="Technican">&nbsp;&nbsp;&nbsp;&nbsp;Technican</option>
-                                        <option value="" disabled>*Age of Rebellion*</option>
-                                        <option value="Ace">&nbsp;&nbsp;&nbsp;&nbsp;Ace</option>
-                                        <option value="Commander">&nbsp;&nbsp;&nbsp;&nbsp;Commander</option>
-                                        <option value="Diplomat">&nbsp;&nbsp;&nbsp;&nbsp;Diplomat</option>
-                                        <option value="Engineer">&nbsp;&nbsp;&nbsp;&nbsp;Engineer</option>
-                                        <option value="Soldier">&nbsp;&nbsp;&nbsp;&nbsp;Soldier</option>
-                                        <option value="Spy">&nbsp;&nbsp;&nbsp;&nbsp;Spy</option>
-                                        <option value="" disabled>*Force and Destiny*</option>
-                                        <option value="Consular">&nbsp;&nbsp;&nbsp;&nbsp;Consular</option>
-                                        <option value="Guardian">&nbsp;&nbsp;&nbsp;&nbsp;Guardian</option>
-                                        <option value="Mystic">&nbsp;&nbsp;&nbsp;&nbsp;Mystic</option>
-                                        <option value="Seeker">&nbsp;&nbsp;&nbsp;&nbsp;Seeker</option>
-                                        <option value="Sentinel">&nbsp;&nbsp;&nbsp;&nbsp;Sentinel</option>
-                                        <option value="Warrior">&nbsp;&nbsp;&nbsp;&nbsp;Warrior</option>
-                                        <option value="" disabled>*All*</option>
-                                        <option value="Universal">&nbsp;&nbsp;&nbsp;&nbsp;Universal</option>
+                                        <optgroup label="Edge of the Empire">
+                                            <option value="Bounty Hunter">Bounty Hunter</option>
+                                            <option value="Colonist">Colonist</option>
+                                            <option value="Explorer">Explorer</option>
+                                            <option value="Hired Gun">Hired Gun</option>
+                                            <option value="Smuggler">Smuggler</option>
+                                            <option value="Technican">Technican</option>
+                                        </optgroup>
+                                        <optgroup label="Age of Rebellion">
+                                            <option value="Ace">Ace</option>
+                                            <option value="Commander">Commander</option>
+                                            <option value="Diplomat">Diplomat</option>
+                                            <option value="Engineer">Engineer</option>
+                                            <option value="Soldier">Soldier</option>
+                                            <option value="Spy">Spy</option>
+                                        </optgroup>
+                                        <optgroup label="Force and Destiny">
+                                            <option value="Consular">Consular</option>
+                                            <option value="Guardian">Guardian</option>
+                                            <option value="Mystic">Mystic</option>
+                                            <option value="Seeker">Seeker</option>
+                                            <option value="Sentinel">Sentinel</option>
+                                            <option value="Warrior">Warrior</option>
+                                        </optgroup>
+                                        <optgroup label="All">
+                                            <option value="Universal">Universal</option>
+                                        </optgroup>
                                     </select>
                                 </td><!--Career List-->
-                                <td width="33%">
+                                <td width="35%">
                                     <select name="attr_companion-specialization">
-                                        <option value="" disabled>*Edge of the Empire*</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Bounty Hunter</option>
-                                        <option value="Assassin">&nbsp;&nbsp;&nbsp;&nbsp;Assassin</option>
-                                        <option value="Gadgeteer">&nbsp;&nbsp;&nbsp;&nbsp;Gadgeteer</option>
-                                        <option value="Survivalist">&nbsp;&nbsp;&nbsp;&nbsp;Survivalist</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Colonist</option>
-                                        <option value="Doctor">&nbsp;&nbsp;&nbsp;&nbsp;Doctor</option>
-                                        <option value="Politico">&nbsp;&nbsp;&nbsp;&nbsp;Politico</option>
-                                        <option value="Scholar">&nbsp;&nbsp;&nbsp;&nbsp;Scholar</option>
-                                        <option value="Entrepreneur">&nbsp;&nbsp;&nbsp;&nbsp;Entrepreneur</option>
-                                        <option value="Marshal">&nbsp;&nbsp;&nbsp;&nbsp;Marshal</option>
-                                        <option value="Performer">&nbsp;&nbsp;&nbsp;&nbsp;Performer</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Explorer</option>
-                                        <option value="Scout">&nbsp;&nbsp;&nbsp;&nbsp;Scout</option>
-                                        <option value="Fringer">&nbsp;&nbsp;&nbsp;&nbsp;Fringer</option>
-                                        <option value="Driver">&nbsp;&nbsp;&nbsp;&nbsp;Driver</option>
-                                        <option value="Archaeologist">&nbsp;&nbsp;&nbsp;&nbsp;Archaeologist</option>
-                                        <option value="Big-Game Hunter">&nbsp;&nbsp;&nbsp;&nbsp;Big-Game Hunter</option>
-                                        <option value="Trader">&nbsp;&nbsp;&nbsp;&nbsp;Trader</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Hired Gun</option>
-                                        <option value="Bodyguard">&nbsp;&nbsp;&nbsp;&nbsp;Bodyguard</option>
-                                        <option value="Demolitionist">&nbsp;&nbsp;&nbsp;&nbsp;Demolitionist</option>
-                                        <option value="Enforcer">&nbsp;&nbsp;&nbsp;&nbsp;Enforcer</option>
-                                        <option value="Heavy">&nbsp;&nbsp;&nbsp;&nbsp;Heavy</option>
-                                        <option value="Marauder">&nbsp;&nbsp;&nbsp;&nbsp;Marauder</option>
-                                        <option value="Mercenary Soldier">&nbsp;&nbsp;&nbsp;&nbsp;Mercenary Soldier</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Smuggler</option>
-                                        <option value="Pilot">&nbsp;&nbsp;&nbsp;&nbsp;Pilot</option>
-                                        <option value="Scoundrel">&nbsp;&nbsp;&nbsp;&nbsp;Scoundrel</option>
-                                        <option value="Thief">&nbsp;&nbsp;&nbsp;&nbsp;Thief</option>
-                                        <option value="Charmer">&nbsp;&nbsp;&nbsp;&nbsp;Charmer</option>
-                                        <option value="Gambler">&nbsp;&nbsp;&nbsp;&nbsp;Gambler</option>
-                                        <option value="Gunslinger">&nbsp;&nbsp;&nbsp;&nbsp;Gunslinger</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Technician</option>
-                                        <option value="Mechanic">&nbsp;&nbsp;&nbsp;&nbsp;Mechanic</option>
-                                        <option value="Outlaw Tech">&nbsp;&nbsp;&nbsp;&nbsp;Outlaw Tech</option>
-                                        <option value="Slicer">&nbsp;&nbsp;&nbsp;&nbsp;Slicer</option>
-                                        <option value="" disabled>*Age of Rebellion*</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Ace</option>
-                                        <option value="Driver">&nbsp;&nbsp;&nbsp;&nbsp;Driver</option>
-                                        <option value="Pilot">&nbsp;&nbsp;&nbsp;&nbsp;Pilot</option>
-                                        <option value="Gunner">&nbsp;&nbsp;&nbsp;&nbsp;Gunner</option>
-                                        <option value="Rigger">&nbsp;&nbsp;&nbsp;&nbsp;Rigger</option>
-                                        <option value="Hotshot">&nbsp;&nbsp;&nbsp;&nbsp;Hotshot</option>
-                                        <option value="Beast Rider">&nbsp;&nbsp;&nbsp;&nbsp;Beast Rider</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Commander</option>
-                                        <option value="Commodore">&nbsp;&nbsp;&nbsp;&nbsp;Commodore</option>
-                                        <option value="Squadron Leader">&nbsp;&nbsp;&nbsp;&nbsp;Squadron Leader</option>
-                                        <option value="Tactician">&nbsp;&nbsp;&nbsp;&nbsp;Tactician</option>
-                                        <option value="Figurehead">&nbsp;&nbsp;&nbsp;&nbsp;Figurehead</option>
-                                        <option value="Instructor">&nbsp;&nbsp;&nbsp;&nbsp;Instructor</option>
-                                        <option value="Strategist">&nbsp;&nbsp;&nbsp;&nbsp;Strategist</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Diplomat</option>
-                                        <option value="Ambassador">&nbsp;&nbsp;&nbsp;&nbsp;Ambassador</option>
-                                        <option value="Agitator">&nbsp;&nbsp;&nbsp;&nbsp;Agitator</option>
-                                        <option value="Quartermaster">&nbsp;&nbsp;&nbsp;&nbsp;Quartermaster</option>
-                                        <option value="Analyst">&nbsp;&nbsp;&nbsp;&nbsp;Analyst</option>
-                                        <option value="Advocate">&nbsp;&nbsp;&nbsp;&nbsp;Advocate</option>
-                                        <option value="Propagandist">&nbsp;&nbsp;&nbsp;&nbsp;Propagandist</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Engineer</option>
-                                        <option value="Mechanic">&nbsp;&nbsp;&nbsp;&nbsp;Mechanic</option>
-                                        <option value="Scientist">&nbsp;&nbsp;&nbsp;&nbsp;Scientist</option>
-                                        <option value="Saboteur">&nbsp;&nbsp;&nbsp;&nbsp;Saboteur</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Soldier</option>
-                                        <option value="Medic">&nbsp;&nbsp;&nbsp;&nbsp;Medic</option>
-                                        <option value="Sharpshooter">&nbsp;&nbsp;&nbsp;&nbsp;Sharpshooter</option>
-                                        <option value="Commando">&nbsp;&nbsp;&nbsp;&nbsp;Commando</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Spy</option>
-                                        <option value="Slicer">&nbsp;&nbsp;&nbsp;&nbsp;Slicer</option>
-                                        <option value="Infiltrator">&nbsp;&nbsp;&nbsp;&nbsp;Infiltrator</option>
-                                        <option value="Scout">&nbsp;&nbsp;&nbsp;&nbsp;Scout</option>
-                                        <option value="" disabled>*Force and Destiny*</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Consular</option>
-                                        <option value="Healer">&nbsp;&nbsp;&nbsp;&nbsp;Healer</option>
-                                        <option value="Niman Disciple">&nbsp;&nbsp;&nbsp;&nbsp;Niman Disciple</option>
-                                        <option value="Sage">&nbsp;&nbsp;&nbsp;&nbsp;Sage</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Guardian</option>
-                                        <option value="Armorer">&nbsp;&nbsp;&nbsp;&nbsp;Armorer</option>
-                                        <option value="Peace Keeper">&nbsp;&nbsp;&nbsp;&nbsp;Peace Keeper</option>
-                                        <option value="Protector">&nbsp;&nbsp;&nbsp;&nbsp;Protector</option>
-                                        <option value="Soresu Defender">&nbsp;&nbsp;&nbsp;&nbsp;Soresu Defender</option>
-                                        <option value="Warden">&nbsp;&nbsp;&nbsp;&nbsp;Warden</option>
-                                        <option value="Warleader">&nbsp;&nbsp;&nbsp;&nbsp;Warleader</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Mystic</option>
-                                        <option value="Seer">&nbsp;&nbsp;&nbsp;&nbsp;Seer</option>
-                                        <option value="Makashi Duelist">&nbsp;&nbsp;&nbsp;&nbsp;Makashi Duelist</option>
-                                        <option value="Advisor">&nbsp;&nbsp;&nbsp;&nbsp;Advisor</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Seeker</option>
-                                        <option value="Ataru Striker">&nbsp;&nbsp;&nbsp;&nbsp;Ataru Striker</option>
-                                        <option value="Hunter">&nbsp;&nbsp;&nbsp;&nbsp;Hunter</option>
-                                        <option value="Pathfinder">&nbsp;&nbsp;&nbsp;&nbsp;Pathfinder</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Sentinel</option>
-                                        <option value="Artisan">&nbsp;&nbsp;&nbsp;&nbsp;Artisan</option>
-                                        <option value="Shadow">&nbsp;&nbsp;&nbsp;&nbsp;Shadow</option>
-                                        <option value="Shien Expert">&nbsp;&nbsp;&nbsp;&nbsp;Shien Expert</option>
-                                        <option value="" disabled>&nbsp;&nbsp;Warrior</option>
-                                        <option value="Aggressor">&nbsp;&nbsp;&nbsp;&nbsp;Aggressor</option>
-                                        <option value="Shii-Cho Knight">&nbsp;&nbsp;&nbsp;&nbsp;Shii-Cho Knight</option>
-                                        <option value="Starfighter Ace">&nbsp;&nbsp;&nbsp;&nbsp;Starfighter Ace</option>
-                                        <option value="" disabled>**Universal**</option>
-                                        <option value="Force Sensitive Exile">&nbsp;&nbsp;&nbsp;&nbsp;Force Sensitive Exile</option>
-                                        <option value="Force Sensitive Emergent">&nbsp;&nbsp;&nbsp;&nbsp;Force Sensitive Emergent</option>
-                                        <option value="Recruit">&nbsp;&nbsp;&nbsp;&nbsp;Recruit</option>
+                                        <optgroup label="Edge of the Empire"></optgroup>
+                                        <optgroup label="Bounty Hunter">
+                                            <option value="Assassin">Assassin</option>
+                                            <option value="Gadgeteer">Gadgeteer</option>
+                                            <option value="Survivalist">Survivalist</option>
+                                        </optgroup>
+                                        <optgroup label="Colonist">
+                                            <option value="Doctor">Doctor</option>
+                                            <option value="Politico">Politico</option>
+                                            <option value="Scholar">Scholar</option>
+                                            <option value="Entrepreneur">Entrepreneur</option>
+                                            <option value="Marshal">Marshal</option>
+                                            <option value="Performer">Performer</option>
+                                        </optgroup>
+                                        <optgroup label="Explorer">
+                                            <option value="Scout">Scout</option>
+                                            <option value="Fringer">Fringer</option>
+                                            <option value="Driver">Driver</option>
+                                            <option value="Archaeologist">Archaeologist</option>
+                                            <option value="Big-Game Hunter">Big-Game Hunter</option>
+                                            <option value="Trader">Trader</option>
+                                        </optgroup>
+                                        <optgroup label="Hired Gun">
+                                            <option value="Bodyguard">Bodyguard</option>
+                                            <option value="Demolitionist">Demolitionist</option>
+                                            <option value="Enforcer">Enforcer</option>
+                                            <option value="Heavy">Heavy</option>
+                                            <option value="Marauder">Marauder</option>
+                                            <option value="Mercenary Soldier">Mercenary Soldier</option>
+                                        </optgroup>
+                                        <optgroup label="Smuggler">
+                                            <option value="Pilot">Pilot</option>
+                                            <option value="Scoundrel">Scoundrel</option>
+                                            <option value="Thief">Thief</option>
+                                            <option value="Charmer">Charmer</option>
+                                            <option value="Gambler">Gambler</option>
+                                            <option value="Gunslinger">Gunslinger</option>
+                                        </optgroup>
+                                        <optgroup label="Technician">
+                                            <option value="Mechanic">Mechanic</option>
+                                            <option value="Outlaw Tech">Outlaw Tech</option>
+                                            <option value="Slicer">Slicer</option>
+                                            <option value="Cyber Tech">Cyber Tech</option>
+                                            <option value="Droid Tech">Droid Tech</option>
+                                            <option value="Modder">Modder</option>
+                                        </optgroup>
+                                        <optgroup label="Age of Rebellion"></optgroup>
+                                        <optgroup label="Ace">
+                                            <option value="Driver">Driver</option>
+                                            <option value="Pilot">Pilot</option>
+                                            <option value="Gunner">Gunner</option>
+                                            <option value="Rigger">Rigger</option>
+                                            <option value="Hotshot">Hotshot</option>
+                                            <option value="Beast Rider">Beast Rider</option>
+                                        </optgroup>
+                                        <optgroup label="Commander">
+                                            <option value="Commodore">Commodore</option>
+                                            <option value="Squadron Leader">Squadron Leader</option>
+                                            <option value="Tactician">Tactician</option>
+                                            <option value="Figurehead">Figurehead</option>
+                                            <option value="Instructor">Instructor</option>
+                                            <option value="Strategist">Strategist</option>
+                                        </optgroup>
+                                        <optgroup label="Diplomat">
+                                            <option value="Ambassador">Ambassador</option>
+                                            <option value="Agitator">Agitator</option>
+                                            <option value="Quartermaster">Quartermaster</option>
+                                            <option value="Analyst">Analyst</option>
+                                            <option value="Advocate">Advocate</option>
+                                            <option value="Propagandist">Propagandist</option>
+                                        </optgroup>
+                                        <optgroup label="Engineer">
+                                            <option value="Mechanic">Mechanic</option>
+                                            <option value="Scientist">Scientist</option>
+                                            <option value="Saboteur">Saboteur</option>
+                                        </optgroup>
+                                        <optgroup label="Soldier">
+                                            <option value="Medic">Medic</option>
+                                            <option value="Sharpshooter">Sharpshooter</option>
+                                            <option value="Commando">Commando</option>
+                                        </optgroup>
+                                        <optgroup label="Spy">
+                                            <option value="Slicer">Slicer</option>
+                                            <option value="Infiltrator">Infiltrator</option>
+                                            <option value="Scout">Scout</option>
+                                        </optgroup>
+                                        <optgroup label="Force and Destiny"></optgroup>
+                                        <optgroup label="Consular">
+                                            <option value="Healer">Healer</option>
+                                            <option value="Niman Disciple">Niman Disciple</option>
+                                            <option value="Sage">Sage</option>
+                                        </optgroup>
+                                        <optgroup label="Guardian">
+                                            <option value="Armorer">Armorer</option>
+                                            <option value="Peace Keeper">Peace Keeper</option>
+                                            <option value="Protector">Protector</option>
+                                            <option value="Soresu Defender">Soresu Defender</option>
+                                            <option value="Warden">Warden</option>
+                                            <option value="Warleader">Warleader</option>
+                                        </optgroup>
+                                        <optgroup label="Mystic">
+                                            <option value="Seer">Seer</option>
+                                            <option value="Makashi Duelist">Makashi Duelist</option>
+                                            <option value="Advisor">Advisor</option>
+                                        </optgroup>
+                                        <optgroup label="Seeker">
+                                            <option value="Ataru Striker">Ataru Striker</option>
+                                            <option value="Hunter">Hunter</option>
+                                            <option value="Pathfinder">Pathfinder</option>
+                                            <option value="Executioner">Executioner</option>
+                                            <option value="Hermit">Hermit</option>
+                                            <option value="Navigator">Navigator</option>
+                                        </optgroup>
+                                        <optgroup label="Sentinel">
+                                            <option value="Artisan">Artisan</option>
+                                            <option value="Shadow">Shadow</option>
+                                            <option value="Shien Expert">Shien Expert</option>
+                                        </optgroup>
+                                        <optgroup label="Warrior">
+                                            <option value="Aggressor">Aggressor</option>
+                                            <option value="Shii-Cho Knight">Shii-Cho Knight</option>
+                                            <option value="Starfighter Ace">Starfighter Ace</option>
+                                        </optgroup>
+                                        <optgroup label="Universal">
+                                            <option value="Force Sensitive Exile">Force Sensitive Exile</option>
+                                            <option value="Force Sensitive Emergent">Force Sensitive Emergent</option>
+                                            <option value="Recruit">Recruit</option>
+                                        </optgroup>
                                     </select>
                                 </td><!--Specialization List-->
                                 <td width="30%">
@@ -8766,21 +5078,25 @@
                                 </td><!--Career Yes/No-->
                                 <td width="10%"></td><!--Placeholder for spacing-->
                             </tr>
-                        </tbody>
-                    </table>
-                </fieldset>
+                            </tbody>
+                        </table>
+                    </fieldset>
+                </div>
+                <div class="sheet-clear"></div>
             </div>
-            <div class="sheet-clear"></div>
         </div><!-- Career and Specialization List -->
-        <div class="sheet-row">
-            <div class="sheet-small-6 sheet-column">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th colspan="2">Description</th>
-                        </tr>
-                    </thead>
-                    <tbody>
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-career-toggle-small"></div>
+
+        <b>Description</b><input name="attr_companion-Description" value="1" checked="checked" style="width:96px;margin:-13px -20px 0 -80px" class="sheet-toggle sheet-description-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-description-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-6 sheet-column">
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <thead>
+                        <tr><th colspan="2">Description</th></tr>
+                        </thead>
+                        <tbody>
                         <tr>
                             <td><label>Gender:</label></td>
                             <td><input type="text" name="attr_companion-chargender" /></td>
@@ -8805,709 +5121,436 @@
                             <td><label>Eyes:</label></td>
                             <td><input type="text" name="attr_companion-chareyes" /></td>
                         </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-small-6 sheet-column">
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th>Notable Features</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><textarea rows="4" name="attr_companion-charfeatures"></textarea></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th>Other</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><textarea rows="4" name="attr_companion-charother"></textarea></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Description -->
-        <div class="sheet-row sheet-show-critical-table">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Companion Critical Injuries</h3>
-            </div>
-            <div class="sheet-small-9 sheet-column">
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn1" value="1" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName1" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange1" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice1" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity1" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea row="3" name="attr_critSummary1" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect1" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect1" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn1})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn2" value="2" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName2" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange2" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice2" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity2" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary2" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect2" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect2" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn2})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn3" value="3" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName3" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange3" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice3" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity3" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary3" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect3" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect3" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn3})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn4" value="4" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName4" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange4" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice4" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity4" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary4" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect4" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect4" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn4})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn5" value="5" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName5" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange5" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice5" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity5" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary5" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect5" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect5" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn5})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn6" value="6" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName6" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange6" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice6" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity6" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary6" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect6" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect6" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn6})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn7" value="7" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName7" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange7" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice7" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity7" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary7" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect7" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect7" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn7})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn8" value="8" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName8" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange8" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice8" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity8" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary8" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect8" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect8" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn8})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn9" value="9" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName9" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange9" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice9" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity9" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary9" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect9" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect9" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn9})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn10" value="10" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName10" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange10" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice10" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity10" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary10" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect10" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect10" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn10})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn11" value="11" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName11" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange11" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice11" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity11" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary11" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect11" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect11" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn11})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn12" value="12" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName12" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange12" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice12" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity12" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary12" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect12" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect12" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn12})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn13" value="13" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName13" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange13" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice13" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity13" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary13" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect13" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect13" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn13})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn14" value="14" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName14" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange14" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice14" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity14" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary14" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect14" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect14" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn14})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critOn15" value="15" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critName15" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critRange15" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critDice15" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critSeverity15" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critSummary15" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critEffect15" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critEffect15" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|@{critOn15})">Heal</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-small-3 sheet-column">
-                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Critical roll offset:</label></td>
-                            <td><input type="text" name="attr_critAddOffset" value="" /></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll)">Roll Critical</button></td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <label>Critical number:</label>
-                                <input type="text" name="attr_critAddRangeNum" value="" />
-                            </td>
-                            <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|@{critAddRangeNum})">Add Critical</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Critical Table -->
-    </div><!-- Info Tab -->
-    <div class="sheet-tab-content sheet-tab-companion-combat">
-        <div class="sheet-small-12 sheet-column">
-            <br />
-            <br />
-            <div class="sheet-clear"></div>
-            <div class="sheet-attachments-wrapper">
-                <input type="checkbox" name="attr_companion-character_init" class="sheet-view-attachments" />
-                <label class="sheet-view-attachments">Show Initiative</label>
-                <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <table>
-                                    <tr>
-                                        <td><label>What kind of Initiative Slot?</label></td>
-                                        <td><label>PC<input type="radio" name="attr_companion-npc-pc" value="pcinit" checked="checked" /></label></td>
-                                        <td><label>NPC<input type="radio" name="attr_companion-npc-pc" value="npcinit" /></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                        <td><label></label></td>
-                                    </tr>
-                                </table>
-                                <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
-                                    <tr>
-                                        <td><label>Cool (if prepared):</label></td>
-                                        <td>
-                                            <input class="sheet-yd" type="hidden" name="attr_companion-yCoolInit" value="(((@{companion-presence} + @{rankCool}) - abs(@{companion-presence} - @{rankCool})) / 2)" disabled><span></span>
-                                            <input class="sheet-gd" type="hidden" name="attr_companion-gCoolInit" value="((((@{companion-presence} + @{rankCool}) + abs(@{companion-presence} - @{rankCool})) / 2) - @{yCoolInit})" disabled><span></span>
-                                        </td>
-                                        <td><label>Modifiers</label><input name='attr_companion-initiativeCoolDice' type="text" /></td>
-                                        <td>
-                                            <button type='roll' name='roll_companion-VigilanceInit' value='!eed @{npc-pc} characterID(@{character_id}) label(skill: Companion-Initiative Cool) skill(@{companion-rankCool}|@{presence}) @{initiativeCoolDice} @{dicePool}'></button>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><label>Vigilance (if unexpected):</label></td>
-                                        <td>
-                                            <input class="sheet-yd" type="hidden" name="attr_companion-yVigilanceInit" value="(((@{companion-willpower} + @{rankVigilance}) - abs(@{companion-willpower} - @{rankVigilance})) / 2)" disabled><span></span>
-                                            <input class="sheet-gd" type="hidden" name="attr_companion-gVigilanceInit" value="((((@{companion-willpower} + @{rankVigilance}) + abs(@{companion-willpower} - @{rankVigilance})) / 2) - @{yVigilanceInit})" disabled><span></span>
-                                        </td>
-                                        <td><label>Modifiers</label><input name='attr_companion-initiativeVigDice' type="text" /></td>
-                                        <td>
-                                            <button type='roll' name='roll_companion-VigilanceInit' value='!eed @{npc-pc} characterID(@{character_id}) label(skill: Companion-Initiative Vigilance) skill(@{companion-rankVigilance}|@{willpower}) @{initiativeVigDice} @{dicePool}'></button>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <br />
-        </div><!-- Initiative -->
-        <div class="sheet-small-12 sheet-column">
-            <h3>Weapons</h3><br />
-            <fieldset class="repeating_companion-weapons">
-                <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td></td>
-                            <td>
-                                <label>Damage</label>
-                                <input name='attr_companion-damage' type="text" value="0" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Critical</label>
-                                <input name='attr_companion-critical' type="text" value="0" />
-                            </td>
-                            <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(Companion Weapon:@{companion-weaponmake}|Damage:@{companion-damage}|Critical:@{companion-critical}|Range:@{companion-weaponrange}|Special:@{companion-weaponspecial}) @{companion-weapondice} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) @{companion-weaponskill} @{companion-weaponcondition} @{companion-dicePool} (gmdice)'></button></td>
-                            <td>
-                                <label>Encum</label>
-                                <input name='attr_companion-encum' type="text" value="0" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>HP</label>
-                                <input name='attr_companion-hp' type="text" value="0" />
-                            </td>
-                            <td></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Make / Model:</label></td>
-                            <td><input name='attr_companion-weaponmake' type="text" /></td>
-                            <td><label>Range:</label></td>
-                            <td>
-                                <select name='attr_companion-weaponrange'>
-                                    <option value="Engaged">Engaged</option>
-                                    <option value="Short">Short</option>
-                                    <option vaule="Medium">Medium</option>
-                                    <option value="Long">Long</option>
-                                    <option value="Extreme">Extreme</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Weapon Type:</label></td>
-                            <td><input name='attr_companion-weapontype' type="text" /></td>
-                            <td><label>Skill:</label></td>
-                            <td>
-                                <select name='attr_companion-weaponskill'>
-                                    <option value="skill(@{companion-rankBrawl}|@{companion-brawn})">Brawl</option>
-                                    <option value="skill(@{companion-rankGunnery}|@{companion-agility})">Gunnery</option>
-                                    <option value="skill(@{companion-rankMelee}|@{companion-brawn})">Melee</option>
-                                    <option value="skill(@{companion-rankLight}|@{companion-agility})">Ranged - Light</option>
-                                    <option value="skill(@{companion-rankHeavy}|@{companion-agility})">Ranged - Heavy</option>
-                                    <option value="skill(@{companion-rankLightsaber}|@{companion-charLightsaber})">Lightsaber</option>
-                                    <option value="skill(@{companion-rankMechanics}|@{companion-Intellect})">Mechanics</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Modifiers:</label></td>
-                            <td><input name='attr_companion-weapondice' type="text" /></td>
-                            <td><label>Condition:</label></td>
-                            <td>
-                                <select name='attr_companion-weaponcondition'>
-                                    <option value="">New</option>
-                                    <option value="1blk">Minor</option>
-                                    <option value="1p">Moderate</option>
-                                    <option value="unusableWeapon">Major</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">&nbsp;</td>
-                            <td><label>Special:</label></td>
-                            <td><textarea rows="3" type="text" name="attr_companion-weaponspecial"></textarea></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="sheet-attachments-wrapper">
-                    <input type="checkbox" name="attr_companion-weaponattchments" class="sheet-view-attachments" />
-                    <label class="sheet-view-attachments">View Attachments</label>
-                    <div class="sheet-clear"></div>
-                    <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr>
-                                <th>Attachment Name</th>
-                                <th>Hard Points</th>
-                                <th>Base Modifiers</th>
-                                <th>Modifications</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td><input name='attr_companion-weaponattch1' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachp1' type="number" /></td>
-                                <td><input name='attr_companion-weaponattachbase1' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachmod1' type="text" /></td>
-                            </tr>
-                            <tr>
-                                <td><input name='attr_companion-weaponattch2' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachp2' type="number" /></td>
-                                <td><input name='attr_companion-weaponattachbase2' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachmod2' type="text" /></td>
-                            </tr>
-                            <tr>
-                                <td><input name='attr_companion-weaponattch3' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachp3' type="number" /></td>
-                                <td><input name='attr_companion-weaponattachbase3' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachmod3' type="text" /></td>
-                            </tr>
-                            <tr>
-                                <td><input name='attr_companion-weaponattch4' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachp4' type="number" /></td>
-                                <td><input name='attr_companion-weaponattachbase4' type="text" /></td>
-                                <td><input name='attr_companion-weaponattachmod4' type="text" /></td>
-                            </tr>
                         </tbody>
                     </table>
-                </div><!-- Weapon Attachments -->
-                <br />
-            </fieldset>
-        </div><!-- Weapons -->
-        <div class="sheet-row" style="margin-top:10px">
-            <div class="sheet-small-12 sheet-column">
-                <table class="sheet-characteristics" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <label>Brawn</label>
-                                <input name='attr_companion-brawn' type="number" max="7" min="1" value="1" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Agility</label>
-                                <input name='attr_companion-agility' type="number" max="7" min="1" value="1" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Intellect</label>
-                                <input name='attr_companion-intellect' type="number" max="7" min="1" value="1" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Cunning</label>
-                                <input name='attr_companion-cunning' type="number" max="7" min="1" value="1" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Willpower</label>
-                                <input name='attr_companion-willpower' type="number" max="7" min="1" value="1" />
-                            </td>
-                            <td></td>
-                            <td>
-                                <label>Presence</label>
-                                <input name='attr_companion-presence' type="number" max="7" min="1" value="1" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+                </div>
+                <div class="sheet-small-6 sheet-column">
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <thead><tr><th>Notable Features</th></tr></thead>
+                        <tbody><tr><td><textarea rows="4" name="attr_companion-charfeatures"></textarea></td></tr></tbody>
+                    </table>
+                    <table cellspacing="0" cellpadding="0" border="0">
+                        <thead><tr><th>Other</th></tr></thead>
+                        <tbody><tr><td><textarea rows="4" name="attr_companion-charother"></textarea></td></tr></tbody>
+                    </table>
+                </div>
+                <div class="sheet-clear"></div>
             </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Characteristics -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Skills</h3>
-                <div>
-                    <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+        </div><!-- Description -->
+    </div><!-- General Information -->
+    <div class="sheet-tab-content sheet-tab-companion-combat">
+        <b>Initiative</b><input name="attr_companion-Initiative" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-initiative-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-initiative-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Initiative</h3>
+                    <input name="attr_companion-Initiative" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-initiative-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-initiative-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
                             <tr>
-                                <th>Skill Name</th>
+                                <td>
+                                    <table>
+                                        <tr>
+                                            <td><label>What kind of Initiative Slot?</label></td>
+                                            <td><label>PC<input type="radio" name="attr_companion-npc-pc" value="pcinit" checked="checked" /></label></td>
+                                            <td><label>NPC<input type="radio" name="attr_companion-npc-pc" value="npcinit" /></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                        </tr>
+                                    </table>
+                                    <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
+                                        <tr>
+                                            <td><label>Cool (if prepared):</label></td>
+                                            <td>
+                                                <input class="sheet-yd" type="hidden" name="attr_companion-yCoolInit" value="(@{companion-yCool})" disabled><span></span>
+                                                <input class="sheet-gd" type="hidden" name="attr_companion-gCoolInit" value="(@{companion-gCool})" disabled><span></span>
+                                            </td>
+                                            <td><label>Modifiers</label><input name='attr_companion-initiativeCoolDice' type="text" /></td>
+                                            <td><button type='roll' name='roll_companion-CoolInit' value='!eed @{companion-npc-pc} characterID(@{character_id}) label(skill:Companion-Initiative Cool|Companion Name:@{companion-name}) skill(@{companion-rankCool}|@{companion-presence}) @{companion-initiativeCoolDice} @{dicePool}'></button></td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Vigilance (if unexpected):</label></td>
+                                            <td>
+                                                <input class="sheet-yd" type="hidden" name="attr_companion-yVigilanceInit" value="(@{companion-yVigilance})" disabled><span></span>
+                                                <input class="sheet-gd" type="hidden" name="attr_companion-gVigilanceInit" value="(@{companion-gVigilance})" disabled><span></span>
+                                            </td>
+                                            <td><label>Modifiers</label><input name='attr_companion-initiativeVigDice' type="text" /></td>
+                                            <td><button type='roll' name='roll_companion-VigilanceInit' value='!eed @{companion-npc-pc} characterID(@{character_id}) label(skill: Companion-Initiative Vigilance|Companion Name:@{companion-name}) skill(@{companion-rankVigilance}|@{companion-willpower}) @{companion-initiativeVigDice} @{dicePool}'></button></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Initiative -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-initiative-toggle-small"></div>
+
+        <b>Weapons</b><input name="attr_companion-Weapons" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-weapons-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-weapons-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Weapons</h3>
+                    <input name="attr_companion-Weapons" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-weapon-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-weapon-section">
+                        <fieldset class="repeating_companion-weapons">
+                            <b>Weapon</b><input name="attr_companion-Weapon" value="1" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-weapon-toggle" type="checkbox" checked="checked"/><span></span>
+                            <div class="sheet-weapon">
+                                <div class="sheet-row">
+                                    <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td></td>
+                                            <td>
+                                                <label>Damage</label>
+                                                <input name='attr_companion-damage' type="text" value="0" />
+                                            </td>
+                                            <td></td>
+                                            <td>
+                                                <label>Critical</label>
+                                                <input name='attr_companion-critical' type="text" value="0" />
+                                            </td>
+                                            <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(Weapon:Companion @{companion-weaponmake}|Companion Name:@{companion-name}|Damage:@{companion-damage}|Critical:@{companion-critical}|Range:@{companion-weaponrange}|Qualities:@{companion-weaponspecial}) @{companion-weapondice} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) @{companion-weaponskill} @{companion-weaponcondition} @{dicePool} (gmdice)'></button></td>
+                                            <td>
+                                                <label>Encum</label>
+                                                <input name='attr_companion-encum' type="text" value="0" />
+                                            </td>
+                                            <td></td>
+                                            <td>
+                                                <label>HP</label>
+                                                <input name='attr_companion-hp' type="text" value="0" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Make / Model:</label></td>
+                                            <td><input name='attr_companion-weaponmake' type="text" /></td>
+                                            <td><label>Range:</label></td>
+                                            <td>
+                                                <select name='attr_companion-weaponrange'>
+                                                    <option value="Engaged">Engaged</option>
+                                                    <option value="Short">Short</option>
+                                                    <option value="Medium">Medium</option>
+                                                    <option value="Long">Long</option>
+                                                    <option value="Extreme">Extreme</option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Weapon Type:</label></td>
+                                            <td><input name='attr_companion-weapontype' type="text" /></td>
+                                            <td><label>Skill:</label></td>
+                                            <td>
+                                                <select name='attr_companion-weaponskill'>
+                                                    <option value="skill(@{companion-rankBrawl}|@{companion-brawn})">Brawl</option>
+                                                    <option value="skill(@{companion-rankGunnery}|@{companion-agility})">Gunnery</option>
+                                                    <option value="skill(@{companion-rankMelee}|@{companion-brawn})">Melee</option>
+                                                    <option value="skill(@{companion-rankLight}|@{companion-agility})">Ranged - Light</option>
+                                                    <option value="skill(@{companion-rankHeavy}|@{companion-agility})">Ranged - Heavy</option>
+                                                    <option value="skill(@{companion-rankLightsaber}|@{companion-charLightsaber})">Lightsaber</option>
+                                                    <option value="skill(@{companion-rankMechanics}|@{companion-intellect})">Mechanics</option>
+                                                    <option value="skill(@{companion-rankResilience}|@{companion-brawn})">Resilience</option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Modifiers:</label></td>
+                                            <td><input name='attr_companion-weapondice' type="text" /></td>
+                                            <td><label>Condition:</label></td>
+                                            <td>
+                                                <select name='attr_companion-weaponcondition'>
+                                                    <option value="">New</option>
+                                                    <option value="1blk">Minor</option>
+                                                    <option value="1p">Moderate</option>
+                                                    <option value="unusableWeapon">Major</option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Features:</label></td>
+                                            <td><textarea rows="2" name="attr_companion-weaponfeatures"></textarea></td>
+                                            <td><label>Qualities:</label></td>
+                                            <td><textarea rows="3" name="attr_companion-weaponspecial"></textarea></td>
+                                        </tr>
+                                        <tr><td colspan="4">&nbsp;</td></tr>
+                                        </tbody>
+                                    </table>
+                                    <div class="sheet-attachments-wrapper">
+                                        <input type="checkbox" name="attr_companion-weaponattchments" class="sheet-view-attachments" />
+                                        <label class="sheet-view-attachments">View Attachments</label>
+                                        <div class="sheet-clear"></div>
+                                        <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                            <thead>
+                                            <tr>
+                                                <th>Attachment Name</th>
+                                                <th>Hard Points</th>
+                                                <th>Base Modifiers</th>
+                                                <th>Modifications</th>
+                                                <th>Book &amp; Page</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach1' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP1' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase1"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod1"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage1"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach2' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP2' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase2"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod2"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage2"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach3' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP3' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase3"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod3"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage3"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach4' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP4' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase4"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod4"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage4"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach5' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP5' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase5"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod5"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage5"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach6' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP6' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase6"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod6"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage6"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-weaponattach7' type="text" /></td>
+                                                <td><input name='attr_companion-weaponattachHP7' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachbase7"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-weaponattachmod7"></textarea></td>
+                                                <td><input type="text" name="attr_companion-weaponattachbookpage7"/></td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div><!-- Weapon Attachments -->
+                                    <div class="sheet-clear"></div>
+                                </div>
+                            </div><!-- Weapon Info -->
+                            <div class="sheet-clear"></div>
+                        </fieldset>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Weapons -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-weapons-toggle-small"></div>
+
+        <b>Characteristics</b><input name="attr_companion-Characteristics" value="1" checked="checked" style="width:117px;margin:-13px -20px 0 -101px" class="sheet-toggle sheet-characteristic-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-characteristic-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Characteristics</h3>
+                    <input name="attr_companion-Characteristics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-characteristic-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-characteristic-section">
+                        <table class="sheet-characteristics" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <label>Brawn</label>
+                                    <input name='attr_companion-brawn' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Agility</label>
+                                    <input name='attr_companion-agility' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Intellect</label>
+                                    <input name='attr_companion-intellect' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Cunning</label>
+                                    <input name='attr_companion-cunning' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Willpower</label>
+                                    <input name='attr_companion-willpower' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Presence</label>
+                                    <input name='attr_companion-presence' type="number" max="7" min="1" value="1" />
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Characteristics -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-characteristic-toggle-small"></div>
+
+        <!--TODO fix companion name no longer showing up in skill rolls by adding |Companion Name:@{companion-name} to the label-->
+        <b>Skills</b><input name="attr_companion-Skills" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-skills-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-skills-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Skills</h3>
+                    <input name="attr_companion-Skills" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-skills-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-skills-section">
+                        <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>General Skills</th>
                                 <th>Career</th>
                                 <th colspan="2">Rank</th>
                                 <th colspan="2">
                                     <span style="float:left">Modifiers</span>
+                                    <div class="sheet-tips">
+                                        <div class="sheet-help-def sheet-help">
+                                            <div class="sheet-icon">
+                                                <span class="sheet-icon-question">?</span>
+                                            </div>
+                                            <div class="sheet-help-content" style="margin-left:-225px">
+                                                <h5>Adding Dice</h5>
+                                                <p>
+                                                    To add additional dice write the number of
+                                                    dice and color letter you want to roll.
+                                                    Additionally you can add some dice symbols
+                                                    to automatically add to the roll.
+                                                </p>
+                                                <p>Example: <b>1b 1g</b> outputs <span class="sheet-icon-B"></span><span class="sheet-icon-G"></span></p>
+                                                <p>
+                                                    b -> Blue = Boost, blk -> BLack = Setback
+                                                    g -> Green = Ability, y -> Yellow = Proficiency
+                                                    p -> Purple = Difficulty, r -> Red = Challenge
+                                                    w -> White = Force
+                                                    s = Success, f = Failure, a = Advantage, t = Threat
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div><!-- Modifier Help -->
                                 </th>
                             </tr>
-                        </thead>
-                        <tbody>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <label>Astrogation (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillAstrogation' type="checkbox" value="1"></td>
+                                <td>
+                                    <input type="number" name="attr_companion-rankAstrogation" max="6" min="0" value="0" />
+                                </td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yAstrogation" value="(((@{companion-intellect} + @{companion-rankAstrogation}) - abs(@{companion-intellect} - @{companion-rankAstrogation})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gAstrogation" value="((((@{companion-intellect} + @{companion-rankAstrogation}) + abs(@{companion-intellect} - @{companion-rankAstrogation})) / 2) - @{companion-yAstrogation})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceAstrogation" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Astrogation' value='!eed characterID(@{character_id}) label(skill:Astrogation) @{companion-diceAstrogation} skill(@{companion-rankAstrogation}|@{companion-intellect}|Astrogation) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Astrogation-->
+                            <tr>
+                                <td>
+                                    <label>Athletics (Br)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillAthletics' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankAthletics" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yAthletics" value="(((@{companion-brawn} + @{companion-rankAthletics}) - abs(@{companion-brawn} - @{companion-rankAthletics})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gAthletics" value="((((@{companion-brawn} + @{companion-rankAthletics}) + abs(@{companion-brawn} - @{companion-rankAthletics})) / 2) - @{companion-yAthletics})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceAthletics" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Athletics' value='!eed characterID(@{character_id}) label(skill:Athletics) @{companion-diceAthletics} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankAthletics}|@{companion-brawn}|Athletics) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Athletics-->
+                            <tr>
+                                <td>
+                                    <label>Charm (Pr)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillCharm' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankCharm" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yCharm" value="(((@{companion-presence} + @{companion-rankCharm}) - abs(@{companion-presence} - @{companion-rankCharm})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gCharm" value="((((@{companion-presence} + @{companion-rankCharm}) + abs(@{companion-presence} - @{companion-rankCharm})) / 2) - @{companion-yCharm})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceCharm" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Charm' value='!eed characterID(@{character_id}) label(skill:Charm) @{companion-diceCharm} skill(@{companion-rankCharm}|@{companion-presence}|Charm) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Charm-->
+                            <tr>
+                                <td>
+                                    <label>Coercion (Will)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillCoercion' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankCoercion" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yCoercion" value="(((@{companion-willpower} + @{companion-rankCoercion}) - abs(@{companion-willpower} - @{companion-rankCoercion})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gCoercion" value="((((@{companion-willpower} + @{companion-rankCoercion}) + abs(@{companion-willpower} - @{companion-rankCoercion})) / 2) - @{companion-yCoercion})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceCoercion" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Coercion' value='!eed characterID(@{character_id}) label(skill:Coercion) @{companion-diceCoercion} skill(@{companion-rankCoercion}|@{companion-willpower}|Coercion) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Coercion-->
+                            <tr>
+                                <td>
+                                    <label>Computers (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillComputers' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankComputers" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yComputers" value="(((@{companion-intellect} + @{companion-rankComputers}) - abs(@{companion-intellect} - @{companion-rankComputers})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gComputers" value="((((@{companion-intellect} + @{companion-rankComputers}) + abs(@{companion-intellect} - @{companion-rankComputers})) / 2) - @{companion-yComputers})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceComputers" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Computers' value='!eed characterID(@{character_id}) label(skill:Computers) @{companion-diceComputers} skill(@{companion-rankComputers}|@{companion-intellect}|Computers) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Computers-->
                             <tr>
                                 <td>
                                     <label>Cool (Pr)</label>
@@ -9524,8 +5567,278 @@
                                         <input type="text" name="attr_companion-diceCool" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_companion-Cool' value='!eed characterID(@{character_id}) label(skill:Companion Cool) @{companion-diceCool} skill(@{companion-rankCool}|@{companion-presence}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Cool' value='!eed characterID(@{character_id}) label(skill:Cool) @{companion-diceCool} skill(@{companion-rankCool}|@{companion-presence}|Cool) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Cool-->
+                            <tr>
+                                <td>
+                                    <label>Coordination (Ag)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillCoordination' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankCoordination" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yCoordination" value="(((@{companion-agility} + @{companion-rankCoordination}) - abs(@{companion-agility} - @{companion-rankCoordination})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gCoordination" value="((((@{companion-agility} + @{companion-rankCoordination}) + abs(@{companion-agility} - @{companion-rankCoordination})) / 2) - @{companion-yCoordination})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceCoordination" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Coordination' value='!eed characterID(@{character_id}) label(skill:Coordination) @{companion-diceCoordination} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankCoordination}|@{companion-agility}|Coordination) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Coordination-->
+                            <tr>
+                                <td>
+                                    <label>Deception (Cun)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillDeception' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankDeception" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yDeception" value="(((@{companion-cunning} + @{companion-rankDeception}) - abs(@{companion-cunning} - @{companion-rankDeception})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gDeception" value="((((@{companion-cunning} + @{companion-rankDeception}) + abs(@{companion-cunning} - @{companion-rankDeception})) / 2) - @{companion-yDeception})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceDeception" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Deception' value='!eed characterID(@{character_id}) label(skill:Deception) @{companion-diceDeception} skill(@{companion-rankDeception}|@{companion-cunning}|Deception) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Deception-->
+                            <tr>
+                                <td>
+                                    <label>Discipline (Will)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillDiscipline' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankDiscipline" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yDiscipline" value="(((@{companion-willpower} + @{companion-rankDiscipline}) - abs(@{companion-willpower} - @{companion-rankDiscipline})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gDiscipline" value="((((@{companion-willpower} + @{companion-rankDiscipline}) + abs(@{companion-willpower} - @{companion-rankDiscipline})) / 2) - @{companion-yDiscipline})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceDiscipline" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Discipline' value='!eed characterID(@{character_id}) label(skill:Discipline) @{companion-diceDiscipline} skill(@{companion-rankDiscipline}|@{companion-willpower}|Discipline) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Discipline-->
+                            <tr>
+                                <td>
+                                    <label>Leadership (Pr)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillLeadership' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankLeadership" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yLeadership" value="(((@{companion-presence} + @{companion-rankLeadership}) - abs(@{companion-presence} - @{companion-rankLeadership})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gLeadership" value="((((@{companion-presence} + @{companion-rankLeadership}) + abs(@{companion-presence} - @{companion-rankLeadership})) / 2) - @{companion-yLeadership})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceLeadership" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Leadership' value='!eed characterID(@{character_id}) label(skill:Leadership) @{companion-diceLeadership} skill(@{companion-rankLeadership}|@{companion-presence}|Leadership) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Leadership-->
+                            <tr>
+                                <td>
+                                    <label>Mechanics (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillMechanics' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankMechanics" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yMechanics" value="(((@{companion-intellect} + @{companion-rankMechanics}) - abs(@{companion-intellect} - @{companion-rankMechanics})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gMechanics" value="((((@{companion-intellect} + @{companion-rankMechanics}) + abs(@{companion-intellect} - @{companion-rankMechanics})) / 2) - @{companion-yMechanics})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceMechanics" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Mechanics' value='!eed characterID(@{character_id}) label(skill:Mechanics) @{companion-diceMechanics} skill(@{companion-rankMechanics}|@{companion-intellect}|Mechanics) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Mechanics-->
+                            <tr>
+                                <td>
+                                    <label>Medicine (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillMedicine' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankMedicine" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yMedicine" value="(((@{companion-intellect} + @{companion-rankMedicine}) - abs(@{companion-intellect} - @{companion-rankMedicine})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gMedicine" value="((((@{companion-intellect} + @{companion-rankMedicine}) + abs(@{companion-intellect} - @{companion-rankMedicine})) / 2) - @{companion-yMedicine})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceMedicine" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Medicine' value='!eed characterID(@{character_id}) label(skill:Medicine) @{companion-diceMedicine} skill(@{companion-rankMedicine}|@{companion-intellect}|Medicine) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Medicine-->
+                            <tr>
+                                <td>
+                                    <label>Negotiation (Pr)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillNegotiation' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankNegotiation" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yNegotiation" value="(((@{companion-presence} + @{companion-rankNegotiation}) - abs(@{companion-presence} - @{companion-rankNegotiation})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gNegotiation" value="((((@{companion-presence} + @{companion-rankNegotiation}) + abs(@{companion-presence} - @{companion-rankNegotiation})) / 2) - @{companion-yNegotiation})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceNegotiation" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Negotiation' value='!eed characterID(@{character_id}) label(skill:Negotiation) @{companion-diceNegotiation} skill(@{companion-rankNegotiation}|@{companion-presence}|Negotiation) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Negotiation-->
+                            <tr>
+                                <td>
+                                    <label>Perception (Cun)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillPerception' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankPerception" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yPerception" value="(((@{companion-cunning} + @{companion-rankPerception}) - abs(@{companion-cunning} - @{companion-rankPerception})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gPerception" value="((((@{companion-cunning} + @{companion-rankPerception}) + abs(@{companion-cunning} - @{companion-rankPerception})) / 2) - @{companion-yPerception})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-dicePerception" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Perception' value='!eed characterID(@{character_id}) label(skill:Perception) @{companion-dicePerception} skill(@{companion-rankPerception}|@{companion-cunning}|Perception) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Perception-->
+                            <tr>
+                                <td>
+                                    <label>Piloting - Planetary (Ag)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillPlanetary' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankPlanetary" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yPlanetary" value="(((@{companion-agility} + @{companion-rankPlanetary}) - abs(@{companion-agility} - @{companion-rankPlanetary})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gPlanetary" value="((((@{companion-agility} + @{companion-rankPlanetary}) + abs(@{companion-agility} - @{companion-rankPlanetary})) / 2) - @{companion-yPlanetary})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-dicePlanetary" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Planetary' value='!eed characterID(@{character_id}) label(skill:Piloting - Planetary) @{companion-dicePlanetary} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankPlanetary}|@{companion-agility}|PilotingPlanetary) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Piloting (Planetary)-->
+                            <tr>
+                                <td>
+                                    <label>Piloting - Space (Ag)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillSpace' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankSpace" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-ySpace" value="(((@{companion-agility} + @{companion-rankSpace}) - abs(@{companion-agility} - @{companion-rankSpace})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gSpace" value="((((@{companion-agility} + @{companion-rankSpace}) + abs(@{companion-agility} - @{companion-rankSpace})) / 2) - @{companion-ySpace})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceSpace" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Space' value='!eed characterID(@{character_id}) label(skill:Piloting - Space) @{companion-diceSpace} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankSpace}|@{companion-agility}|PilotingSpace) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Piloting (Space)-->
+                            <tr>
+                                <td>
+                                    <label>Resilience (Br)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillResilience' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankResilience" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yResilience" value="(((@{companion-brawn} + @{companion-rankResilience}) - abs(@{companion-brawn} - @{companion-rankResilience})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gResilience" value="((((@{companion-brawn} + @{companion-rankResilience}) + abs(@{companion-brawn} - @{companion-rankResilience})) / 2) - @{companion-yResilience})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceResilience" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Resilience' value='!eed characterID(@{character_id}) label(skill:Resilience) @{companion-diceResilience} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankResilience}|@{companion-brawn}|Resilience) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Resilience-->
+                            <tr>
+                                <td>
+                                    <label>Skulduggery (Cun)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillSkulduggery' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankSkulduggery" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-ySkulduggery" value="(((@{companion-cunning} + @{companion-rankSkulduggery}) - abs(@{companion-cunning} - @{companion-rankSkulduggery})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gSkulduggery" value="((((@{companion-cunning} + @{companion-rankSkulduggery}) + abs(@{companion-cunning} - @{companion-rankSkulduggery})) / 2) - @{companion-ySkulduggery})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceSkulduggery" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Skulduggery' value='!eed characterID(@{character_id}) label(skill:Skulduggery) @{companion-diceSkulduggery} skill(@{companion-rankSkulduggery}|@{companion-cunning}|Skulduggery) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Skulduggery-->
+                            <tr>
+                                <td>
+                                    <label>Stealth (Ag)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillStealth' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankStealth" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yStealth" value="(((@{companion-agility} + @{companion-rankStealth}) - abs(@{companion-agility} - @{companion-rankStealth})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gStealth" value="((((@{companion-agility} + @{companion-rankStealth}) + abs(@{companion-agility} - @{companion-rankStealth})) / 2) - @{companion-yStealth})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceStealth" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Stealth' value='!eed characterID(@{character_id}) label(skill:Stealth) @{companion-diceStealth} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankStealth}|@{companion-agility}|Stealth) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Stealth-->
+                            <tr>
+                                <td>
+                                    <label>Streetwise (Cun)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillStreetwise' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankStreetwise" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yStreetwise" value="(((@{companion-cunning} + @{companion-rankStreetwise}) - abs(@{companion-cunning} - @{companion-rankStreetwise})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gStreetwise" value="((((@{companion-cunning} + @{companion-rankStreetwise}) + abs(@{companion-cunning} - @{companion-rankStreetwise})) / 2) - @{companion-yStreetwise})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceStreetwise" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Streetwise' value='!eed characterID(@{character_id}) label(skill:Streetwise) @{companion-diceStreetwise} skill(@{companion-rankStreetwise}|@{companion-cunning}|Streetwise) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Streetwise-->
+                            <tr>
+                                <td>
+                                    <label>Survival (Cun)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillSurvival' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankSurvival" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-ySurvival" value="(((@{companion-cunning} + @{companion-rankSurvival}) - abs(@{companion-cunning} - @{companion-rankSurvival})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gSurvival" value="((((@{companion-cunning} + @{companion-rankSurvival}) + abs(@{companion-cunning} - @{companion-rankSurvival})) / 2) - @{companion-ySurvival})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceSurvival" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Survival' value='!eed characterID(@{character_id}) label(skill:Survival) @{companion-diceSurvival} skill(@{companion-rankSurvival}|@{companion-cunning}|Survival) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Survival-->
                             <tr>
                                 <td>
                                     <label>Vigilance (Will)</label>
@@ -9542,8 +5855,20 @@
                                         <input type="text" name="attr_companion-diceVigilance" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_companion-Vigilance' value='!eed characterID(@{character_id}) label(skill:Companion Vigilance) @{companion-diceVigilance} skill(@{companion-rankVigilance}|@{companion-willpower}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Vigilance' value='!eed characterID(@{character_id}) label(skill:Vigilance) @{companion-diceVigilance} skill(@{companion-rankVigilance}|@{companion-willpower}|Vigilance) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Vigilance-->
+                            </tbody>
+                        </table><!--General Skills Section-->
+                        <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Combat Skills</th>
+                                <th>Career</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">Mods</th>
+                            </tr>
+                            </thead>
+                            <tbody>
                             <tr>
                                 <td valign="middle">
                                     <label>Lightsaber</label>
@@ -9568,7 +5893,7 @@
                                         <input type="text" name="attr_companion-diceLightsaber" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_Lightsaber' value='!eed characterID(@{character_id}) label(skill:Companion Lightsaber) @{companion-diceLightsaber} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) skill(@{companion-rankLightsaber}|@{companion-charLightsaber}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Lightsaber' value='!eed characterID(@{character_id}) label(skill:Lightsaber) @{companion-diceLightsaber} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankLightsaber}|@{companion-charLightsaber}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--LightSaber-->
                             <tr>
                                 <td>
@@ -9586,7 +5911,7 @@
                                         <input type="text" name="attr_companion-diceBrawl" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_Brawl' value='!eed characterID(@{character_id}) label(skill:Companion Brawl) @{companion-diceBrawl} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) skill(@{companion-rankBrawl}|@{companion-brawn}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Brawl' value='!eed characterID(@{character_id}) label(skill:Brawl) @{companion-diceBrawl} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankBrawl}|@{companion-brawn}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Brawl-->
                             <tr>
                                 <td>
@@ -9604,7 +5929,7 @@
                                         <input type="text" name="attr_companion-diceGunnery" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_Gunnery' value='!eed characterID(@{character_id}) label(skill:Companion Gunnery) @{companion-diceGunnery} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) skill(@{companion-rankGunnery}|@{companion-agility}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Gunnery' value='!eed characterID(@{character_id}) label(skill:Gunnery) @{companion-diceGunnery} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankGunnery}|@{companion-agility}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Gunnery-->
                             <tr>
                                 <td>
@@ -9622,11 +5947,11 @@
                                         <input type="text" name="attr_companion-diceMelee" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_Melee' value='!eed characterID(@{character_id}) label(skill:Companion Melee) @{companion-diceMelee} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) skill(@{companion-rankMelee}|@{companion-brawn}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Melee' value='!eed characterID(@{character_id}) label(skill:Melee) @{companion-diceMelee} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankMelee}|@{companion-brawn}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Melee-->
                             <tr>
                                 <td>
-                                    <label>Ranged - Light  (Ag)</label>
+                                    <label>Ranged - Light (Ag)</label>
                                 </td>
                                 <td><input name='attr_companion-careerskillLight' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_companion-rankLight" max="6" min="0" value="0" /></td>
@@ -9640,7 +5965,7 @@
                                         <input type="text" name="attr_companion-diceLight" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_Light' value='!eed characterID(@{character_id}) label(skill:Companion Ranged - Light) @{companion-diceLight} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) skill(@{companion-rankLight}|@{companion-agility}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Light' value='!eed characterID(@{character_id}) label(skill:Ranged - Light) @{companion-diceRanged - Light} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankLight}|@{companion-agility}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Ranged - Light-->
                             <tr>
                                 <td>
@@ -9658,12 +5983,150 @@
                                         <input type="text" name="attr_companion-diceHeavy" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_Heavy' value='!eed characterID(@{character_id}) label(skill:Companion Ranged - Heavy) @{companion-diceHeavy} encum(@{companion-encumbrancemax}|@{companion-encumbrance}) skill(@{companion-rankHeavy}|@{companion-agility}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_Heavy' value='!eed characterID(@{character_id}) label(skill:Ranged - Heavy) @{companion-diceRanged - Heavy} encum(@{encumbrancemax}|@{encumbrance}) skill(@{companion-rankHeavy}|@{companion-agility}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Ranged - Heavy-->
-                        </tbody>
-                    </table><!--Cool & Vigilance-->
-                    <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                            </tbody>
+                        </table><!--Combat Skills Section-->
+                        <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Knowledge Skills</th>
+                                <th>Career</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">Mods</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <label>Core Worlds (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillCore' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankCore" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yCore" value="(((@{companion-intellect} + @{companion-rankCore}) - abs(@{companion-intellect} - @{companion-rankCore})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gCore" value="((((@{companion-intellect} + @{companion-rankCore}) + abs(@{companion-intellect} - @{companion-rankCore})) / 2) - @{companion-yCore})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceCore" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Core' value='!eed characterID(@{character_id}) label(skill:Core Worlds) @{companion-diceCore Worlds} skill(@{companion-rankCore}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Core Worlds-->
+                            <tr>
+                                <td>
+                                    <label>Education (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillEducation' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankEducation" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yEducation" value="(((@{companion-intellect} + @{companion-rankEducation}) - abs(@{companion-intellect} - @{companion-rankEducation})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gEducation" value="((((@{companion-intellect} + @{companion-rankEducation}) + abs(@{companion-intellect} - @{companion-rankEducation})) / 2) - @{companion-yEducation})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceEducation" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Education' value='!eed characterID(@{character_id}) label(skill:Education) @{companion-diceEducation} skill(@{companion-rankEducation}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Education-->
+                            <tr>
+                                <td>
+                                    <label>Lore (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillLore' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankLore" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yLore" value="(((@{companion-intellect} + @{companion-rankLore}) - abs(@{companion-intellect} - @{companion-rankLore})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gLore" value="((((@{companion-intellect} + @{companion-rankLore}) + abs(@{companion-intellect} - @{companion-rankLore})) / 2) - @{companion-yLore})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceLore" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Lore' value='!eed characterID(@{character_id}) label(skill:Lore) @{companion-diceLore} skill(@{companion-rankLore}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Lore-->
+                            <tr>
+                                <td>
+                                    <label>Outer Rim (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillOuter' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankOuter" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yOuter" value="(((@{companion-intellect} + @{companion-rankOuter}) - abs(@{companion-intellect} - @{companion-rankOuter})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gOuter" value="((((@{companion-intellect} + @{companion-rankOuter}) + abs(@{companion-intellect} - @{companion-rankOuter})) / 2) - @{companion-yOuter})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceOuter" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Outer' value='!eed characterID(@{character_id}) label(skill:Outer Rim) @{companion-diceOuter Rim} skill(@{companion-rankOuter}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Outer Rim-->
+                            <tr>
+                                <td>
+                                    <label>Underworld (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillUnderworld' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankUnderworld" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yUnderworld" value="(((@{companion-intellect} + @{companion-rankUnderworld}) - abs(@{companion-intellect} - @{companion-rankUnderworld})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gUnderworld" value="((((@{companion-intellect} + @{companion-rankUnderworld}) + abs(@{companion-intellect} - @{companion-rankUnderworld})) / 2) - @{companion-yUnderworld})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceUnderworld" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Underworld' value='!eed characterID(@{character_id}) label(skill:Underworld) @{companion-diceUnderworld} skill(@{companion-rankUnderworld}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Underworld-->
+                            <tr>
+                                <td>
+                                    <label>Xenology (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillXenology' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankXenology" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yXenology" value="(((@{companion-intellect} + @{companion-rankXenology}) - abs(@{companion-intellect} - @{companion-rankXenology})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gXenology" value="((((@{companion-intellect} + @{companion-rankXenology}) + abs(@{companion-intellect} - @{companion-rankXenology})) / 2) - @{companion-yXenology})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceXenology" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Xenology' value='!eed characterID(@{character_id}) label(skill:Xenology) @{companion-diceXenology} skill(@{companion-rankXenology}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Xenology-->
+                            <tr>
+                                <td>
+                                    <label>Warfare (Int)</label>
+                                </td>
+                                <td><input name='attr_companion-careerskillWarfare' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankWarfare" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-yWarfare" value="(((@{companion-intellect} + @{companion-rankWarfare}) - abs(@{companion-intellect} - @{companion-rankWarfare})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gWarfare" value="((((@{companion-intellect} + @{companion-rankWarfare}) + abs(@{companion-intellect} - @{companion-rankWarfare})) / 2) - @{companion-yWarfare})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-diceWarfare" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Warfare' value='!eed characterID(@{character_id}) label(skill:Warfare) @{companion-diceWarfare} skill(@{companion-rankWarfare}|@{companion-intellect}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Warfare-->
+                            </tbody>
+                        </table><!--Knowledge Skills Section-->
+                        <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th>Custom Skills</th>
                                 <th>Char</th>
@@ -9671,12 +6134,12 @@
                                 <th colspan="2">Rank</th>
                                 <th colspan="2">Mods</th>
                             </tr>
-                        </thead>
-                        <tbody>
+                            </thead>
+                            <tbody>
                             <tr>
-                                <td><input type="text" name="attr_companion-customskillname" /></td>
+                                <td><input type="text" name="attr_companion-customskillname1" /></td>
                                 <td>
-                                    <select name="attr_companion-charcustomskillname">
+                                    <select name="attr_companion-charcustomskillname1">
                                         <option value="@{companion-brawn}">Brawn</option><!-- encum not working -->
                                         <option value="@{companion-agility}">Agility</option>
                                         <option value="@{companion-intellect}">Intellect</option>
@@ -9685,348 +6148,435 @@
                                         <option value="@{companion-presence}">Presence</option>
                                     </select>
                                 </td>
-                                <td><input name='attr_companion-careerskillcustomskillname' type="checkbox" value=""></td>
-                                <td><input type="number" name="attr_companion-rankcustomskillname" max="6" min="0" value="0" /></td>
+                                <td><input name='attr_companion-careerskillcustomskillname1' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankcustomskillname1" max="6" min="0" value="0" /></td>
                                 <td>
-                                    <input class="sheet-yd" type="hidden" name="attr_companion-ycustomskillname" value="(((@{companion-charcustomskillname} + @{companion-rankcustomskillname}) - abs(@{companion-charcustomskillname} - @{companion-rankcustomskillname})) / 2)" disabled><span></span>
-                                    <input class="sheet-gd" type="hidden" name="attr_companion-gcustomskillname" value="((((@{companion-charcustomskillname} + @{companion-rankcustomskillname}) + abs(@{companion-charcustomskillname} - @{companion-rankcustomskillname})) / 2) - @{companion-ycustomskillname})" disabled><span></span>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-ycustomskillname1" value="(((@{companion-charcustomskillname1} + @{companion-rankcustomskillname1}) - abs(@{companion-charcustomskillname1} - @{companion-rankcustomskillname1})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gcustomskillname1" value="((((@{companion-charcustomskillname1} + @{companion-rankcustomskillname1}) + abs(@{companion-charcustomskillname1} - @{companion-rankcustomskillname1})) / 2) - @{companion-ycustomskillname1})" disabled><span></span>
                                 </td>
                                 <td>
                                     <div class="sheet-dice-icon"></div>
                                     <div class="sheet-dice-input">
-                                        <input type="text" name="attr_companion-dicecustomskillname" />
+                                        <input type="text" name="attr_companion-dicecustomskillname1" />
                                     </div>
                                 </td>
-                                <td><button type='roll' name='roll_companion-customskillname' value='!eed characterID(@{character_id}) label(skill:Companion @{companion-customskillname}) @{companion-dicecustomskillname} skill(@{companion-rankcustomskillname}|@{companion-charcustomskillname}) @{dicePool} (gmdice)'></button></td>
+                                <td><button type='roll' name='roll_customskillname1' value='!eed characterID(@{character_id}) label(skill:@{companion-customskillname1}) @{companion-dicecustomskillname1} skill(@{companion-rankcustomskillname1}|@{companion-charcustomskillname1}|@{companion-customskillname1}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 1-->
+                            <tr>
+                                <td><input type="text" name="attr_companion-customskillname2" /></td>
+                                <td>
+                                    <select name="attr_companion-charcustomskillname2">
+                                        <option value="@{companion-brawn}">Brawn</option>
+                                        <option value="@{companion-agility}">Agility</option>
+                                        <option value="@{companion-intellect}">Intellect</option>
+                                        <option value="@{companion-cunning}">Cunning</option>
+                                        <option value="@{companion-willpower}">Willpower</option>
+                                        <option value="@{companion-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_companion-careerskillcustomskillname2' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_companion-rankcustomskillname2" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_companion-ycustomskillname2" value="(((@{companion-charcustomskillname2} + @{companion-rankcustomskillname2}) - abs(@{companion-charcustomskillname2} - @{companion-rankcustomskillname2})) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_companion-gcustomskillname2" value="((((@{companion-charcustomskillname2} + @{companion-rankcustomskillname2}) + abs(@{companion-charcustomskillname2} - @{companion-rankcustomskillname2})) / 2) - @{companion-ycustomskillname2})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_companion-dicecustomskillname2" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_customskillname2' value='!eed characterID(@{character_id}) label(skill:@{companion-customskillname2}) @{companion-dicecustomskillname2} skill(@{companion-rankcustomskillname2}|@{companion-charcustomskillname2}|@{companion-customskillname2}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 2-->
+                            </tbody>
+                        </table><!--Custom Skills Section-->
+                    </div>
+                </div>
+            </div>
+        </div><!--Skills List-->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-skills-toggle-small"></div>
+
+        <b>Talents &amp; Abilities</b><input name="attr_companion-talents-abilities" value="1" checked="checked" style="width:137px;margin:-13px -20px 0 -121px" class="sheet-toggle sheet-talents-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-talents-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Talents and Special Abilities</h3>
+                    <input name="attr_companion-Talents-and-Special-Abilities" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-talents-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-talents-section">
+                        <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th style="width:50%">Name</th>
+                                <th style="width:50%">Ability Summary</th>
                             </tr>
-                        </tbody>
-                    </table><!--Skill Heading-->
-                    <fieldset class="repeating_companion-skills">
-                        <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_companion-talents">
+                            <table class="sheet-talent">
+                                <tbody>
                                 <tr>
-                                    <td><input type="text" name="attr_companion-customskillname" /></td>
-                                    <td>
-                                        <select name="attr_companion-charcustomskillname">
-                                            <option value="@{companion-brawn}">Brawn</option><!-- encum not working -->
-                                            <option value="@{companion-agility}">Agility</option>
-                                            <option value="@{companion-intellect}">Intellect</option>
-                                            <option value="@{companion-cunning}">Cunning</option>
-                                            <option value="@{companion-willpower}">Willpower</option>
-                                            <option value="@{companion-presence}">Presence</option>
-                                        </select>
+                                    <td style="width:50%" colspan="5">
+                                        <input type="text" name="attr_companion-talentname" />
                                     </td>
-                                    <td><input name='attr_companion-careerskillcustomskillname' type="checkbox" value=""></td>
-                                    <td><input type="number" name="attr_companion-rankcustomskillname" max="6" min="0" value="0" /></td>
-                                    <td>
-                                        <input class="sheet-yd" type="hidden" name="attr_companion-ycustomskillname" value="(((@{companion-charcustomskillname} + @{companion-rankcustomskillname}) - abs(@{companion-charcustomskillname} - @{companion-rankcustomskillname})) / 2)" disabled><span></span>
-                                        <input class="sheet-gd" type="hidden" name="attr_companion-gcustomskillname" value="((((@{companion-charcustomskillname} + @{companion-rankcustomskillname}) + abs(@{companion-charcustomskillname} - @{companion-rankcustomskillname})) / 2) - @{companion-ycustomskillname})" disabled><span></span>
+                                    <td style="width:50%" rowspan="2">
+                                        <textarea rows="3" name="attr_companion-talentsummary"></textarea>
                                     </td>
+                                </tr>
+                                <tr>
+                                    <td><label>Rank:</label></td>
+                                    <td><input type="text" name="attr_companion-talentrank" /></td>
                                     <td>
-                                        <div class="sheet-dice-icon"></div>
-                                        <div class="sheet-dice-input">
-                                            <input type="text" name="attr_companion-dicecustomskillname" />
+                                        <div class="sheet-switch">
+                                            <input type="radio" class="sheet-switch-input-on" name="attr_companion-passiveActive" value="passive" title="Passive" checked="checked">
+                                            <input type="radio" class="sheet-switch-input-off" name="attr_companion-passiveActive" value="active" title="Active">
+                                            <span class="switch-selection"></span>
                                         </div>
                                     </td>
-                                    <td><button type='roll' name='roll_companion-customskillname' value='!eed characterID(@{character_id}) label(skill:Companion @{companion-customskillname}) @{companion-dicecustomskillname} skill(@{companion-rankcustomskillname}|@{companion-charcustomskillname}) @{dicePool} (gmdice)'></button></td>
+                                    <td><label>Page:</label></td>
+                                    <td><input type="text" name="attr_companion-talentpagenum" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset><!--Other Skills-->
-                </div><!-- Skills -->
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Skills List -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3>Talents and Special Abilities</h3>
-                <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th style="width:50%">Name</th>
-                            <th style="width:50%">Ability Summary</th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_companion-skills">
-                    <table class="sheet-talent">
-                        <tbody>
-                            <tr>
-                                <td style="width:50%" colspan="5">
-                                    <input type="text" name="attr_companion-talentname" />
-                                </td>
-                                <td style="width:50%" rowspan="2">
-                                    <textarea rows="3" type="text" name="attr_companion-talentsummary"></textarea>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Rank:</label></td>
-                                <td><input type="text" name="attr_companion-talentrank" /></td>
-                                <td>
-                                    <div class="sheet-switch">
-                                        <input type="radio" class="sheet-switch-input-on" name="attr_companion-passiveActive" value="passive" title="Passive" checked="checked">
-                                        <input type="radio" class="sheet-switch-input-off" name="attr_companion-passiveActive" value="active" title="Active">
-                                        <span class="switch-selection"></span>
-                                    </div>
-                                </td>
-                                <td><label>Page:</label></td>
-                                <td><input type="text" name="attr_companion-talentpagenum" /></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </fieldset>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Talents and Special Abilities -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3>Force Powers</h3>
-                <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th style="width:50%">Name</th>
-                            <th style="width:50%">Power Summary</th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_companion-powers">
-                    <table class="sheet-talent">
-                        <tbody>
-                            <tr>
-                                <td style="width:50%" colspan="5">
-                                    <input type="text" name="attr_companion-forcepowername" />
-                                </td>
-                                <td style="width:50%" rowspan="3">
-                                    <textarea rows="4" type="text" name="attr_companion-powersummary"></textarea>
-                                </td>
-                                <td rowspan="3">
-                                    <button type='roll' name='roll_force' value='!eed characterID(@{character_id}) label(skill:Companion Force Power|Power Name: @{companion-forcepowername}) @{companion-forceavailable}w @{companion-dicePool}'></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><label>Available:</label></td>
-                                <td><input type="number" name="attr_companion-forceavailable" value="@{companion-forcerating}-@{companion-forcecommitted}" disabled></td>
-                                <td></td>
-                                <td><label>Page:</label></td>
-                                <td><input type="text" name="attr_companion-powerpagenum" /></td>
-                            </tr>
-                            <tr>
-                                <td colspan="5">
-                                    &nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div class="sheet-attachments-wrapper">
-                        <input type="checkbox" name="attr_companion-powerupgrades" class="sheet-view-attachments" />
-                        <label class="sheet-view-attachments">View Upgrades</label>
-                        <div class="sheet-clear"></div>
-                        <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                            <thead>
-                                <tr>
-                                    <th>Upgrade</th>
-                                    <th>Level</th>
-                                    <th>Description</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td><input type="text" name='attr_companion-forceupgradetype1'></td>
-                                    <td><input name='attr_companion-controlpowerlevel1' type="number" /></td>
-                                    <td><textarea rows="3" name='attr_companion-controlpowerdesc1' type="text"></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name='attr_companion-forceupgradetype2'></td>
-                                    <td><input name='attr_companion-magpowerlevel2' type="number" /></td>
-                                    <td><textarea rows="3" name='attr_companion-magpowerdesc2' type="text"></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name='attr_companion-forceupgradetype3'></td>
-                                    <td><input name='attr_companion-strpowerlevel3' type="number" /></td>
-                                    <td><textarea rows="3" name='attr_companion-strpowerdesc3' type="text"></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name='attr_companion-forceupgradetype4'></td>
-                                    <td><input name='attr_companion-rangepowerlevel4' type="number" /></td>
-                                    <td><textarea rows="3" name='attr_companion-rangepowerdesc4' type="text"></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name='attr_companion-forceupgradetype5'></td>
-                                    <td><input name='attr_companion-rangepowerlevel5' type="number" /></td>
-                                    <td><textarea rows="3" name='attr_companion-rangepowerdesc5' type="text"></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name='attr_companion-forceupgradetype6'></td>
-                                    <td><input name='attr_companion-rangepowerlevel6' type="number" /></td>
-                                    <td><textarea rows="3" name='attr_companion-rangepowerdesc6' type="text"></textarea></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div><!-- end attachment wrapper -->
-                </fieldset>
-            </div>
-        </div><!-- Force Powers -->
-    </div><!-- Combat Tab -->
-    <div class="sheet-tab-content sheet-tab-companion-inventory">
-        <div class="sheet-row">
-            <div class="sheet-row">
-                <div class="sheet-small-12 sheet-column">
-                    <h3>Armor</h3>
-                    <fieldset class="repeating_armors">
-                        <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
-                                <tr>
-                                    <td></td>
-                                    <td>
-                                        <label>Soak</label>
-                                        <input name='attr_companion-soak' type="text" value="0" />
-                                    </td>
-                                    <td></td>
-                                    <td>
-                                        <label>Defense</label>
-                                        <input name='attr_companion-defense' type="text" value="0" />
-                                    </td>
-                                    <td></td>
-                                    <td>
-                                        <label>Encum</label>
-                                        <input name='attr_companion-encum' type="text" value="0" />
-                                    </td>
-                                    <td></td>
-                                    <td>
-                                        <label>HP</label>
-                                        <input name='attr_companion-hp' type="text" value="0" />
-                                    </td>
-                                    <td></td>
-                                </tr>
-                            </tbody>
-                        </table><!-- Armor Top Stats -->
-                        <table cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
-                                <tr>
-                                    <td><label>Make / Model:</label></td>
-                                    <td><input name='attr_companion-armormake' type="text" /></td>
-                                    <td><label></label></td>
-                                    <td><input name='attr_companion-armorrarity' type="hidden" disabled /></td>
-                                    <td><label>Condition:</label></td>
-                                    <td>
-                                        <select name='attr_companion-armorcondition'>
-                                            <option value="">New</option>
-                                            <option value="1blk">Minor</option>
-                                            <option value="1p">Moderate</option>
-                                            <option value="unusableWeapon">Major</option>
-                                        </select>
-                                    </td>
-                                    <td><label></label></td>
-                                    <td><input name='attr_companion-armortype' type="hidden" disabled /></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Book &amp; Page:</label></td>
-                                    <td><input name='attr_companion-armor_bookpage' type="text" /></td>
-                                    <td>Rarity:</td>
-                                    <td><input name='attr_companion-armor_rarity' type="number" min="1" max="10" /></td>
-                                    <td><label>Restricted:</label></td>
-                                    <td>
-                                        <select name='attr_companion-armor_restrict'>
-                                            <option value="no">No</option>
-                                            <option value="yes">Yes</option>
-                                        </select>
-                                    </td>
-                                    <td>Value:</td>
-                                    <td><input name='attr_companion-armor_value' type="text" /></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Special:</label></td>
-                                    <td><textarea rows="3" type="text" name="attr_companion-armorspecial"></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">&nbsp;</td>
-                                    <td><label></label></td>
-                                    <td><input name='attr_companion-armordice' type="hidden" disabled /></td>
-                                </tr>
-                            </tbody>
-                        </table><!-- Armor Info -->
-                        <div class="sheet-attachments-wrapper">
-                            <input type="checkbox" name="attr_companion-armorattchments" class="sheet-view-attachments" />
-                            <label class="sheet-view-attachments">View Attachments</label>
-                            <div class="sheet-clear"></div>
-                            <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
-                                <thead>
-                                    <tr>
-                                        <th>Attachment Name</th>
-                                        <th>Hard Points</th>
-                                        <th>Base Modifiers</th>
-                                        <th>Modifications</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td><input name='attr_companion-armorattch1' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachp1' type="number" /></td>
-                                        <td><input name='attr_companion-armorattachbase1' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachmod1' type="text" /></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input name='attr_companion-armorattch2' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachp2' type="number" /></td>
-                                        <td><input name='attr_companion-armorattachbase2' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachmod2' type="text" /></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input name='attr_companion-armorattch3' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachp3' type="number" /></td>
-                                        <td><input name='attr_companion-armorattachbase3' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachmod3' type="text" /></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input name='attr_companion-armorattch4' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachp4' type="number" /></td>
-                                        <td><input name='attr_companion-armorattachbase4' type="text" /></td>
-                                        <td><input name='attr_companion-armorattachmod4' type="text" /></td>
-                                    </tr>
                                 </tbody>
                             </table>
-                        </div><!-- Armor Attachments -->
-                        <br />
-                    </fieldset>
+                        </fieldset>
+                    </div>
                 </div>
-            </div><!-- Armor -->
+            </div>
+        </div><!-- Talents and Special Abilities -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-talents-toggle-small"></div>
+
+        <b>Force Powers</b><input name="attr_companion-Force-Powers" value="1" checked="checked" style="width:110px;margin:-13px -20px 0 -94px" class="sheet-toggle sheet-force-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-force-toggle-small">
             <div class="sheet-row">
                 <div class="sheet-small-12 sheet-column">
-                    <h3>Cybernetics</h3>
-                    <table class="sheet-cybernetics" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                    <h3 class="sheet-section-header">Force Powers</h3>
+                    <input name="attr_companion-Force-Powers" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-force-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-force-section">
+                        <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th style="width:50%">Name</th>
+                                <th style="width:50%">Power Summary</th>
+                            </tr>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_companion-powers">
+                            <table class="sheet-talent">
+                                <tbody>
+                                <tr>
+                                    <td style="width:50%" colspan="5"><input type="text" name="attr_companion-forcepowername" /></td>
+                                    <td style="width:50%" rowspan="3"><textarea rows="4" name="attr_companion-powersummary"></textarea></td>
+                                    <td rowspan="3"><button type='roll' name='roll_ForceSkill' value=@{companion-ForceSkill}></button></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Force Dice Available:</label></td>
+                                    <td><input type="number" name="attr_companion-forceavailable" value="@{companion-forcerating}-@{companion-forcecommitted}" disabled></td>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input type="text" name="attr_companion-powerpagenum" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Skill List</label></td>
+                                    <td colspan="2">
+                                        <select name='attr_companion-ForceSkill'>
+                                            <option value="!eed characterID(@{character_id}) label(skill:Companion Force Power |Power Name:@{companion-forcepowername}) @{companion-forceavailable}w @{dicePool}">No Skill</option>
+                                            <optgroup label="General Skills">
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-brawn,companion-rankAthletics) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Athletics|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Athletics</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-presence,companion-rankCharm) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Charm|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Charm</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-presence,companion-rankCoercion) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Coercion|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Coercion</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-presence,companion-rankCool) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Cool|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Cool</option>
+                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:companion-agility,companion-rankCoordination) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Coordination|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Coordination</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-cunning,companion-rankDeception) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Deception|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Deception</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-willpower,companion-rankDiscipline) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Discipline|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Discipline</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-presence,companion-rankLeadership) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Leadership|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Leadership</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-intellect,companion-rankMedicine) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Medicine|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Medicine</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-presence,companion-rankNegotiation) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Negotiation|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Negotiation</option>
+                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:companion-agility,companion-rankPlanetary) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Piloting [Planetary]|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Piloting (Planetary)</option>
+                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:companion-agility,companion-rankSpace) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Piloting [Space]|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Piloting (Space)</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-brawn,companion-rankResilience) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Resilience|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Resilience</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-willpower,companion-rankVigilance) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Vigilance|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Vigilance</option>
+                                            </optgroup>
+                                            <optgroup label="Combat Skills">
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-brawn,companion-rankBrawl) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Brawl|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Brawl</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-agility,companion-rankLight) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Ranged (Light)|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Ranged (Light)</option>
+                                                <option value="!eed rollPlayer(character:@{name}|skill:companion-brawn,companion-rankHeavy) label(skill:Companion Force Power|Companion Name: @{companion-name}|Skill Name: Ranged (Heavy)|Power Name:@{companion-forcepowername}) @{companion-ForceSkillDice} @{companion-forceavailable}w @{dicePool} (gmdice)">Ranged (Heavy)</option>
+                                            </optgroup>
+                                        </select>
+                                    </td><!--Skill List-->
+                                </tr>
+                                <tr>
+                                    <td><label>Modifiers</label></td>
+                                    <td><input name='attr_companion-ForceSkillDice' type="text" /></td>
+                                </tr>
+                                <tr><td colspan="5">&nbsp;</td></tr>
+                                </tbody>
+                            </table>
+                            <div class="sheet-attachments-wrapper">
+                                <input type="checkbox" name="attr_companion-powerupgrades" class="sheet-view-attachments" />
+                                <label class="sheet-view-attachments">View Upgrades</label>
+                                <div class="sheet-clear"></div>
+                                <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th>Upgrade</th>
+                                        <th>Rank</th>
+                                        <th>XP Cost</th>
+                                        <th>Description</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype1'></td>
+                                        <td><input name='attr_companion-forceupgrade1' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost1' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc1'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype2'></td>
+                                        <td><input name='attr_companion-forceupgrade2' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost2' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc2'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype3'></td>
+                                        <td><input name='attr_companion-forceupgrade3' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc3'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype4'></td>
+                                        <td><input name='attr_companion-forceupgrade4' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc4'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype5'></td>
+                                        <td><input name='attr_companion-forceupgrade' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc5'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype6'></td>
+                                        <td><input name='attr_companion-forceupgrade6' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc6'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype7'></td>
+                                        <td><input name='attr_companion-forceupgrade7' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc7'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype8'></td>
+                                        <td><input name='attr_companion-forceupgrade8' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc8'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype9'></td>
+                                        <td><input name='attr_companion-forceupgrade9' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc9'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype10'></td>
+                                        <td><input name='attr_companion-forceupgrade10' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc10'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_companion-forceupgradetype11'></td>
+                                        <td><input name='attr_companion-forceupgrade11' type="number" /></td>
+                                        <td><input name='attr_companion-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_companion-forceupgradedesc11'></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div><!--Companion Force Power Upgrades-->
+                        </fieldset>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Force Powers -->
+        <div class="sheet-clear"></div>
+    </div><!-- Combat Tab -->
+    <div class="sheet-tab-content sheet-tab-companion-inventory">
+        <b>Armor</b><input name="attr_companion-Armor" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-armor-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-armor-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Armor</h3>
+                    <input name="attr_companion-Armor" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-armor-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-armor-section">
+                        <fieldset class="repeating_armors">
+                            <div class="sheet-row">
+                                <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td></td>
+                                        <td>
+                                            <label>Soak</label>
+                                            <input name='attr_companion-soak' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <label>Defense</label>
+                                            <input name='attr_companion-defense' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <label>Encum</label>
+                                            <input name='attr_companion-armor-encum' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <label>HP</label>
+                                            <input name='attr_companion-armor-hp' type="text" value="0" />
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                    </tbody>
+                                </table><!-- Armor Top Stats -->
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Make / Model:</label></td>
+                                        <td><input name='attr_companion-armormake' type="text" /></td>
+                                        <td><label>Condition:</label></td>
+                                        <td>
+                                            <select name='attr_companion-armorcondition'>
+                                                <option value="">New</option>
+                                                <option value="1blk">Minor</option>
+                                                <option value="1p">Moderate</option>
+                                                <option value="unusableWeapon">Major</option>
+                                            </select>
+                                        </td>
+                                        <td><label></label></td>
+                                        <td><input name='attr_companion-armortype' type="hidden" disabled /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Book &amp; Page:</label></td>
+                                        <td><input name='attr_companion-armor_bookpage' type="text" /></td>
+                                        <td><label>Rarity</label></td>
+                                        <td><input name='attr_companion-armor_rarity' type="number" min="1" max="10" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Restricted:</label></td>
+                                        <td>
+                                            <select name='attr_companion-armor_restrict'>
+                                                <option value="no">No</option>
+                                                <option value="yes">Yes</option>
+                                            </select>
+                                        </td>
+                                        <td><label>Value</label></td>
+                                        <td><input name='attr_companion-armor_value' type="text" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Features:</label></td>
+                                        <td><textarea rows="2" name="attr_companion-armorfeatures"></textarea></td>
+                                        <td><label>Qualities:</label></td>
+                                        <td><textarea rows="3" name="attr_companion-armorspecial"></textarea></td>
+                                    </tr>
+                                    <tr><td colspan="4">&nbsp;</td></tr>
+                                    </tbody>
+                                </table><!-- Armor Info -->
+                                <div class="sheet-attachments-wrapper">
+                                    <div class="sheet-attachments-wrapper">
+                                        <input type="checkbox" name="attr_companion-armorattchments" class="sheet-view-attachments" />
+                                        <label class="sheet-view-attachments">View Attachments</label>
+                                        <div class="sheet-clear"></div>
+                                        <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                            <thead>
+                                            <tr>
+                                                <th>Attachment Name</th>
+                                                <th>Hard Points</th>
+                                                <th>Base Modifiers</th>
+                                                <th>Modifications</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <tr>
+                                                <td><input name='attr_companion-armorattch1' type="text" /></td>
+                                                <td><input name='attr_companion-armorattachp1' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachbase1"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachmod1"></textarea></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-armorattch2' type="text" /></td>
+                                                <td><input name='attr_companion-armorattachp2' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachbase2"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachmod2"></textarea></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-armorattch3' type="text" /></td>
+                                                <td><input name='attr_companion-armorattachp3' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachbase3"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachmod3"></textarea></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_companion-armorattch4' type="text" /></td>
+                                                <td><input name='attr_companion-armorattachp4' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachbase4"></textarea></td>
+                                                <td><textarea rows="3" name="attr_companion-armorattachmod4"></textarea></td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <br />
+                                </div><!-- Armor Attachments -->
+                                <div class="sheet-clear"></div>
+                            </div>
+                        </fieldset>
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div>
+        </div><!-- Armor -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-armor-toggle-small"></div>
+
+        <b>Cybernetics</b><input name="attr_companion-Cybernetics" value="1" checked="checked" style="width:98px;margin:-13px -20px 0 -82px" class="sheet-toggle sheet-cybernetics-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-cybernetics-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Cybernetics</h3>
+                    <input name="attr_companion-Cybernetics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-cybernetics-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-cybernetics-section">
+                        <table class="sheet-cybernetics" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th style="width:50%">Make/Model</th>
                                 <th style="width:50%">Bonus</th>
                             </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_cyber">
-                        <table class="sheet-cybernetics">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_cyber">
+                            <table class="sheet-cybernetics">
+                                <tbody>
                                 <tr>
-                                    <td style="width:50%" colspan="5">
+                                    <td style="width:50%" colspan="4">
                                         <input type="text" name="attr_companion-cyberneticname" />
                                     </td>
-                                    <td style="width:50%" rowspan="2">
-                                        <textarea rows="3" type="text" name="attr_companion-cyberneticbonus"></textarea>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><label>Condition:</label></td>
-                                    <td>
-                                        <div class="sheet-switch">
-                                            <input type="radio" class="sheet-switch-input-on" name="attr_companion-cyberneticuseful" value="operative" title="Operative" checked="checked">
-                                            <input type="radio" class="sheet-switch-input-off" name="attr_companion-cyberneticuseful" value="broken" title="Broken">
-                                            <span class="switch-selection"></span>
-                                        </div>
+                                    <td style="width:50%" rowspan="5">
+                                        <textarea rows="4" name="attr_companion-cyberneticbonus"></textarea>
                                     </td>
                                 </tr>
                                 <tr>
                                     <td><label>Book &amp; Page:</label></td>
                                     <td><input name='attr_companion-cybernetics_bookpage' type="text" /></td>
-                                    <td>Rarity:</td>
+                                    <td><label>Rarity</label></td>
                                     <td><input name='attr_companion-cybernetics_rarity' type="number" min="1" max="10" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Condition:</label></td>
+                                    <td>
+                                        <div class="sheet-switch">
+                                            <input type="radio" class="sheet-switch-input-on" name="attr_companion-cyberneticuseful" value="active" title="Active" checked="checked">
+                                            <input type="radio" class="sheet-switch-input-off" name="attr_companion-cyberneticuseful" value="disabled" title="Disabled">
+                                            <span class="switch-selection"></span>
+                                        </div>
+                                    </td>
                                     <td><label>Restricted:</label></td>
                                     <td>
                                         <select name='attr_companion-cybernetics_restrict'>
@@ -10034,42 +6584,56 @@
                                             <option value="yes">Yes</option>
                                         </select>
                                     </td>
-                                    <td>Value:</td>
+                                </tr>
+                                <tr>
+                                    <td><label>Value:</label></td>
                                     <td><input name='attr_companion-cybernetics_value' type="text" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                            <br />
+                        </fieldset>
+                    </div>
                 </div>
                 <div class="sheet-clear"></div>
-            </div><!-- Cybernetics -->
+            </div>
+        </div><!-- Cybernetics -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-cybernetics-toggle-small"></div>
+
+        <b>Tools</b><input name="attr_companion-Tools" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-tools-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-tools-toggle-small">
             <div class="sheet-row">
                 <div class="sheet-small-12 sheet-column">
-                    <h3>Tools</h3>
-                    <table class="sheet-tools" cellspacing="0" cellpadding="0" border="0">
-                        <thead>
+                    <h3 class="sheet-section-header">Tools</h3>
+                    <input name="attr_companion-Tools" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-tools-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-tools-section">
+                        <table class="sheet-tools" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
                             <tr>
                                 <th style="width:50%">Tool Name</th>
                                 <th style="width:50%">Bonus/Description</th>
                             </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_tools">
-                        <table class="sheet-tools">
-                            <tbody>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_tools">
+                            <table class="sheet-tools">
+                                <tbody>
                                 <tr>
                                     <td style="width:50%" colspan="5">
                                         <input type="text" name="attr_companion-toolname" />
                                     </td>
                                     <td style="width:50%" rowspan="2">
-                                        <textarea rows="3" type="text" name="attr_companion-toolbonus"></textarea>
+                                        <textarea rows="3" name="attr_companion-toolbonus"></textarea>
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><label>Book &amp; Page:</label></td>
-                                    <td><input name='attr_companion-tool_bookpage' type="text" /></td>
-                                    <td>Rarity:</td>
+                                    <td><label>Encumbrance</label></td>
+                                    <td><input name='attr_companion-tool-encumb' type="text" /></td>
+                                    <td><label>Rarity</label></td>
                                     <td><input name='attr_companion-tool_rarity' type="number" min="1" max="10" /></td>
+                                </tr>
+                                <tr>
                                     <td><label>Restricted:</label></td>
                                     <td>
                                         <select name='attr_companion-tool_restrict'>
@@ -10077,53 +6641,1092 @@
                                             <option value="yes">Yes</option>
                                         </select>
                                     </td>
-                                    <td>Value:</td>
+                                    <td><label>Value</label></td>
                                     <td><input name='attr_companion-tool_value' type="text" /></td>
-                                    <td>Encumbrance:</td>
-                                    <td><input name='attr_companion-tool_encumbrance' type="text" /></td>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input name='attr_companion-tool_bookpage' type="text" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                    </fieldset>
+                                </tbody>
+                            </table>
+                            <br />
+                        </fieldset>
+                    </div>
                 </div>
                 <div class="sheet-clear"></div>
-            </div><!-- Tools -->
-            <div class="sheet-small-12 sheet-column">
-                <h3>Other Gear</h3><br />
-                <div class="sheet-small-6 sheet-column">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr><th>Personal Gear</th></tr>
-                        </thead>
-                        <tbody>
-                            <tr><td><textarea rows="5" name="attr_companion-personalgear"></textarea></td></tr>
-                        </tbody>
-                    </table>
-                </div><!-- Personal Gear -->
-                <div class="sheet-small-6 sheet-column">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <thead>
-                            <tr><th>Assets & Resources</th></tr>
-                        </thead>
-                        <tbody>
-                            <tr><td><textarea rows="5" name="attr_companion-assets"></textarea></td></tr>
-                        </tbody>
-                    </table>
-                </div> <!-- Assets & Resources -->
-                <div class="sheet-clear"></div>
-            </div><!-- Other Gear -->
-        </div>
-    </div><!-- Inventory Tab -->
-</div><!-- Player Companion sheet -->
+            </div>
+        </div><!-- Tools -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-tools-toggle-small"></div>
 
-<!-- Start GM Sheet Tabs - Expanded -->
+        <b>Other Gear</b><input name="attr_companion-other-gear" value="1" checked="checked" style="width:92px;margin:-13px -20px 0 -76px" class="sheet-toggle sheet-other-gear-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-other-gear-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Other Gear</h3>
+                    <input name="attr_companion-Other-Gear" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-tools-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-tools-section">
+                        <div class="sheet-small-6 sheet-column">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th>Personal Gear</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr><td><textarea rows="5" name="attr_companion-personalgear"></textarea></td></tr>
+                                </tbody>
+                            </table>
+                        </div><!-- Personal Gear -->
+                        <div class="sheet-small-6 sheet-column">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <thead>
+                                <tr><th>Assets &amp; Resources</th></tr>
+                                </thead>
+                                <tbody>
+                                <tr><td><textarea rows="5" name="attr_companion-assets"></textarea></td></tr>
+                                </tbody>
+                            </table>
+                        </div> <!-- Assets & Resources -->
+                    </div>
+                </div>
+                <div class="sheet-clear"></div>
+            </div>
+        </div><!-- Other Gear -->
+    </div><!-- Inventory Tab -->
+    <div class="sheet-tab-content sheet-tab-companion-critical">
+        <div class="sheet-row sheet-show-critical-table">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Critical Injuries</h3>
+            </div>
+            <div class="sheet-small-9 sheet-column">
+                <input type="hidden" name="attr_companion-critTotal" value="0" />
+                <fieldset class="repeating_critcompanion">
+                    <input type="hidden" name="attr_companion-critId" />
+                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                        <tbody>
+                        <tr>
+                            <td width="70%"><input type="text" name="attr_companion-critName" readonly="readonly" /></td>
+                            <td width="30%"><input type="text" name="attr_companion-critRange" readonly="readonly" /></td>
+                            <td class="sheet-crit-dice-bg">
+                                <input class="sheet-pd" value="4" type="hidden" name="attr_companion-critSeverity" /><span></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2" rowspan="2"><textarea rows="3" name="attr_companion-critSummary" readonly="readonly"></textarea></td>
+                            <td>
+                                <label>Effect:</label>
+                                <div class="sheet-switch">
+                                    <input type="radio" class="sheet-switch-input-on" name="attr_companion-critEffect" value="on" title="On" checked="checked">
+                                    <input type="radio" class="sheet-switch-input-off" name="attr_companion-critEffect" value="off" title="Off">
+                                    <span class="switch-selection"></span>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|companion|@{companion-critId})">Heal</button></td></tr>
+                        </tbody>
+                    </table>
+                </fieldset>
+            </div>
+            <div class="sheet-small-3 sheet-column">
+                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                    <tr>
+                        <td><label>Critical roll offset:</label></td>
+                        <td><input type="text" name="attr_companion-critAddOffset" value="" /></td>
+                    </tr>
+                    <tr><td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll|companion)">Roll Critical</button></td></tr>
+                    <tr>
+                        <td>
+                            <label>Critical number:</label>
+                            <input type="text" name="attr_companion-critAddRangeNum" value="" />
+                        </td>
+                        <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|companion|@{companion-critAddRangeNum})">Add Critical</button></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="sheet-clear"></div>
+        </div><!-- Critical Injury Table -->
+    </div><!-- Companion Critical Injuries -->
+</div><!-- Player Companion sheet -->
+<div class="sheet-tab-content sheet-tab-npc-sheet">
+    <b>Stats</b><input name="attr_npc-Stats" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-stats-toggle-small" type="checkbox"/><span></span>
+    <div class="sheet-stats-toggle-small">
+        <div class="sheet-row sheet-section-1">
+            <div class="sheet-small-12 sheet-column">
+                <table class="sheet-swsd" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                    <tr>
+                        <td>
+                            <label class="sheet-label-title">Wounds</label>
+                            <input name="attr_npc-wounds_max" type="number" max="999" min="1" value="1" />
+                            <input name="attr_npc-wounds" type="number" max="999" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td>
+                            <label class="sheet-label-title">Strain</label>
+                            <input name="attr_npc-strain_max" type="number" max="999" min="0" value="0" />
+                            <input name="attr_npc-strain" type="number" max="999" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Defense</label>
+                            <input name="attr_npc-rangeddefense" type="number" max="99" min="0" value="0" />
+                            <input name="attr_npc-meleedefense" type="number" max="99" min="0" value="0" /><br />
+                            <label class="sheet-label-range">Range</label>
+                            <label class="sheet-label-melee">Melee</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Encum</label>
+                            <input name="attr_npc-encumbrance_max" type="number" max="99" min="1" value="1" />
+                            <input name="attr_npc-encumbrancemax" type="hidden" value="@{npc-encumbrance|max}" disabled />
+                            <input name="attr_npc-encumbrance" type="number" max="99" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-current">Current</label>
+                        </td>
+                        <td rowspan="2">
+                            <label class="sheet-label-title">Force Rating</label>
+                            <input name="attr_npc-forcerating" type="number" max="99" min="0" value="0" />
+                            <input name="attr_npc-forcecommitted" type="number" max="99" min="0" value="0" /><br />
+                            <label class="sheet-label-threshold">Threshold</label>
+                            <label class="sheet-label-committed">Committed</label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">
+                            <label class="sheet-label-title">Soak</label>
+                            <input name="attr_npc-soak" type="number" max="99" min="1" value="1" />
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div><!-- Top Stats -->
+        </div>
+    </div><!-- Stats -->
+    <div class="sheet-clear"></div>
+
+    <input type="radio" name="attr_npc-sheet" class="sheet-tab-new sheet-tab-npc-combat" value="1" />
+    <span class="sheet-tab-new">&emsp;NPC&emsp;</span>
+    <input type="radio" name="attr_npc-sheet" class="sheet-tab-new sheet-tab-npc-critical" value="2" />
+    <span class="sheet-tab-new">&emsp;Critical Injuries&emsp;</span>
+
+    <div class="sheet-tab-content sheet-tab-npc-combat">
+        <b>Initiative</b><input name="attr_npc-Initiative" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-initiative-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-initiative-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Initiative</h3>
+                    <input name="attr_npc-Initiative" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-initiative-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-initiative-section">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <table>
+                                        <tr>
+                                            <td><label>What kind of Initiative Slot?</label></td>
+                                            <td><label>PC<input type="radio" name="attr_npc-npc-pc" value="pcinit" /></label></td>
+                                            <td><label>NPC<input type="radio" name="attr_npc-npc-pc" value="npcinit" checked="checked" /></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                            <td><label></label></td>
+                                        </tr>
+                                    </table>
+                                    <table class="sheet-init" cellspacing="0" cellpadding="0" border="0">
+                                        <tr>
+                                            <td><label>Cool (if prepared):</label></td>
+                                            <td>
+                                                <input class="sheet-yd" type="hidden" name="attr_npc-yCoolInit" value="@{npc-yCool}" disabled><span></span>
+                                                <input class="sheet-gd" type="hidden" name="attr_npc-gCoolInit" value="@{npc-gCool}" disabled><span></span>
+                                            </td>
+                                            <td><label>Modifiers</label><input name='attr_npc-initiativeCoolDice' type="text" /></td>
+                                            <td><button type='roll' name='roll_npc-VigilanceInit' value='!eed @{npc-npc-pc} characterID(@{character_id}) label(skill:Initiative Cool) skill(@{npc-rankCool}|@{npc-presence}|@{npc-minion-group-size}|@{npc-minionskillCool}) @{npc-initiativeCoolDice} @{dicePool}'></button></td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Vigilance (if unexpected):</label></td>
+                                            <td>
+                                                <input class="sheet-yd" type="hidden" name="attr_npc-yVigilanceInit" value="@{npc-yVigilance}" disabled><span></span>
+                                                <input class="sheet-gd" type="hidden" name="attr_npc-gVigilanceInit" value="@{npc-gVigilance}" disabled><span></span>
+                                            </td>
+                                            <td><label>Modifiers</label><input name='attr_npc-initiativeVigDice' type="text" /></td>
+                                            <td><button type='roll' name='roll_npc-VigilanceInit' value='!eed @{npc-npc-pc} characterID(@{character_id}) label(skill:Initiative Vigilance) skill(@{npc-rankVigilance}|@{npc-willpower}|@{npc-minion-group-size}|@{npc-minionskillVigilance}) @{npc-initiativeVigDice} @{dicePool}'></button></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Initiative -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-initiative-toggle-small"></div>
+
+        <b>NPC Info</b><input name="attr_npc-NPC-Info" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-info-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-info-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">NPC Info</h3>
+                    <input name="attr_npc-NPC-Info" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-quickinfo-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-quickinfo-section">
+                        <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td style="width: 4%;"><label>Name:</label></td>
+                                <td style="width: 29%;"><input type="text" name="attr_name" /></td>
+                                <td style="width: 11%;"><label style="text-align:center;">NPC Type:</label></td>
+                                <td style="text-align: center;width: 28%;">
+                                    <label class="sheet-npc-type">Nemesis<input name="attr_npc-type" value="nemesis" type="radio"/></label>
+                                    <label class="sheet-npc-type">Rival<input name="attr_npc-type" value="rival" type="radio"/></label>
+                                    <label class="sheet-npc-type">Minion<input name="attr_npc-type" value="minion" type="radio"/></label>
+                                </td>
+                                <td style="width: 17%;"><label>Minion Group Size:</label></td>
+                                <td>
+                                    <input name='attr_npc-minion-group-size' type="number" min="1" value="1" />
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div><!-- NPC Quick Info -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-info-toggle-small"></div>
+
+        <b>Weapons</b><input name="attr_npc-Weapons" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-weapons-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-weapons-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Weapons</h3>
+                    <input name="attr_npc-Weapons" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-weapon-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-weapon-section">
+                        <fieldset class="repeating_npc-weapons">
+                            <b>Weapon</b><input name="attr_npc-Weapon" value="1" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-weapon-toggle" type="checkbox" checked="checked"/><span></span>
+                            <div class="sheet-weapon">
+                                <div class="sheet-row">
+                                    <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td></td>
+                                            <td>
+                                                <label>Damage</label>
+                                                <input name='attr_npc-damage' type="text" value="0" />
+                                            </td>
+                                            <td></td>
+                                            <td>
+                                                <label>Critical</label>
+                                                <input name='attr_npc-critical' type="text" value="0" />
+                                            </td>
+                                            <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(Weapon:@{npc-weaponmake}|Damage:@{npc-damage}|Critical:@{npc-critical}|Range:@{npc-weaponrange}|Qualities:@{npc-weaponspecial}) @{npc-weapondice} encum(@{npc-encumbrancemax}|@{npc-encumbrance}) @{npc-weaponskill} @{npc-weaponcondition} @{dicePool} (gmdice)'></button></td>
+                                            <td>
+                                                <label>Encum</label>
+                                                <input name='attr_npc-encum' type="text" value="0" />
+                                            </td>
+                                            <td></td>
+                                            <td>
+                                                <label>HP</label>
+                                                <input name='attr_npc-hp' type="text" value="0" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Make / Model:</label></td>
+                                            <td><input name='attr_npc-weaponmake' type="text" /></td>
+                                            <td><label>Range:</label></td>
+                                            <td>
+                                                <select name='attr_npc-weaponrange'>
+                                                    <option value="Engaged">Engaged</option>
+                                                    <option value="Short">Short</option>
+                                                    <option value="Medium">Medium</option>
+                                                    <option value="Long">Long</option>
+                                                    <option value="Extreme">Extreme</option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Weapon Type:</label></td>
+                                            <td><input name='attr_npc-weapontype' type="text" /></td>
+                                            <td><label>Skill:</label></td>
+                                            <td>
+                                                <select name='attr_npc-weaponskill'>
+                                                    <optgroup label="Combat Skills">
+                                                        <option value="skill(@{npc-rankBrawl}|@{npc-brawn}|@{npc-minion-group-size}|@{npc-minionskillBrawl})">Brawl</option>
+                                                        <option value="skill(@{npc-rankGunnery}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillGunnery})">Gunnery</option>
+                                                        <option value="skill(@{npc-rankMelee}|@{npc-brawn}|@{npc-minion-group-size}|@{npc-minionskillMelee})">Melee</option>
+                                                        <option value="skill(@{npc-rankLight}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillLight})">Ranged - Light</option>
+                                                        <option value="skill(@{npc-rankHeavy}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillHeavy})">Ranged - Heavy</option>
+                                                        <option value="skill(@{npc-rankLightsaber}|@{npc-charLightsaber}|@{npc-minion-group-size}|@{npc-minionskillLightsaber})">Lightsaber</option>
+                                                    </optgroup>
+                                                    <optgroup label="Custom Skills">
+                                                        <option value="skill(@{npc-rankcustomskillname1}|@{npc-charcustomskillname1}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname1})">Custom Skill 1</option>
+                                                        <option value="skill(@{npc-rankcustomskillname2}|@{npc-charcustomskillname2}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname2})">Custom Skill 2</option>
+                                                        <option value="skill(@{npc-rankcustomskillname3}|@{npc-charcustomskillname3}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname3})">Custom Skill 3</option>
+                                                        <option value="skill(@{npc-rankcustomskillname4}|@{npc-charcustomskillname4}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname4})">Custom Skill 4</option>
+                                                        <option value="skill(@{npc-rankcustomskillname5}|@{npc-charcustomskillname5}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname5})">Custom Skill 5</option>
+                                                    </optgroup>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Modifiers:</label></td>
+                                            <td><input name='attr_npc-weapondice' type="text" /></td>
+                                            <td><label>Condition:</label></td>
+                                            <td>
+                                                <select name='attr_npc-weaponcondition'>
+                                                    <option value="">New</option>
+                                                    <option value="1blk">Minor</option>
+                                                    <option value="1p">Moderate</option>
+                                                    <option value="unusableWeapon">Major</option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Features:</label></td>
+                                            <td><textarea rows="2" name="attr_npc-weaponfeatures"></textarea></td>
+                                            <td><label>Qualities:</label></td>
+                                            <td><textarea rows="3" name="attr_npc-weaponspecial"></textarea></td>
+                                        </tr>
+                                        <tr><td colspan="4">&nbsp;</td></tr>
+                                        </tbody>
+                                    </table>
+                                    <div class="sheet-attachments-wrapper">
+                                        <input type="checkbox" name="attr_npc-weaponattchments" class="sheet-view-attachments" />
+                                        <label class="sheet-view-attachments">View Attachments</label>
+                                        <div class="sheet-clear"></div>
+                                        <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                            <thead>
+                                            <tr>
+                                                <th>Attachment Name</th>
+                                                <th>Hard Points</th>
+                                                <th>Base Modifiers</th>
+                                                <th>Modifications</th>
+                                                <th>Book &amp; Page</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach1' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP1' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase1"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod1"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage1"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach2' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP2' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase2"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod2"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage2"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach3' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP3' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase3"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod3"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage3"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach4' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP4' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase4"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod4"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage4"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach5' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP5' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase5"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod5"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage5"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach6' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP6' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase6"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod6"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage6"/></td>
+                                            </tr>
+                                            <tr>
+                                                <td><input name='attr_npc-weaponattach7' type="text" /></td>
+                                                <td><input name='attr_npc-weaponattachHP7' type="number" /></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachbase7"></textarea></td>
+                                                <td><textarea rows="3" name="attr_npc-weaponattachmod7"></textarea></td>
+                                                <td><input type="text" name="attr_npc-weaponattachbookpage7"/></td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div><!-- Weapon Attachments -->
+                                    <div class="sheet-clear"></div>
+                                </div>
+                            </div><!-- Weapon Info -->
+                            <div class="sheet-clear"></div>
+                        </fieldset>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Weapons -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-weapons-toggle-small"></div>
+
+        <b>Characteristics</b><input name="attr_npc-Characteristics" value="1" checked="checked" style="width:117px;margin:-13px -20px 0 -101px" class="sheet-toggle sheet-characteristic-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-characteristic-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Characteristics</h3>
+                    <input name="attr_npc-Characteristics" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-characteristic-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-characteristic-section">
+                        <table class="sheet-characteristics" cellspacing="0" cellpadding="0" border="0">
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <label>Brawn</label>
+                                    <input name='attr_npc-brawn' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Agility</label>
+                                    <input name='attr_npc-agility' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Intellect</label>
+                                    <input name='attr_npc-intellect' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Cunning</label>
+                                    <input name='attr_npc-cunning' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Willpower</label>
+                                    <input name='attr_npc-willpower' type="number" max="7" min="1" value="1" />
+                                </td>
+                                <td></td>
+                                <td>
+                                    <label>Presence</label>
+                                    <input name='attr_npc-presence' type="number" max="7" min="1" value="1" />
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Characteristics -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-characteristic-toggle-small"></div>
+
+        <b>Skills</b><input name="attr_npc-Skills" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-skills-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-skills-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Skills</h3>
+                    <input name="attr_npc-Skills" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-skills-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-skills-section">
+                        <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>General Skills</th>
+                                <th class="sheet-npc-minion-title" title="Check to allow the skill to use the minion group size to determine proficiency and ability dice">Minion</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">
+                                    <span style="float:left">Modifiers</span>
+                                    <div class="sheet-tips">
+                                        <div class="sheet-help-def sheet-help">
+                                            <div class="sheet-icon">
+                                                <span class="sheet-icon-question">?</span>
+                                            </div>
+                                            <div class="sheet-help-content" style="margin-left:-225px">
+                                                <h5>Adding Dice</h5>
+                                                <p>
+                                                    To add additional dice write the number of
+                                                    dice and color letter you want to roll.
+                                                    Additionally you can add some dice symbols
+                                                    to automatically add to the roll.
+                                                </p>
+                                                <p>Example: <b>1b 1g</b> outputs <span class="sheet-icon-B"></span><span class="sheet-icon-G"></span></p>
+                                                <p>
+                                                    b -> Blue = Boost, blk -> BLack = Setback
+                                                    g -> Green = Ability, y -> Yellow = Proficiency
+                                                    p -> Purple = Difficulty, r -> Red = Challenge
+                                                    w -> White = Force
+                                                    s = Success, f = Failure, a = Advantage, t = Threat
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div><!-- Modifier Help -->
+                                </th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td>
+                                    <label>Cool (Pr)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillCool' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankCool" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yCool" value="(((@{npc-presence} + (@{npc-rankCool} - (@{npc-rankCool} * @{npc-minionskillCool})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillCool})) - abs(@{npc-presence} - (@{npc-rankCool} - (@{npc-rankCool} * @{npc-minionskillCool})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillCool}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gCool" value="((((@{npc-presence} + (@{npc-rankCool} - (@{npc-rankCool} * @{npc-minionskillCool})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillCool})) + abs(@{npc-presence} - (@{npc-rankCool} - (@{npc-rankCool} * @{npc-minionskillCool})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillCool}))) / 2) - @{npc-yCool})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceCool" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Cool' value='!eed characterID(@{character_id}) label(skill:Cool) @{npc-diceCool} skill(@{npc-rankCool}|@{npc-presence}|@{npc-minion-group-size}|@{npc-minionskillCool}|Cool) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Cool-->
+                            <tr>
+                                <td>
+                                    <label>Vigilance (Will)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillVigilance' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankVigilance" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yVigilance" value="(((@{npc-willpower} + (@{npc-rankVigilance} - (@{npc-rankVigilance} * @{npc-minionskillVigilance})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillVigilance})) - abs(@{npc-willpower} - (@{npc-rankVigilance} - (@{npc-rankVigilance} * @{npc-minionskillVigilance})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillVigilance}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gVigilance" value="((((@{npc-willpower} + (@{npc-rankVigilance} - (@{npc-rankVigilance} * @{npc-minionskillVigilance})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillVigilance})) + abs(@{npc-willpower} - (@{npc-rankVigilance} - (@{npc-rankVigilance} * @{npc-minionskillVigilance})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillVigilance}))) / 2) - @{npc-yVigilance})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceVigilance" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Vigilance' value='!eed characterID(@{character_id}) label(skill:Vigilance) @{npc-diceVigilance} skill(@{npc-rankVigilance}|@{npc-willpower}|@{npc-minion-group-size}|@{npc-minionskillVigilance}|Vigilance) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Vigilance-->
+                            </tbody>
+                        </table><!--General Skills Section-->
+                        <table class="sheet-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Combat Skills</th>
+                                <th class="sheet-npc-minion-title" title="Check to allow the skill to use the minion group size to determine proficiency and ability dice">Minion</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">Mods</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td valign="middle">
+                                    <label>Lightsaber</label>
+                                    <select name="attr_npc-charLightsaber" style="float:right; width:50%">
+                                        <option value="@{npc-brawn}">Brawn</option><!-- TODO encum not working -->
+                                        <option value="@{npc-agility}">Agility</option>
+                                        <option value="@{npc-intellect}">Intellect</option>
+                                        <option value="@{npc-cunning}">Cunning</option>
+                                        <option value="@{npc-willpower}">Willpower</option>
+                                        <option value="@{npc-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_npc-minionskillLightsaber' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankLightsaber" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yLightsaber" value="(((@{npc-charLightsaber} + (@{npc-rankLightsaber} - (@{npc-rankLightsaber} * @{npc-minionskillLightsaber})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillLightsaber})) - abs(@{npc-charLightsaber} - (@{npc-rankLightsaber} - (@{npc-rankLightsaber} * @{npc-minionskillLightsaber})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillLightsaber}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gLightsaber" value="((((@{npc-charLightsaber} + (@{npc-rankLightsaber} - (@{npc-rankLightsaber} * @{npc-minionskillLightsaber})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillLightsaber})) + abs(@{npc-charLightsaber} - (@{npc-rankLightsaber} - (@{npc-rankLightsaber} * @{npc-minionskillLightsaber})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillLightsaber}))) / 2) - @{npc-yLightsaber})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceLightsaber" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Lightsaber' value='!eed characterID(@{character_id}) label(skill:Lightsaber) @{npc-diceLightsaber} encum(@{encumbrancemax}|@{encumbrance}) skill(@{npc-rankLightsaber}|@{npc-charLightsaber}|@{npc-minion-group-size}|@{npc-minionskillLightsaber}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--LightSaber-->
+                            <tr>
+                                <td>
+                                    <label>Brawl (Br)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillBrawl' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankBrawl" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yBrawl" value="(((@{npc-brawn} + (@{npc-rankBrawl} - (@{npc-rankBrawl} * @{npc-minionskillBrawl})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillBrawl})) - abs(@{npc-brawn} - (@{npc-rankBrawl} - (@{npc-rankBrawl} * @{npc-minionskillBrawl})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillBrawl}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gBrawl" value="((((@{npc-brawn} + (@{npc-rankBrawl} - (@{npc-rankBrawl} * @{npc-minionskillBrawl})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillBrawl})) + abs(@{npc-brawn} - (@{npc-rankBrawl} - (@{npc-rankBrawl} * @{npc-minionskillBrawl})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillBrawl}))) / 2) - @{npc-yBrawl})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceBrawl" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Brawl' value='!eed characterID(@{character_id}) label(skill:Brawl) @{npc-diceBrawl} encum(@{encumbrancemax}|@{encumbrance}) skill(@{npc-rankBrawl}|@{npc-brawn}|@{npc-minion-group-size}|@{npc-minionskillBrawl}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Brawl-->
+                            <tr>
+                                <td>
+                                    <label>Gunnery (Agi)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillGunnery' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankGunnery" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yGunnery" value="(((@{npc-agility} + (@{npc-rankGunnery} - (@{npc-rankGunnery} * @{npc-minionskillGunnery})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillGunnery})) - abs(@{npc-agility} - (@{npc-rankGunnery} - (@{npc-rankGunnery} * @{npc-minionskillGunnery})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillGunnery}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gGunnery" value="((((@{npc-agility} + (@{npc-rankGunnery} - (@{npc-rankGunnery} * @{npc-minionskillGunnery})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillGunnery})) + abs(@{npc-agility} - (@{npc-rankGunnery} - (@{npc-rankGunnery} * @{npc-minionskillGunnery})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillGunnery}))) / 2) - @{npc-yGunnery})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceGunnery" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Gunnery' value='!eed characterID(@{character_id}) label(skill:Gunnery) @{npc-diceGunnery} encum(@{encumbrancemax}|@{encumbrance}) skill(@{npc-rankGunnery}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillGunnery}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Gunnery-->
+                            <tr>
+                                <td>
+                                    <label>Melee (Br)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillMelee' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankMelee" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yMelee" value="(((@{npc-brawn} + (@{npc-rankMelee} - (@{npc-rankMelee} * @{npc-minionskillMelee})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillMelee})) - abs(@{npc-brawn} - (@{npc-rankMelee} - (@{npc-rankMelee} * @{npc-minionskillMelee})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillMelee}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gMelee" value="((((@{npc-brawn} + (@{npc-rankMelee} - (@{npc-rankMelee} * @{npc-minionskillMelee})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillMelee})) + abs(@{npc-brawn} - (@{npc-rankMelee} - (@{npc-rankMelee} * @{npc-minionskillMelee})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillMelee}))) / 2) - @{npc-yMelee})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceMelee" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Melee' value='!eed characterID(@{character_id}) label(skill:Melee) @{npc-diceMelee} encum(@{encumbrancemax}|@{encumbrance}) skill(@{npc-rankMelee}|@{npc-brawn}|@{npc-minion-group-size}|@{npc-minionskillMelee}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Melee-->
+                            <tr>
+                                <td>
+                                    <label>Ranged - Light (Ag)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillLight' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankLight" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yLight" value="(((@{npc-agility} + (@{npc-rankLight} - (@{npc-rankLight} * @{npc-minionskillLight})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillLight})) - abs(@{npc-agility} - (@{npc-rankLight} - (@{npc-rankLight} * @{npc-minionskillLight})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillLight}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gLight" value="((((@{npc-agility} + (@{npc-rankLight} - (@{npc-rankLight} * @{npc-minionskillLight})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillLight})) + abs(@{npc-agility} - (@{npc-rankLight} - (@{npc-rankLight} * @{npc-minionskillLight})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillLight}))) / 2) - @{npc-yLight})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceLight" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Light' value='!eed characterID(@{character_id}) label(skill:Ranged - Light) @{npc-diceLight} encum(@{encumbrancemax}|@{encumbrance}) skill(@{npc-rankLight}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillLight}|RangedLight) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Ranged - Light-->
+                            <tr>
+                                <td>
+                                    <label>Ranged - Heavy (Ag)</label>
+                                </td>
+                                <td><input name='attr_npc-minionskillHeavy' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankHeavy" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-yHeavy" value="(((@{npc-agility} + (@{npc-rankHeavy} - (@{npc-rankHeavy} * @{npc-minionskillHeavy})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillHeavy})) - abs(@{npc-agility} - (@{npc-rankHeavy} - (@{npc-rankHeavy} * @{npc-minionskillHeavy})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillHeavy}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gHeavy" value="((((@{npc-agility} + (@{npc-rankHeavy} - (@{npc-rankHeavy} * @{npc-minionskillHeavy})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillHeavy})) + abs(@{npc-agility} - (@{npc-rankHeavy} - (@{npc-rankHeavy} * @{npc-minionskillHeavy})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillHeavy}))) / 2) - @{npc-yHeavy})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-diceHeavy" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_Heavy' value='!eed characterID(@{character_id}) label(skill:Ranged - Heavy) @{npc-diceHeavy} encum(@{encumbrancemax}|@{encumbrance}) skill(@{npc-rankHeavy}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillHeavy}|RangedHeavy) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Ranged - Heavy-->
+                            </tbody>
+                        </table><!--Combat Skills Section-->
+                        <table class="sheet-skills sheet-custome-skills" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Custom Skills</th>
+                                <th>Char</th>
+                                <th class="sheet-npc-minion" title="Check to allow this skill to use the minion group size to determine proficiency and ability dice">Minion</th>
+                                <th colspan="2">Rank</th>
+                                <th colspan="2">Mods</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td><input type="text" name="attr_npc-customskillname1" /></td>
+                                <td>
+                                    <select name="attr_npc-charcustomskillname1">
+                                        <option value="@{npc-brawn}">Brawn</option><!-- encum not working -->
+                                        <option value="@{npc-agility}">Agility</option>
+                                        <option value="@{npc-intellect}">Intellect</option>
+                                        <option value="@{npc-cunning}">Cunning</option>
+                                        <option value="@{npc-willpower}">Willpower</option>
+                                        <option value="@{npc-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_npc-minionskillcustomskillname1' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankcustomskillname1" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-ycustomskillname1" value="(((@{npc-charcustomskillname1} + (@{npc-rankcustomskillname1} - (@{npc-rankcustomskillname1} * @{npc-minionskillcustomskillname1})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname1})) - abs(@{npc-charcustomskillname1} - (@{npc-rankcustomskillname1} - (@{npc-rankcustomskillname1} * @{npc-minionskillcustomskillname1})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname1}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gcustomskillname1" value="((((@{npc-charcustomskillname1} + (@{npc-rankcustomskillname1} - (@{npc-rankcustomskillname1} * @{npc-minionskillcustomskillname1})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname1})) + abs(@{npc-charcustomskillname1} - (@{npc-rankcustomskillname1} - (@{npc-rankcustomskillname1} * @{npc-minionskillcustomskillname1})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname1}))) / 2) - @{npc-ycustomskillname1})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-dicecustomskillname1" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_customskillname1' value='!eed characterID(@{character_id}) label(skill:@{npc-customskillname1}) @{npc-dicecustomskillname1} skill(@{npc-rankcustomskillname1}|@{npc-charcustomskillname1}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname1}|@{npc-customskillname1}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 1-->
+                            <tr>
+                                <td><input type="text" name="attr_npc-customskillname2" /></td>
+                                <td>
+                                    <select name="attr_npc-charcustomskillname2">
+                                        <option value="@{npc-brawn}">Brawn</option>
+                                        <option value="@{npc-agility}">Agility</option>
+                                        <option value="@{npc-intellect}">Intellect</option>
+                                        <option value="@{npc-cunning}">Cunning</option>
+                                        <option value="@{npc-willpower}">Willpower</option>
+                                        <option value="@{npc-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_npc-minionskillcustomskillname2' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankcustomskillname2" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-ycustomskillname2" value="(((@{npc-charcustomskillname2} + (@{npc-rankcustomskillname2} - (@{npc-rankcustomskillname2} * @{npc-minionskillcustomskillname2})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname2})) - abs(@{npc-charcustomskillname2} - (@{npc-rankcustomskillname2} - (@{npc-rankcustomskillname2} * @{npc-minionskillcustomskillname2})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname2}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gcustomskillname2" value="((((@{npc-charcustomskillname2} + (@{npc-rankcustomskillname2} - (@{npc-rankcustomskillname2} * @{npc-minionskillcustomskillname2})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname2})) + abs(@{npc-charcustomskillname2} - (@{npc-rankcustomskillname2} - (@{npc-rankcustomskillname2} * @{npc-minionskillcustomskillname2})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname2}))) / 2) - @{npc-ycustomskillname2})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-dicecustomskillname2" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_customskillname2' value='!eed characterID(@{character_id}) label(skill:@{npc-customskillname2}) @{npc-dicecustomskillname2} skill(@{npc-rankcustomskillname2}|@{npc-charcustomskillname2}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname2}|@{npc-customskillname2}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 2-->
+                            <tr>
+                                <td><input type="text" name="attr_npc-customskillname3" /></td>
+                                <td>
+                                    <select name="attr_npc-charcustomskillname3">
+                                        <option value="@{npc-brawn}">Brawn</option>
+                                        <option value="@{npc-agility}">Agility</option>
+                                        <option value="@{npc-intellect}">Intellect</option>
+                                        <option value="@{npc-cunning}">Cunning</option>
+                                        <option value="@{npc-willpower}">Willpower</option>
+                                        <option value="@{npc-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_npc-minionskillcustomskillname3' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankcustomskillname3" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-ycustomskillname3" value="(((@{npc-charcustomskillname3} + (@{npc-rankcustomskillname3} - (@{npc-rankcustomskillname3} * @{npc-minionskillcustomskillname3})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname3})) - abs(@{npc-charcustomskillname3} - (@{npc-rankcustomskillname3} - (@{npc-rankcustomskillname3} * @{npc-minionskillcustomskillname3})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname3}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gcustomskillname3" value="((((@{npc-charcustomskillname3} + (@{npc-rankcustomskillname3} - (@{npc-rankcustomskillname3} * @{npc-minionskillcustomskillname3})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname3})) + abs(@{npc-charcustomskillname3} - (@{npc-rankcustomskillname3} - (@{npc-rankcustomskillname3} * @{npc-minionskillcustomskillname3})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname3}))) / 2) - @{npc-ycustomskillname3})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-dicecustomskillname3" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_customskillname3' value='!eed characterID(@{character_id}) label(skill:@{npc-customskillname3}) @{npc-dicecustomskillname3} skill(@{npc-rankcustomskillname3}|@{npc-charcustomskillname3}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname3}|@{npc-customskillname3}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 3-->
+                            <tr>
+                                <td><input type="text" name="attr_npc-customskillname4" /></td>
+                                <td>
+                                    <select name="attr_npc-charcustomskillname4">
+                                        <option value="@{npc-brawn}">Brawn</option>
+                                        <option value="@{npc-agility}">Agility</option>
+                                        <option value="@{npc-intellect}">Intellect</option>
+                                        <option value="@{npc-cunning}">Cunning</option>
+                                        <option value="@{npc-willpower}">Willpower</option>
+                                        <option value="@{npc-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_npc-minionskillcustomskillname4' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankcustomskillname4" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-ycustomskillname4" value="(((@{npc-charcustomskillname4} + (@{npc-rankcustomskillname4} - (@{npc-rankcustomskillname4} * @{npc-minionskillcustomskillname4})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname4})) - abs(@{npc-charcustomskillname4} - (@{npc-rankcustomskillname4} - (@{npc-rankcustomskillname4} * @{npc-minionskillcustomskillname4})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname4}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gcustomskillname4" value="((((@{npc-charcustomskillname4} + (@{npc-rankcustomskillname4} - (@{npc-rankcustomskillname4} * @{npc-minionskillcustomskillname4})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname4})) + abs(@{npc-charcustomskillname4} - (@{npc-rankcustomskillname4} - (@{npc-rankcustomskillname4} * @{npc-minionskillcustomskillname4})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname4}))) / 2) - @{npc-ycustomskillname4})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-dicecustomskillname4" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_customskillname4' value='!eed characterID(@{character_id}) label(skill:@{npc-customskillname4}) @{npc-dicecustomskillname4} skill(@{npc-rankcustomskillname4}|@{npc-charcustomskillname4}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname4}|@{npc-customskillname4}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 4-->
+                            <tr>
+                                <td><input type="text" name="attr_npc-customskillname5" /></td>
+                                <td>
+                                    <select name="attr_npc-charcustomskillname5">
+                                        <option value="@{npc-brawn}">Brawn</option>
+                                        <option value="@{npc-agility}">Agility</option>
+                                        <option value="@{npc-intellect}">Intellect</option>
+                                        <option value="@{npc-cunning}">Cunning</option>
+                                        <option value="@{npc-willpower}">Willpower</option>
+                                        <option value="@{npc-presence}">Presence</option>
+                                    </select>
+                                </td>
+                                <td><input name='attr_npc-minionskillcustomskillname5' type="checkbox" value="1"></td>
+                                <td><input type="number" name="attr_npc-rankcustomskillname5" max="6" min="0" value="0" /></td>
+                                <td>
+                                    <input class="sheet-yd" type="hidden" name="attr_npc-ycustomskillname5" value="(((@{npc-charcustomskillname5} + (@{npc-rankcustomskillname5} - (@{npc-rankcustomskillname5} * @{npc-minionskillcustomskillname5})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname5})) - abs(@{npc-charcustomskillname5} - (@{npc-rankcustomskillname5} - (@{npc-rankcustomskillname5} * @{npc-minionskillcustomskillname5})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname5}))) / 2)" disabled><span></span>
+                                    <input class="sheet-gd" type="hidden" name="attr_npc-gcustomskillname5" value="((((@{npc-charcustomskillname5} + (@{npc-rankcustomskillname5} - (@{npc-rankcustomskillname5} * @{npc-minionskillcustomskillname5})) + ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname5})) + abs(@{npc-charcustomskillname5} - (@{npc-rankcustomskillname5} - (@{npc-rankcustomskillname5} * @{npc-minionskillcustomskillname5})) - ((@{npc-minion-group-size} - 1) * @{npc-minionskillcustomskillname5}))) / 2) - @{npc-ycustomskillname5})" disabled><span></span>
+                                </td>
+                                <td>
+                                    <div class="sheet-dice-icon"></div>
+                                    <div class="sheet-dice-input">
+                                        <input type="text" name="attr_npc-dicecustomskillname5" />
+                                    </div>
+                                </td>
+                                <td><button type='roll' name='roll_customskillname5' value='!eed characterID(@{character_id}) label(skill:@{npc-customskillname5}) @{npc-dicecustomskillname5} skill(@{npc-rankcustomskillname5}|@{npc-charcustomskillname5}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname5}|@{npc-customskillname5}) @{dicePool} (gmdice)'></button></td>
+                            </tr><!--Custom Skill 5-->
+                            </tbody>
+                        </table><!--Custom Skills Section-->
+                    </div><!-- Skills -->
+                </div>
+            </div>
+        </div><!-- Skills List -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-skills-toggle-small"></div>
+
+        <b>Talents &amp; Abilities</b><input name="attr_npc-talents-abilities" value="1" checked="checked" style="width:137px;margin:-13px -20px 0 -121px" class="sheet-toggle sheet-talents-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-talents-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Talents and Abilities</h3>
+                    <input name="attr_npc-Talents-and-Abilities" value="1" style="width: 137px;height: 30px;margin: -44px -20px 0 121px;float:left;" class="sheet-toggle sheet-talents-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-talents-section">
+                        <textarea class="sheet-textbox"  rows="50" name="attr_npc-talents"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Talents and Abilities -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-talents-toggle-small"></div>
+
+        <b>Equipment</b><input name="attr_npc-Equipment" value="1" checked="checked" style="width:93px;margin:-13px -20px 0 -77px" class="sheet-toggle sheet-equipment-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-equipment-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Equipment</h3>
+                    <input name="attr_npc-Equipment-toggle" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-equipment-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-equipment-section">
+                        <textarea class="sheet-textbox" rows="50" name="attr_npc-equipment-box"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Equipment -->
+        <div class="sheet-clear"></div>
+        <div class="sheet-section-spacer sheet-equipment-toggle-small"></div>
+
+        <b>Force Powers</b><input name="attr_npc-Force-Powers" value="1" checked="checked" style="width:110px;margin:-13px -20px 0 -94px" class="sheet-toggle sheet-force-toggle-small" type="checkbox"/><span></span>
+        <div class="sheet-force-toggle-small">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Force Powers</h3>
+                    <input name="attr_npc-Force-Powers" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-force-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-force-section">
+                        <table class="sheet-talents" cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th style="width:50%">Name</th>
+                                <th style="width:50%">Power Summary</th>
+                            </tr>
+                            </thead>
+                        </table>
+                        <fieldset class="repeating_npc-powers">
+                            <table class="sheet-talent">
+                                <tbody>
+                                <tr>
+                                    <td style="width:50%" colspan="5"><input type="text" name="attr_npc-forcepowername" /></td>
+                                    <td style="width:50%" rowspan="3"><textarea rows="4" name="attr_npc-powersummary"></textarea></td>
+                                    <td rowspan="3"><button type='roll' name='roll_ForceSkill' value=@{npc-ForceSkill}></button></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Force Dice Available:</label></td>
+                                    <td><input type="number" name="attr_npc-forceavailable" value="@{npc-forcerating}-@{npc-forcecommitted}" disabled></td>
+                                    <td><label>Book &amp; Page:</label></td>
+                                    <td><input type="text" name="attr_npc-powerpagenum" /></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Skill List</label></td>
+                                    <td colspan="2">
+                                        <select name='attr_npc-ForceSkill'>
+                                            <option value="!eed characterID(@{character_id}) label(skill:Force Power |Power Name:@{npc-forcepowername}) @{npc-forceavailable}w @{dicePool} (gmdice)">No Skill</option>
+                                            <optgroup label="Combat Skills">
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name:Brawl|Power Name:@{npc-forcepowername}) skill(@{npc-rankBrawl}|@{npc-brawn}|@{npc-minion-group-size}|@{npc-minionskillBrawl}) @{npc-forceavailable}w @{dicePool} (gmdice)">Brawl</option>
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name:Ranged (Light)|Power Name:@{npc-forcepowername}) skill(@{npc-rankLight}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillLight}) @{npc-forceavailable}w @{dicePool} (gmdice)">Ranged (Light)</option>
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name:Ranged (Heavy)|Power Name:@{npc-forcepowername}) skill(@{npc-rankHeavy}|@{npc-agility}|@{npc-minion-group-size}|@{npc-minionskillHeavy}) @{npc-forceavailable}w @{dicePool} (gmdice)">Ranged (Heavy)</option>
+                                            </optgroup>
+                                            <optgroup label="Custom Skills">
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name: @{npc-customskillname1}|Power Name:@{npc-forcepowername}) skill(@{npc-rankcustomskillname1}|@{npc-charcustomskillname1}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname1}) @{npc-forceavailable}w @{dicePool} (gmdice)">Custom Skill 1</option>
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name: @{npc-customskillname2}|Power Name:@{npc-forcepowername}) skill(@{npc-rankcustomskillname2}|@{npc-charcustomskillname2}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname2}) @{npc-forceavailable}w @{dicePool} (gmdice)">Custom Skill 2</option>
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name: @{npc-customskillname3}|Power Name:@{npc-forcepowername}) skill(@{npc-rankcustomskillname3}|@{npc-charcustomskillname3}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname3}) @{npc-forceavailable}w @{dicePool} (gmdice)">Custom Skill 3</option>
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name: @{npc-customskillname4}|Power Name:@{npc-forcepowername}) skill(@{npc-rankcustomskillname4}|@{npc-charcustomskillname4}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname4}) @{npc-forceavailable}w @{dicePool} (gmdice)">Custom Skill 4</option>
+                                                <option value="!eed characterID(@{character_id}) label(skill:Force Power|Skill Name: @{npc-customskillname5}|Power Name:@{npc-forcepowername}) skill(@{npc-rankcustomskillname5}|@{npc-charcustomskillname5}|@{npc-minion-group-size}|@{npc-minionskillcustomskillname5}) @{npc-forceavailable}w @{dicePool} (gmdice)">Custom Skill 5</option>
+                                            </optgroup>
+                                        </select>
+                                    </td><!--Skill List-->
+                                </tr>
+                                <tr>
+                                    <td><label>Modifiers</label></td>
+                                    <td><input name='attr_npc-ForceSkillDice' type="text" /></td>
+                                </tr>
+                                <tr><td colspan="5">&nbsp;</td></tr>
+                                </tbody>
+                            </table>
+                            <div class="sheet-attachments-wrapper">
+                                <input type="checkbox" name="attr_npc-powerupgrades" class="sheet-view-attachments" />
+                                <label class="sheet-view-attachments">View Upgrades</label>
+                                <div class="sheet-clear"></div>
+                                <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th>Upgrade</th>
+                                        <th>Rank</th>
+                                        <th>XP Cost</th>
+                                        <th>Description</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype1'></td>
+                                        <td><input name='attr_npc-forceupgrade1' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost1' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc1'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype2'></td>
+                                        <td><input name='attr_npc-forceupgrade2' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost2' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc2'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype3'></td>
+                                        <td><input name='attr_npc-forceupgrade3' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc3'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype4'></td>
+                                        <td><input name='attr_npc-forceupgrade4' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc4'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype5'></td>
+                                        <td><input name='attr_npc-forceupgrade' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc5'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype6'></td>
+                                        <td><input name='attr_npc-forceupgrade6' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc6'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype7'></td>
+                                        <td><input name='attr_npc-forceupgrade7' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc7'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype8'></td>
+                                        <td><input name='attr_npc-forceupgrade8' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc8'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype9'></td>
+                                        <td><input name='attr_npc-forceupgrade9' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc9'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype10'></td>
+                                        <td><input name='attr_npc-forceupgrade10' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc10'></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name='attr_npc-forceupgradetype11'></td>
+                                        <td><input name='attr_npc-forceupgrade11' type="number" /></td>
+                                        <td><input name='attr_npc-forceupgradecost3' type="number" /></td>
+                                        <td><textarea rows="3" name='attr_npc-forceupgradedesc11'></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div><!-- NPC Force Power Upgrades-->
+                        </fieldset>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Force Powers -->
+        <div class="sheet-clear"></div>
+    </div><!-- NPC Tab -->
+
+    <div class="sheet-tab-content sheet-tab-npc-critical">
+        <div class="sheet-row sheet-show-critical-table">
+            <div class="sheet-small-12 sheet-column">
+                <h3 class="sheet-section-header">Critical Injuries</h3>
+            </div>
+            <div class="sheet-small-9 sheet-column">
+                <input type="hidden" name="attr_npc-critTotal" value="0" />
+                <fieldset class="repeating_critnpc">
+                    <input type="hidden" name="attr_npc-critId" />
+                    <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                        <tbody>
+                        <tr>
+                            <td width="70%"><input type="text" name="attr_npc-critName" readonly="readonly" /></td>
+                            <td width="30%"><input type="text" name="attr_npc-critRange" readonly="readonly" /></td>
+                            <td class="sheet-crit-dice-bg">
+                                <input class="sheet-pd" value="4" type="hidden" name="attr_npc-critSeverity" /><span></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2" rowspan="2"><textarea rows="3" name="attr_npc-critSummary" readonly="readonly"></textarea></td>
+                            <td>
+                                <label>Effect:</label>
+                                <div class="sheet-switch">
+                                    <input type="radio" class="sheet-switch-input-on" name="attr_npc-critEffect" value="on" title="On" checked="checked">
+                                    <input type="radio" class="sheet-switch-input-off" name="attr_npc-critEffect" value="off" title="Off">
+                                    <span class="switch-selection"></span>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|npc|@{npc-critId})">Heal</button></td></tr>
+                        </tbody>
+                    </table>
+                </fieldset>
+            </div>
+            <div class="sheet-small-3 sheet-column">
+                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                    <tr>
+                        <td><label>Critical roll offset:</label></td>
+                        <td><input type="text" name="attr_npc-critAddOffset" value="" /></td>
+                    </tr>
+                    <tr><td colspan="2"><button type='roll' class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll|npc)">Roll Critical</button></td></tr>
+                    <tr>
+                        <td>
+                            <label>Critical number:</label>
+                            <input type="text" name="attr_npc-critAddRangeNum" value="" />
+                        </td>
+                        <td valign="bottom"><button type='roll' class="sheet-btn-add-crit" value="!eed characterID(@{character_id}) crit(add|npc|@{npc-critAddRangeNum})">Add Critical</button></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="sheet-clear"></div>
+        </div><!-- Critical Injury Table -->
+    </div><!-- NPC Critical Injuries -->
+</div><!-- NPC Sheet -->
 <div class="sheet-tab-content sheet-tab-gm-dice">
     <div class="sheet-row sheet-section-1">
         <div class="sheet-small-12 sheet-column">
             <br />
             <h3 class="sheet-section-header">GM Dice Pool</h3>
-            <table class="sheet-dice-pool" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
+            <input name="attr_gm-GM-Dice-Pool" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-dice-section-toggle" type="checkbox" checked="checked"/>
+            <div class="sheet-dice-section">
+                <table class="sheet-dice-pool" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
                     <tr>
                         <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png" /><input name="attr_bgm" type="number" step="1" max="9" min="0" value="0"></td>
                         <td class="sheet-light"><img src="http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png" /><input name="attr_ggm" type="number" step="1" max="9" min="0" value="0"></td>
@@ -10160,14 +7763,17 @@
                             </label>
                         </td>
                     </tr>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div><!-- GM Dice Pool -->
         <div class="sheet-small-6 sheet-column">
             <br>
             <h3 class="sheet-section-header">Destiny Pool</h3>
-            <table class="sheet-destiny" cellspaceing="0" cellpadding="0" border="0">
-                <tbody>
+            <input name="attr_gm-Destiny-Pool" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-destiny-section-toggle" type="checkbox" checked="checked"/>
+            <div class="sheet-destiny-section">
+                <table class="sheet-destiny" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
                     <tr>
                         <td colspan="1">
                             <button type='roll' class="sheet-btn-lightSide" value='!eed characterID(@{character_id}) destiny sendUpdate'>Force Player Update</button><br><br>
@@ -10186,8 +7792,9 @@
                         </td>
                         <td></td>
                     </tr>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
             <br>
             <div class="sheet-clear"></div>
         </div><!-- GM Destiny Pool -->
@@ -10196,19 +7803,21 @@
         <span class="sheet-tab-new">&emsp;Group Details&emsp;</span>
         <input type="radio" name="attr_gm-sheet" class="sheet-tab-new sheet-tab-gm-adversaries" value="2" />
         <span class="sheet-tab-new">&emsp;Campaign Details&emsp;</span>
-        <!--
-        <input type="radio" name="attr_gm-sheet" class="sheet-tab-new sheet-tab-gm-adversaries" value="3" />
-        <span class="sheet-tab-new">&emsp;Combat Quicksheet&emsp;</span>
-        -->
+        <input type="radio" name="attr_gm-sheet" class="sheet-tab-new sheet-tab-gm-combat" value="3" />
+        <span class="sheet-tab-new">&emsp;Player Group Sheet&emsp;</span>
+        <input type="radio" name="attr_gm-sheet" class="sheet-tab-new sheet-tab-gm-settings" value="4" />
+        <span class="sheet-tab-new">&emsp;Settings&emsp;</span>
 
         <div class="sheet-tab-content sheet-tab-gm-weapons">
             <div class="sheet-row">
                 <div class="sheet-row">
                     <div class="sheet-small-12 sheet-column">
                         <h3 class="sheet-section-header">Character Motivations</h3>
-                        <fieldset class="repeating_group-motivations">
-                            <table cellspacing="0" cellpadding="0" border="0">
-                                <tbody>
+                        <input name="attr_gm-Character-Motivations" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-motivations-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-motivations-section">
+                            <fieldset class="repeating_group-motivations">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
                                     <tr>
                                         <td><label>Player:</label></td>
                                         <td><input type="text" name="attr_playermotivationname1" /></td>
@@ -10221,18 +7830,21 @@
                                         <td><label>Type:</label></td>
                                         <td><input type="text" name="attr_playermotivationtype1" /></td>
                                     </tr>
-                                </tbody>
-                            </table>
-                            <br />
-                        </fieldset>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
                     </div>
                 </div><!-- Character Motivations -->
                 <div class="sheet-row">
                     <div class="sheet-small-12 sheet-column">
                         <h3 class="sheet-section-header">Character/Group Obligations</h3>
-                        <fieldset class="repeating_group-obligation">
-                            <table cellspacing="0" cellpadding="0" border="0">
-                                <tbody>
+                        <input name="attr_gm-Character/Group-Obligations" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-obligation-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-obligation-section">
+                            <fieldset class="repeating_group-obligation">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
                                     <tr>
                                         <td><label>Player:</label></td>
                                         <td><input type="text" name="attr_playerobligationname" /></td>
@@ -10257,28 +7869,31 @@
                                         <td><label>Notes:</label></td>
                                         <td><textarea rows="3" name="attr_playerobligationnotes"></textarea></td>
                                     </tr>
-                                </tbody>
-                            </table>
-                            <br />
-                        </fieldset>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
                     </div>
                 </div><!-- Character/Group Obligations -->
                 <div class="sheet-row">
                     <div class="sheet-small-12 sheet-column">
                         <h3 class="sheet-section-header">Character Duties</h3>
-                        <table>
-                            <tbody>
+                        <input name="attr_gm-Character-Duties" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-duties-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-duties-section">
+                            <table>
+                                <tbody>
                                 <tr>
                                     <td style="width:37.5%"><input type="hidden" name="attr_group-conrank" disabled /></td>
-                                    <td style="width:12.5%" text-align=left><label>Contribution Rank:</label></td>
+                                    <td style="width:12.5%"><label>Contribution Rank:</label></td>
                                     <td style="width:50%"><input type="number" name="attr_group-conrank" min="0" value="0" /></td>
                                 </tr>
-                            </tbody>
-                        </table>
-                        <br />
-                        <fieldset class="repeating_group-duty">
-                            <table cellspacing="0" cellpadding="0" border="0">
-                                <tbody>
+                                </tbody>
+                            </table>
+                            <br />
+                            <fieldset class="repeating_group-duty">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
                                     <tr>
                                         <td><label>Player:</label></td>
                                         <td><input type="text" name="attr_playerdutyname" /></td>
@@ -10307,18 +7922,21 @@
                                         <td><label>Rewards Given:</label></td>
                                         <td colspan="4"><textarea rows="3" name="attr_playerdutyrewards"></textarea></td>
                                     </tr>
-                                </tbody>
-                            </table>
-                            <br />
-                        </fieldset>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
                     </div>
                 </div><!-- Character Duties -->
                 <div class="sheet-row">
                     <div class="sheet-small-12 sheet-column">
                         <h3 class="sheet-section-header">Character Moralities</h3>
-                        <fieldset class="repeating_group-morality">
-                            <table cellspacing="0" cellpadding="0" border="0">
-                                <tbody>
+                        <input name="attr_gm-Character-Moralities" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-morality-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-morality-section">
+                            <fieldset class="repeating_group-morality">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
                                     <tr>
                                         <td><label>Player:</label></td>
                                         <td><input type="text" name="attr_playermoralityname" /></td>
@@ -10359,299 +7977,903 @@
                                         <td><label>Notes:</label></td>
                                         <td colspan="4"><textarea rows="3" name="attr_playermoralitynotes"></textarea></td>
                                     </tr>
-                                </tbody>
-                            </table>
-                            <br />
-                        </fieldset>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
                     </div>
                 </div><!-- Character Moralities -->
             </div>
         </div><!-- Group Mechanics -->
         <div class="sheet-tab-content sheet-tab-gm-adversaries">
             <div class="sheet-row">
-                <div class="sheet-row">
-                    <div class="sheet-small-12 sheet-column">
-                        <h3 class="sheet-section-header">Assignments and Tasks</h3>
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Assignments and Tasks</h3>
+                    <input name="attr_gm-Assignments-and-Tasks" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-assignment-section-toggle" type="checkbox" checked="checked"/>
+                    <div class="sheet-assignment-section">
                         <fieldset class="repeating_grouptasks">
-                            <div class="sheet-row">
-                                <div class="sheet-small-12 sheet-column">
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <tbody>
-                                            <tr class="sheet-bg-blue">
-                                                <td><label>Mission/Task Number:</label></td>
-                                                <td><input type="number" name="attr_groupmission-tasknum" min="1" value="1" /></td>
-                                                <td><label>Expected sessions to complete:</label></td>
-                                                <td><input type="number" name="attr_groupmission-expectsess" min="1" value="1" /></td>
-                                            </tr>
-                                            <tr class="sheet-bg-blue">
-                                                <td><label>Completed?:</label></td>
-                                                <td>
-                                                    <select name='attr_groupmission-completed'>
-                                                        <option value="No-Notstarted">No - Not Started</option>
-                                                        <option value="No-InProgress">No - In Progress</option>
-                                                        <option value="Yes-Completed">Yes - Completed</option>
-                                                        <option value="Yes-Failed">Yes - Failed</option>
-                                                    </select>
-                                                </td>
-                                                <td><label>Actual sessions to complete:</label></td>
-                                                <td><input type="number" name="attr_groupmission-actualsess" min="1" value="1" /></td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="sheet-clear"></div>
+                            <div>
+                                <b>Assignment</b><input name="attr_details-Assignment" value="1" style="width: 99px; margin: -13px -20px 0 -83px;" class="sheet-toggle sheet-assignment-toggle" type="checkbox" checked="checked"/><span></span>
+                                <div class="sheet-assignment">
+                                    <b>Mission Details</b><input name="attr_details-Mission-Details" value="1" style="width: 120px; margin: -13px -20px 0 -104px;" class="sheet-toggle sheet-mission-toggle" type="checkbox" checked="checked"/><span></span>
+                                    <div class="sheet-row sheet-mission">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                <tr class="sheet-bg-blue">
+                                                    <td><label>Mission/Task Number:</label></td>
+                                                    <td><input type="number" name="attr_groupmission-tasknum" min="1" value="1" /></td>
+                                                    <td><label>Expected sessions to complete:</label></td>
+                                                    <td><input type="number" name="attr_groupmission-expectsess" min="1" value="1" /></td>
+                                                </tr>
+                                                <tr class="sheet-bg-blue">
+                                                    <td><label>Completed?:</label></td>
+                                                    <td>
+                                                        <select name='attr_groupmission-completed'>
+                                                            <option value="No-Notstarted">No - Not Started</option>
+                                                            <option value="No-InProgress">No - In Progress</option>
+                                                            <option value="Yes-Completed">Yes - Completed</option>
+                                                            <option value="Yes-Failed">Yes - Failed</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><label>Actual sessions to complete:</label></td>
+                                                    <td><input type="number" name="attr_groupmission-actualsess" min="1" value="1" /></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <div class="sheet-clear"></div>
+                                        </div>
+                                    </div><!--Book Keeping-->
+
+                                    <br/><b>General Info</b><input name="attr_details-General-Info" value="1" style="width: 101px; margin: -13px -20px 0 -85px;" class="sheet-toggle sheet-geninfo-toggle" type="checkbox" checked="checked"/><span></span>
+                                    <div class="sheet-row sheet-geninfo">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <thead>
+                                                <tr><th colspan="2">General Info</th></tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr>
+                                                    <td><label>Mission Type:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-type" /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label>Setup:</label></td>
+                                                    <td class="sheet-div-right"><textarea rows="2" name="attr_groupmission-setup"></textarea></td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label>Hook:</label></td>
+                                                    <td class="sheet-div-right"><textarea rows="2" name="attr_groupmission-hook"></textarea></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <div class="sheet-clear"></div>
+                                        </div>
+                                    </div><!--General Narrative Info-->
+
+                                    <br/><b>Location</b><input name="attr_details-Location" value="1" style="width: 79px; margin: -13px -20px 0 -63px;" class="sheet-toggle sheet-location-toggle" type="checkbox" checked="checked"/><span></span>
+                                    <div class="sheet-row sheet-location">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <thead>
+                                                <tr><th colspan="6">Location</th></tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr>
+                                                    <td><label>Planet:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-planet" /></td>
+                                                    <td><label>Continent:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-continent" /></td>
+                                                    <td><label>City:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-city" /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label>Terrain:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-terrain" /></td>
+                                                    <td><label>Nearest Hyperlane:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-hyperlane" /></td>
+                                                    <td><label>Galaxy Map Grid Coordinates:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-coords" /></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <div class="sheet-clear"></div>
+                                        </div>
+                                    </div><!--Location-->
+
+                                    <br/><b>Rewards</b><input name="attr_details-Rewards" value="1" style="width: 78px; margin: -13px -20px 0 -62px;" class="sheet-toggle sheet-rewards-toggle" type="checkbox" checked="checked"/><span></span>
+                                    <div class="sheet-row sheet-rewards">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <thead>
+                                                <tr><th colspan="4">Reward(s)</th></tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr>
+                                                    <td><label>Credits:</label></td>
+                                                    <td><input type="text" name="attr_groupmission-awardcredits" value="0" /></td>
+                                                    <td><label>Item(s):</label></td>
+                                                    <td><input type="text" name="attr_groupmission-awarditems" /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td></td>
+                                                    <td><label>Base XP:</label></td>
+                                                    <td><input type="number" name="attr_groupmission-awardxp-base" min="0" value="0" /></td>
+                                                    <td></td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label>Bonus XP (Motivation):</label></td>
+                                                    <td><input type="number" name="attr_groupmission-awardxp-motiv" min="0" value="0" /></td>
+                                                    <td><label>Bonus XP (Role Playing):</label></td>
+                                                    <td><input type="number" name="attr_groupmission-awardxp-roleplay" min="0" value="0" /></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <div class="sheet-clear"></div>
+                                        </div>
+                                    </div><!--Rewards-->
+
+                                    <br/><b>Specific Details</b><input name="attr_details-Specific-Details" value="1" style="width: 121px; margin: -13px -20px 0 -105px;" class="sheet-toggle sheet-details-toggle" type="checkbox" checked="checked"/><span></span>
+                                    <div class="sheet-row sheet-details">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <thead>
+                                                <tr><th colspan="2">Specific Details</th></tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr>
+                                                    <td><label>Mission Objectives:</label></td>
+                                                    <td><textarea rows="3" name="attr_groupmission-objectives"></textarea></td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label>Key Items:</label></td>
+                                                    <td><textarea rows="3" name="attr_groupmission-keyitems"></textarea></td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label>Mission Contacts:</label></td>
+                                                    <td><textarea rows="3" name="attr_groupmission-contacts"></textarea></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <div class="sheet-clear"></div>
+                                        </div>
+                                    </div><!--Specific Details-->
+
+                                    <br/><b>NPC List</b><input name="attr_details-NPC-List" value="1" style="width: 79px; margin: -13px -20px 0 -63px;" class="sheet-toggle sheet-list-toggle" type="checkbox" checked="checked"/><span></span>
+                                    <div class="sheet-row sheet-list">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <thead>
+                                                <tr>
+                                                    <th style="width:180px;">NPC Name</th>
+                                                    <th style="width:180px;">Type <span style="font-size:10px">(Minion, Rival, or Nemesis)</span></th>
+                                                    <th>Number</th>
+                                                    <th><span style="float:left">Skill</span></th>
+                                                    <th colspan="3"><span style="float:left">Modifiers</span></th>
+                                                </tr>
+                                                </thead>
+                                            </table>
+                                            <table>
+                                                <tbody>
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_NPCName1' type="text" /></td>
+                                                    <td style="width:180px;">
+                                                        <select name='attr_groupmission-NPCtype1'>
+                                                            <option value="Minion">Minion</option>
+                                                            <option value="Rival">Rival</option>
+                                                            <option value="Nemesis">Nemesis</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_groupmission-NPCnumber1' type="number" /></td>
+                                                    <td>
+                                                        <select name='attr_NPCInitSkill1'>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName1}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype1}) @{NPCInitModifiers1} @{dicePool} (gmdice)">Cool</option>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName1}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype1}) @{NPCInitModifiers1} @{dicePool} (gmdice)">Vigilance</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_NPCInitModifiers1' type="text" /></td>
+                                                    <td><button type='roll' name='roll_NPCInitRoll1' value=@{NPCInitSkill1}></button></td>
+                                                </tr><!--NPC 1-->
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_NPCName2' type="text" /></td>
+                                                    <td style="width:180px;">
+                                                        <select name='attr_groupmission-NPCtype2'>
+                                                            <option value="Minion">Minion</option>
+                                                            <option value="Rival">Rival</option>
+                                                            <option value="Nemesis">Nemesis</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_groupmission-NPCnumber2' type="number" /></td>
+                                                    <td>
+                                                        <select name='attr_NPCInitSkill2'>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName2}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype2}) @{NPCInitModifiers2} @{dicePool} (gmdice)">Cool</option>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName2}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype2}) @{NPCInitModifiers2} @{dicePool} (gmdice)">Vigilance</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_NPCInitModifiers2' type="text" /></td>
+                                                    <td><button type='roll' name='roll_NPCInitRoll2' value=@{NPCInitSkill2}></button></td>
+                                                </tr><!--NPC 2-->
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_NPCName3' type="text" /></td>
+                                                    <td style="width:180px;">
+                                                        <select name='attr_groupmission-NPCtype3'>
+                                                            <option value="Minion">Minion</option>
+                                                            <option value="Rival">Rival</option>
+                                                            <option value="Nemesis">Nemesis</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_groupmission-NPCnumber3' type="number" /></td>
+                                                    <td>
+                                                        <select name='attr_NPCInitSkill3'>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName3}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype3}) @{NPCInitModifiers3} @{dicePool} (gmdice)">Cool</option>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName3}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype3}) @{NPCInitModifiers3} @{dicePool} (gmdice)">Vigilance</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_NPCInitModifiers3' type="text" /></td>
+                                                    <td><button type='roll' name='roll_NPCInitRoll3' value=@{NPCInitSkill3}></button></td>
+                                                </tr><!--NPC 3-->
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_NPCName4' type="text" /></td>
+                                                    <td style="width:180px;">
+                                                        <select name='attr_groupmission-NPCtype4'>
+                                                            <option value="Minion">Minion</option>
+                                                            <option value="Rival">Rival</option>
+                                                            <option value="Nemesis">Nemesis</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_groupmission-NPCnumber4' type="number" /></td>
+                                                    <td>
+                                                        <select name='attr_NPCInitSkill4'>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName4}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype4}) @{NPCInitModifiers4} @{dicePool} (gmdice)">Cool</option>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName4}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype4}) @{NPCInitModifiers4} @{dicePool} (gmdice)">Vigilance</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_NPCInitModifiers4' type="text" /></td>
+                                                    <td><button type='roll' name='roll_NPCInitRoll4' value=@{NPCInitSkill4}></button></td>
+                                                </tr><!--NPC 4-->
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_NPCName5' type="text" /></td>
+                                                    <td style="width:180px;">
+                                                        <select name='attr_groupmission-NPCtype5'>
+                                                            <option value="Minion">Minion</option>
+                                                            <option value="Rival">Rival</option>
+                                                            <option value="Nemesis">Nemesis</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_groupmission-NPCnumber5' type="number" /></td>
+                                                    <td>
+                                                        <select name='attr_NPCInitSkill5'>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName5}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype5}) @{NPCInitModifiers5} @{dicePool} (gmdice)">Cool</option>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName5}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype5}) @{NPCInitModifiers5} @{dicePool} (gmdice)">Vigilance</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_NPCInitModifiers5' type="text" /></td>
+                                                    <td><button type='roll' name='roll_NPCInitRoll5' value=@{NPCInitSkill5}></button></td>
+                                                </tr><!--NPC 5-->
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_NPCName6' type="text" /></td>
+                                                    <td style="width:180px;">
+                                                        <select name='attr_groupmission-NPCtype6'>
+                                                            <option value="Minion">Minion</option>
+                                                            <option value="Rival">Rival</option>
+                                                            <option value="Nemesis">Nemesis</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_groupmission-NPCnumber6' type="number" /></td>
+                                                    <td>
+                                                        <select name='attr_NPCInitSkill6'>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName6}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype6}) @{NPCInitModifiers6} @{dicePool} (gmdice)">Cool</option>
+                                                            <option value="!eed npcinit rollPlayer(character:@{NPCName6}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype6}) @{NPCInitModifiers6} @{dicePool} (gmdice)">Vigilance</option>
+                                                        </select>
+                                                    </td>
+                                                    <td><input name='attr_NPCInitModifiers6' type="text" /></td>
+                                                    <td><button type='roll' name='roll_NPCInitRoll6' value=@{NPCInitSkill6}></button></td>
+                                                </tr><!--NPC 6-->
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div><!--NPC List-->
                                 </div>
-                            </div><!--Book Keeping-->
-                            <div class="sheet-row">
-                                <div class="sheet-small-12 sheet-column">
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <thead>
-                                            <tr><th colspan="2">General Info</th></tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr>
-                                                <td><label>Mission Type:</label></td>
-                                                <td><input type="text" name="attr_groupmission-type" /></td>
-                                            </tr>
-                                            <tr>
-                                                <td><label>Setup:</label></td>
-                                                <td class="sheet-div-right"><textarea rows="2" name="attr_groupmission-setup"></textarea></td>
-                                            </tr>
-                                            <tr>
-                                                <td><label>Hook:</label></td>
-                                                <td class="sheet-div-right"><textarea rows="2" name="attr_groupmission-hook"></textarea></td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="sheet-clear"></div>
-                                </div>
-                            </div><!--General Narative Info-->
-                            <div class="sheet-row">
-                                <div class="sheet-small-12 sheet-column">
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <thead>
-                                            <tr><th colspan="6">Location</th></tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr>
-                                                <td><label>Planet:</label></td>
-                                                <td><input type="text" name="attr_groupmission-planet" /></td>
-                                                <td><label>Continent:</label></td>
-                                                <td><input type="text" name="attr_groupmission-continent" /></td>
-                                                <td><label>City:</label></td>
-                                                <td><input type="text" name="attr_groupmission-city" /></td>
-                                            </tr>
-                                            <tr>
-                                                <td><label>Terrain:</label></td>
-                                                <td><input type="text" name="attr_groupmission-terrain" /></td>
-                                                <td><label>Nearest Hyperlane:</label></td>
-                                                <td><input type="text" name="attr_groupmission-hyperlane" /></td>
-                                                <td><label>Galaxy Map Grid Coordinates:</label></td>
-                                                <td><input type="text" name="attr_groupmission-coords" /></td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="sheet-clear"></div>
-                                </div>
-                            </div><!--Location-->
-                            <div class="sheet-row">
-                                <div class="sheet-small-12 sheet-column">
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <thead>
-                                            <tr><th colspan="4">Reward(s)</th></tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr>
-                                                <td><label>Credits:</label></td>
-                                                <td><input type="text" name="attr_groupmission-awardcredits" value="0" /></td>
-                                                <td><label>Item(s):</label></td>
-                                                <td><input type="text" name="attr_groupmission-awarditems" /></td>
-                                            </tr>
-                                            <tr>
-                                                <td></td>
-                                                <td><label>Base XP:</label></td>
-                                                <td><input type="number" name="attr_groupmission-awardxp-base" min="0" value="0" /></td>
-                                                <td></td>
-                                            </tr>
-                                            <tr>
-                                                <td><label>Bonus XP (Motivation):</label></td>
-                                                <td><input type="number" name="attr_groupmission-awardxp-motiv" min="0" value="0" /></td>
-                                                <td><label>Bonus XP (Role Playing):</label></td>
-                                                <td><input type="number" name="attr_groupmission-awardxp-roleplay" min="0" value="0" /></td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="sheet-clear"></div>
-                                </div>
-                            </div><!--Rewards-->
-                            <div class="sheet-row">
-                                <div class="sheet-small-12 sheet-column">
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <thead>
-                                            <tr><th colspan="2">Specific Details</th></tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr>
-                                                <td><label>Mission Objectives:</label></td>
-                                                <td><textarea rows="3" name="attr_groupmission-objectives"></textarea></td>
-                                            </tr>
-                                            <tr>
-                                                <td><label>Key Items:</label></td>
-                                                <td><textarea rows="3" name="attr_groupmission-keyitems"></textarea></td>
-                                            </tr>
-                                            <tr>
-                                                <td><label>Mission Contacts:</label></td>
-                                                <td><textarea rows="3" name="attr_groupmission-contacts"></textarea></td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="sheet-clear"></div>
-                                </div>
-                            </div><!--Specific Details-->
-                            <div class="sheet-row">
-                                <div class="sheet-small-12 sheet-column">
-                                    <table cellspacing="0" cellpadding="0" border="0">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:180px;">NPC Name</th>
-                                                <th style="width:180px;">Type <span style="font-size:10px">(Minion, Rival, or Nemesis)</span></th>
-                                                <th>Number</th>
-                                                <th><span style="float:left">Skill</span></th>
-                                                <th colspan="3"><span style="float:left">Modifiers</span></th>
-                                            </tr>
-                                        </thead>
-                                    </table>
-                                    <table>
-                                        <tbody>
-                                            <tr>
-                                                <td style="width:180px;"><input name='attr_NPCName1' type="text" /></td>
-                                                <td style="width:180px;">
-                                                    <select name='attr_groupmission-NPCtype1'>
-                                                        <option value="Minion">Minion</option>
-                                                        <option value="Rival">Rival</option>
-                                                        <option vaule="Nemesis">Nemesis</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_groupmission-NPCnumber1' type="number" /></td>
-                                                <td>
-                                                    <select name='attr_NPCInitSkill1'>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName1}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype1}) @{NPCInitModifiers1} @{dicePool} (gmdice)">Cool</option>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName1}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype1}) @{NPCInitModifiers1} @{dicePool} (gmdice)">Vigilance</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_NPCInitModifiers1' type="text" /></td>
-                                                <td><button type='roll' name='roll_NPCInitRoll1' value=@{NPCInitSkill1}></button></td>
-                                            </tr><!--NPC 1-->
-                                            <tr>
-                                                <td style="width:180px;"><input name='attr_NPCName2' type="text" /></td>
-                                                <td style="width:180px;">
-                                                    <select name='attr_groupmission-NPCtype2'>
-                                                        <option value="Minion">Minion</option>
-                                                        <option value="Rival">Rival</option>
-                                                        <option vaule="Nemesis">Nemesis</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_groupmission-NPCnumber2' type="number" /></td>
-                                                <td>
-                                                    <select name='attr_NPCInitSkill2'>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName2}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype2}) @{NPCInitModifiers2} @{dicePool} (gmdice)">Cool</option>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName2}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype2}) @{NPCInitModifiers2} @{dicePool} (gmdice)">Vigilance</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_NPCInitModifiers2' type="text" /></td>
-                                                <td><button type='roll' name='roll_NPCInitRoll2' value=@{NPCInitSkill2}></button></td>
-                                            </tr><!--NPC 2-->
-                                            <tr>
-                                                <td style="width:180px;"><input name='attr_NPCName3' type="text" /></td>
-                                                <td style="width:180px;">
-                                                    <select name='attr_groupmission-NPCtype3'>
-                                                        <option value="Minion">Minion</option>
-                                                        <option value="Rival">Rival</option>
-                                                        <option vaule="Nemesis">Nemesis</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_groupmission-NPCnumber3' type="number" /></td>
-                                                <td>
-                                                    <select name='attr_NPCInitSkill3'>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName3}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype3}) @{NPCInitModifiers3} @{dicePool} (gmdice)">Cool</option>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName3}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype3}) @{NPCInitModifiers3} @{dicePool} (gmdice)">Vigilance</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_NPCInitModifiers3' type="text" /></td>
-                                                <td><button type='roll' name='roll_NPCInitRoll3' value=@{NPCInitSkill3}></button></td>
-                                            </tr><!--NPC 3-->
-                                            <tr>
-                                                <td style="width:180px;"><input name='attr_NPCName4' type="text" /></td>
-                                                <td style="width:180px;">
-                                                    <select name='attr_groupmission-NPCtype4'>
-                                                        <option value="Minion">Minion</option>
-                                                        <option value="Rival">Rival</option>
-                                                        <option vaule="Nemesis">Nemesis</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_groupmission-NPCnumber4' type="number" /></td>
-                                                <td>
-                                                    <select name='attr_NPCInitSkill4'>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName4}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype4}) @{NPCInitModifiers4} @{dicePool} (gmdice)">Cool</option>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName4}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype4}) @{NPCInitModifiers4} @{dicePool} (gmdice)">Vigilance</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_NPCInitModifiers4' type="text" /></td>
-                                                <td><button type='roll' name='roll_NPCInitRoll4' value=@{NPCInitSkill4}></button></td>
-                                            </tr><!--NPC 4-->
-                                            <tr>
-                                                <td style="width:180px;"><input name='attr_NPCName5' type="text" /></td>
-                                                <td style="width:180px;">
-                                                    <select name='attr_groupmission-NPCtype5'>
-                                                        <option value="Minion">Minion</option>
-                                                        <option value="Rival">Rival</option>
-                                                        <option vaule="Nemesis">Nemesis</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_groupmission-NPCnumber5' type="number" /></td>
-                                                <td>
-                                                    <select name='attr_NPCInitSkill5'>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName5}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype5}) @{NPCInitModifiers5} @{dicePool} (gmdice)">Cool</option>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName5}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype5}) @{NPCInitModifiers5} @{dicePool} (gmdice)">Vigilance</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_NPCInitModifiers5' type="text" /></td>
-                                                <td><button type='roll' name='roll_NPCInitRoll5' value=@{NPCInitSkill5}></button></td>
-                                            </tr><!--NPC 5-->
-                                            <tr>
-                                                <td style="width:180px;"><input name='attr_NPCName6' type="text" /></td>
-                                                <td style="width:180px;">
-                                                    <select name='attr_groupmission-NPCtype6'>
-                                                        <option value="Minion">Minion</option>
-                                                        <option value="Rival">Rival</option>
-                                                        <option vaule="Nemesis">Nemesis</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_groupmission-NPCnumber6' type="number" /></td>
-                                                <td>
-                                                    <select name='attr_NPCInitSkill6'>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName6}|skill:presence,rankCool) label(skill:NPC-Initiative Cool|NPC Type:@{groupmission-NPCtype6}) @{NPCInitModifiers6} @{dicePool} (gmdice)">Cool</option>
-                                                        <option value="!eed npcinit rollPlayer(character:@{NPCName6}|skill:willpower,rankVigilance) label(skill:NPC-Initiative Vigilance|NPC Type:@{groupmission-NPCtype6}) @{NPCInitModifiers6} @{dicePool} (gmdice)">Vigilance</option>
-                                                    </select>
-                                                </td>
-                                                <td><input name='attr_NPCInitModifiers6' type="text" /></td>
-                                                <td><button type='roll' name='roll_NPCInitRoll6' value=@{NPCInitSkill6}></button></td>
-                                            </tr><!--NPC 6-->
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div><!--NPC List-->
+                                <hr/>
+                            </div>
                         </fieldset><!--Single Task (Repeating)-->
                     </div>
-                </div><!-- Assignments and Tasks -->
-            </div>
+                </div>
+            </div><!-- Assignments and Tasks -->
         </div><!-- Campaign Details -->
+        <div class="sheet-tab-content sheet-tab-gm-combat">
+            <br />
+            <input type="radio" style="width:145px;margin:-2px -30px 0 4px;" name="attr_group-sheet" class="sheet-tab-new sheet-tab-group-base-details" value="1" />
+            <span class="sheet-tab-new">&emsp;Base of Operations &emsp;</span>
+            <input type="radio" name="attr_group-sheet" class="sheet-tab-new sheet-tab-group-shared" value="2" />
+            <span class="sheet-tab-new">&emsp;Shared Resources &emsp;</span>
+
+            <div class="sheet-tab-content sheet-tab-group-base-details">
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <input type="radio" name="attr_opt-group-base-type" class="sheet-opt sheet-opt-rebel" value="1" title="Rebel Base" checked="checked" />
+                        <input type="radio" name="attr_opt-group-base-type" class="sheet-opt sheet-opt-business" value="2" title="Business" />
+                        <input type="radio" name="attr_opt-group-base-type" class="sheet-opt sheet-opt-homestead" value="3" title="Homestead" />
+
+                        <div class="sheet-spacer sheet-tab-content sheet-opt-rebel">
+                            <h3 class="sheet-section-header">Details</h3>
+                            <input name="attr_gm-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-details-section">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Rebel Base Name:</label></td>
+                                        <td><input name="attr_rebel-base-name" type="text" /></td>
+                                        <td><label>Location:</label></td>
+                                        <td><input name="attr_rebel-base-location" type="text" /></td>
+                                    </tr>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Core Type:</label></td>
+                                        <td>
+                                            <select name='attr_rebelbasecoretype'>
+                                                <option value="1">Safe House</option>
+                                                <option value="2">Training Camp</option>
+                                                <option value="3">Meeting Center</option>
+                                                <option value="4">Other</option>
+                                            </select>
+                                        </td>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_rebelbasecoredetails"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <br />
+                            <h3 class="sheet-section-header">NPCs</h3>
+                            <input name="attr_gm-NPCs" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-npc-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-npc-section">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Name:</label></td>
+                                        <td><input name="attr_rebel-base-NPC-name1" type="text" /></td>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_rebelbase-npcdescription1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Position/Role:</label></td>
+                                        <td><input name="attr_rebel-base-NPC-position1" type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <fieldset class="repeating_rebel-base-NPC-position">
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Name:</label></td>
+                                            <td><input name="attr_rebel-base-NPC-name2" type="text" /></td>
+                                            <td><label>Description:</label></td>
+                                            <td><textarea rows="2" name="attr_rebel-base-NPC-description2"></textarea></td>
+                                        </tr>
+                                        </tbody>
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Position/Role:</label></td>
+                                            <td><input name="attr_rebel-base-NPC-position2" type="text" /></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                            </div>
+                            <div class="sheet-clear"></div>
+                            <br />
+                            <h3 class="sheet-section-header">Upgrades</h3>
+                            <input name="attr_gm-Upgrades" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-upgrades-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-upgrades-section">
+                                <table class="sheet-base-upgrades" cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th style="width:50%">Upgrade Type:</th>
+                                        <th style="width:50%">Description</th>
+                                    </tr>
+                                    </thead>
+                                </table>
+                                <fieldset class="repeating_baseupgrades">
+                                    <table class="sheet-base-upgrades">
+                                        <tbody>
+                                        <tr>
+                                            <td style="width:50%" colspan="5"><input type="text" name="attr_rebelupgradename1" /></td>
+                                            <td style="width:50%" rowspan="2"><textarea rows="3" name="attr_rebelupgradedescription1"></textarea></td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Cost:</label></td>
+                                            <td style="width:50px"><input name='attr_rebelupgradesprice1' type="text" size="5" min="0" value="0" /></td>
+                                            <td><label>Number of Upgrades:</label></td>
+                                            <td style="width:50px"><input name='attr_rebelupgradesnumber1' type="number" max="5" min="0" value="0" /></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                            </div>
+                            <div class="sheet-clear"></div>
+                        </div><!-- Rebel Base Info -->
+                        <div class="sheet-spacer sheet-tab-content sheet-opt-business">
+                            <h3 class="sheet-section-header">Details</h3>
+                            <input name="attr_gm-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-details-section">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Business Name:</label></td>
+                                        <td><input name="attr_business-name" type="text" /></td>
+                                        <td><label>Location:</label></td>
+                                        <td><input name="attr_business-location" type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Type:</label></td>
+                                        <td>
+                                            <select name='attr_business-type'>
+                                                <option value="1">Entertainment</option>
+                                                <option value="2">Retail</option>
+                                                <option value="3">Service</option>
+                                            </select>
+                                        </td>
+                                        <td><label>Party Career Skill:</label></td>
+                                        <td>
+                                            <select name='attr_business-careerskill'>
+                                                <option value="1">Charm</option>
+                                                <option value="2">Negotiation</option>
+                                                <option value="3">Mechanics</option>
+                                                <option value="4">Computers</option>
+                                                <option value="5">Knowledge (Core Worlds)</option>
+                                                <option value="6">Knowledge (Education)</option>
+                                                <option value="7">Knowledge (Lore)</option>
+                                                <option value="8">Knowledge (Outer Rim)</option>
+                                                <option value="9">Knowledge (Underworld)</option>
+                                                <option value="10">Knowledge (Xenology)</option>
+                                                <option value="11">Knowledge (Warfare)</option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_business-details"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <br />
+                            <h3 class="sheet-section-header">NPCs</h3>
+                            <input name="attr_gm-NPCs" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-npc-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-npc-section">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Name:</label></td>
+                                        <td><input name="attr_business-NPC-name1" type="text" /></td>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_rebelbase-npcdescription1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Position/Role:</label></td>
+                                        <td><input name="attr_business-NPC-position1" type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <fieldset class="repeating_business-NPC-position">
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Name:</label></td>
+                                            <td><input name="attr_business-NPC-name2" type="text" /></td>
+                                            <td><label>Description:</label></td>
+                                            <td><textarea rows="2" name="attr_business-NPC-description2"></textarea></td>
+                                        </tr>
+                                        </tbody>
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Position/Role:</label></td>
+                                            <td><input name="attr_business-NPC-position2" type="text" /></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                            </div>
+                            <div class="sheet-clear"></div>
+                            <br />
+                            <h3 class="sheet-section-header">Upgrades</h3>
+                            <input name="attr_gm-Upgrades" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-upgrades-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-upgrades-section">
+                                <table class="sheet-business-upgrades" cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th style="width:50%">Upgrade Type:</th>
+                                        <th style="width:50%">Description</th>
+                                    </tr>
+                                    </thead>
+                                </table>
+                                <fieldset class="repeating_businessupgrade">
+                                    <table class="sheet-business-upgrades">
+                                        <tbody>
+                                        <tr>
+                                            <td style="width:50%" colspan="5"><input type="text" name="attr_businessupgradename1" /></td>
+                                            <td style="width:50%" rowspan="2"><textarea rows="3" name="attr_businessupgradedescription1"></textarea></td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Cost:</label></td>
+                                            <td style="width:50px"><input name='attr_businessupgradesprice1' type="text" size="5" min="0" value="0" /></td>
+                                            <td><label>Number of Upgrades:</label></td>
+                                            <td style="width:50px"><input name='attr_businessupgradesnumber1' type="number" max="5" min="0" value="0" /></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                            </div>
+                            <div class="sheet-clear"></div>
+                        </div><!-- Business Info -->
+                        <div class="sheet-spacer sheet-tab-content sheet-opt-homestead">
+                            <h3 class="sheet-section-header">Details</h3>
+                            <input name="attr_gm-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-details-section">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Homestead Name:</label></td>
+                                        <td><input name="attr_homestead-name" type="text" /></td>
+                                        <td><label>Location:</label></td>
+                                        <td><input name="attr_homestead-location" type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Type:</label></td>
+                                        <td>
+                                            <select name='attr_homestead-type'>
+                                                <option value="1">Farm</option>
+                                                <option value="2">Ranch</option>
+                                                <option value="3">Mine</option>
+                                                <option value="4">Space Station</option>
+                                            </select>
+                                        </td>
+                                        <td><label>Party Career Skill:</label></td>
+                                        <td>
+                                            <select name='attr_homestead-careerskill'>
+                                                <option value="1">Resilience</option>
+                                                <option value="2">Survival</option>
+                                                <option value="3">Athletics</option>
+                                                <option value="4">Piloting (Space)</option>
+                                            </select>
+                                        </td>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_homestead-details"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <br />
+                            <h3 class="sheet-section-header">NPCs</h3>
+                            <input name="attr_gm-NPCs" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-npc-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-npc-section">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Name:</label></td>
+                                        <td><input name="attr_homestead-NPC-name1" type="text" /></td>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_homestead-NPC-description1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Position/Role:</label></td>
+                                        <td><input name="attr_homestead-NPC-position1" type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <fieldset class="repeating_homestead-NPC-position">
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Name:</label></td>
+                                            <td><input name="attr_homestead-NPC-name2" type="text" /></td>
+                                            <td><label>Description:</label></td>
+                                            <td><textarea rows="2" name="attr_homestead-NPC-description2"></textarea></td>
+                                        </tr>
+                                        </tbody>
+                                        <tbody>
+                                        <tr>
+                                            <td><label>Position/Role:</label></td>
+                                            <td><input name="attr_homestead-NPC-position2" type="text" /></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                            </div>
+                            <div class="sheet-clear"></div>
+                            <br />
+                            <h3 class="sheet-section-header">Upgrades</h3>
+                            <input name="attr_gm-Upgrades" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-upgrades-section-toggle" type="checkbox" checked="checked"/>
+                            <div class="sheet-upgrades-section">
+                                <table class="sheet-homestead-upgrades" cellspacing="0" cellpadding="0" border="0">
+                                    <thead>
+                                    <tr>
+                                        <th style="width:50%">Upgrade Type:</th>
+                                        <th style="width:50%">Description</th>
+                                    </tr>
+                                    </thead>
+                                </table>
+                                <fieldset class="repeating_homesteadupgrade">
+                                    <table class="sheet-homestead-upgrades">
+                                        <tbody>
+                                        <tr>
+                                            <td style="width:50%" colspan="5"><input type="text" name="attr_homestead-upgrade-name1" /></td>
+                                            <td style="width:50%" rowspan="2"><textarea rows="3" name="attr_homestead-upgrade-description1"></textarea></td>
+                                        </tr>
+                                        <tr>
+                                            <td><label>Cost:</label></td>
+                                            <td style="width:50px"><input name='attr_homestead-upgrade-price1' type="text" size="5" min="0" value="0" /></td>
+                                            <td><label>Number of Upgrades:</label></td>
+                                            <td style="width:50px"><input name='attr_homestead-upgrade-number1' type="number" max="5" min="0" value="0" /></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                            </div>
+                        </div><!-- Homestead Info -->
+                    </div>
+                </div>
+            </div><!-- Base Of Operations Details -->
+            <div class="sheet-tab-content sheet-tab-group-shared">
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Group Details</h3>
+                        <input name="attr_gm-Group-Details" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-details-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-details-section">
+                            <table class="sheet-character" cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr class="sheet-bg-grey">
+                                    <td colspan="2"><label style="text-align:right">Group Name:</label></td>
+                                    <td colspan="5"><input type="text" name="attr_groupname" /></td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Group Credits:</label></td>
+                                    <td><input type="text" name="attr_groupcredits" disabled value='(@{grouppettycash} + @{groupsavings})' /></td>
+                                    <td><label>Petty Cash:</label></td>
+                                    <td><input name="attr_grouppettycash" type="text" value="0" /></td>
+                                    <td><label>Group Savings:</label></td>
+                                    <td><input name="attr_groupsavings" type="text" value="0" /></td>
+                                    <td><label>Group Expenses:</label></td>
+                                    <td><input name="attr_groupexpenses" type="text" value="0" /></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="8">
+                                        <table cellspacing="0" cellpadding="0" border="0">
+                                            <tbody>
+                                            <tr>
+                                                <td><label style="text-align:left">Current Location:</label></td>
+                                                <td><input type="text" name="attr_grouplocation" /></td>
+                                                <td><label style="text-align:left">Nearest Hyperlane:</label></td>
+                                                <td><input type="text" name="attr_groupnearesthyperlane" /></td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div><!--Group Details-->
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Group Contacts</h3>
+                        <input name="attr_gm-Group-Contacts" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-contacts-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-contacts-section">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody>
+                                <tr>
+                                    <td><label>Name:</label></td>
+                                    <td><input name="attr_groupcontacts-name1" type="text" /></td>
+                                    <td><label>Description:</label></td>
+                                    <td><textarea rows="2" name="attr_groupcontacts-npcdescription1"></textarea></td>
+                                </tr>
+                                </tbody>
+                                <tbody>
+                                <tr>
+                                    <td><label>Position/Role:</label></td>
+                                    <td><input name="attr_groupcontacts-position1" type="text" /></td>
+                                    <td><label>Location:</label></td>
+                                    <td><input name="attr_groupcontacts-location" type="text" /></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <br />
+                            <fieldset class="repeating_groupcontacts-position">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Name:</label></td>
+                                        <td><input name="attr_groupcontacts-name2" type="text" /></td>
+                                        <td><label>Description:</label></td>
+                                        <td><textarea rows="2" name="attr_groupcontacts-npcdescription2"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Position/Role:</label></td>
+                                        <td><input name="attr_groupcontacts-position2" type="text" /></td>
+                                        <td><label>Location:</label></td>
+                                        <td><input name="attr_groupcontacts-location" type="text" /></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
+                    </div>
+                </div><!--Group Contacts-->
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Group Tasks</h3>
+                        <input name="attr_gm-Group-Tasks" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-tasks-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-tasks-section">
+                            <fieldset class="repeating_pcgroup-tasks">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Task:</label></td>
+                                        <td><input type="text" name="attr_grouptask1" /></td>
+                                        <td><label>Assigned By:</label></td>
+                                        <td><input type="text" name="attr_grouptaskassigned1" /></td>
+                                        <td><label>Completed:</label></td>
+                                        <td>
+                                            <select name='attr_grouptaskcomp1'>
+                                                <option value="1">Yes</option>
+                                                <option value="2">No</option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Details:</label></td>
+                                        <td colspan="5" class="sheet-div-right"><textarea rows="3" name="attr_grouptaskdetails1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
+                    </div>
+                </div><!--Group Tasks-->
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Group Obligations</h3>
+                        <input name="attr_gm-Group-Obligations" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-obligation-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-obligation-section">
+                            <fieldset class="repeating_pcgroup-obligation">
+                                <table cellspacing="0" cellpadding="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td><label>Type:</label></td>
+                                        <td><input type="text" name="attr_groupobligationtype1" /></td>
+                                        <td><label>Magnitude:</label></td>
+                                        <td><input type="number" name="attr_groupobligationmag1" min="0" value="0" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Details:</label></td>
+                                        <td colspan="3" class="sheet-div-right"><textarea rows="3" name="attr_groupobligationcomp1"></textarea></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <br />
+                            </fieldset>
+                        </div>
+                    </div>
+                </div><!--Group Obligations-->
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Group Resources</h3>
+                        <input name="attr_gm-Group-Resources" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-resources-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-resources-section">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody><tr><td><textarea name="attr_groupresources" rows="6"></textarea></td></tr></tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div><!--Group Resources-->
+                <div class="sheet-row">
+                    <div class="sheet-small-12 sheet-column">
+                        <h3 class="sheet-section-header">Group Posessions</h3>
+                        <input name="attr_gm-Group-Posessions" value="1" style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-possessions-section-toggle" type="checkbox" checked="checked"/>
+                        <div class="sheet-possessions-section">
+                            <table cellspacing="0" cellpadding="0" border="0">
+                                <tbody><tr><td><textarea name="attr_groupposessions" rows="6"></textarea></td></tr></tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div><!--Group Posessions-->
+                <div class="sheet-clear"></div>
+            </div><!-- Shared Resources Info -->
+        </div><!-- Player Group sheet -->
+        <div class="sheet-tab-content sheet-tab-gm-settings">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header">Skill Suggestions</h3>
+                    <div class="sheet-settings-toggle">
+                        <table cellspacing="0" cellpadding="0" border="0">
+                            <thead>
+                            <tr>
+                                <th>Setting</th>
+                                <th>Option</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td class="sheet-helper" title="Change the handling for skill suggestions">
+                                    Skill Suggestions Display</td>
+                                <td><select name="attr_skill_suggestion_setting_display">
+                                    <option value="none">None</option>
+                                    <option value="whisper">Whisper GM</option>
+                                    <option value="button">Show Suggestions Button</option>
+                                    <option value="always" selected>Display in Skill</option>
+                                </select></td>
+                            </tr>
+                            <tr>
+                                <td class="sheet-helper" title="Enable suggestions for rolls made from the weapon combat section or vehicle sheet">
+                                    Enable Combat Suggestions?</td>
+                                <td><select name="attr_skill_suggestion_setting_combat">
+                                    <option value="1">Yes</option>
+                                    <option value="0" selected>No</option>
+                                </select></td>
+                            </tr>
+                            <tr>
+                                <td class="sheet-helper" title="Enable suggestions for rolls made from the general skill list">
+                                    Enable General Suggestions?</td>
+                                <td><select name="attr_skill_suggestion_setting_general">
+                                    <option value="1">Yes</option>
+                                    <option value="0" selected>No</option>
+                                </select></td>
+                            </tr>
+                            <tr>
+                                <td class="sheet-helper" title="Allows Discipline and Cool skill checks to pull suggestions from the fear suggestion list.">
+                                    Fear Check?</td>
+                                <td><select name="attr_skill_suggestion_setting_fear">
+                                    <option value="0" selected>No</option>
+                                    <option value="1">Yes</option>
+                                </select></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div><!-- Settings -->
     </div>
+</div><!-- Game Master sheet-->
+<div class="sheet-clear"></div>
+
+<br/>
+<hr/>
+<b>Need Help?</b><input name="attr_Need-Help?" value="1" style="width: 96px; margin: -13px -20px 0 -80px;" class="sheet-toggle sheet-footer-toggle" type="checkbox"/><span></span>
+<div class="sheet-footer">
+    <h4>Need help?</h4>
+    <label>Visit the wiki:</label><input disabled="disabled" value="https://wiki.roll20.net/SWRPG-API-Compatible" type="text"/><br/>
+    <label>Visit the forum:</label><input disabled="disabled"
+                                          value="https://app.roll20.net/forum/post/3356434/sw-ffg-official-character-sheet-thread"
+                                          type="text"/>
 </div>
 
-<!-- Roll Templates -->
 <rolltemplate class="sheet-rolltemplate-base">
     <table>
-        <tr><th colspan="2">{{title}} {{#subtitle}}<br \><span class="subheader">{{subtitle}}</span>{{/subtitle}}</th></tr>
+        <tr><th colspan="2">{{title}} {{#subtitle}}<br /><span class="subheader">{{subtitle}}</span>{{/subtitle}}</th></tr>
         {{#flavor}}
         <tr><td colspan="2"><span class="flavor">{{flavor}}</span></td></tr>
         {{/flavor}}
@@ -10688,4 +8910,96 @@
         <tr><td colspan="2">{{results}}</td></tr>
         {{/results}}
     </table>
-</rolltemplate>
\ No newline at end of file
+</rolltemplate><!-- Roll Template-Base -->
+
+<rolltemplate class="sheet-rolltemplate-suggestion">
+    <table>
+        <tr><th colspan="2">{{title}} {{#subtitle}}<br /><span class="subheader">{{subtitle}}</span>{{/subtitle}}</th></tr>
+        {{#flavor}}
+        <tr><td colspan="2"><span class="flavor">{{flavor}}</span></td></tr>
+        {{/flavor}}
+        {{#prewide}}
+        <tr><td colspan="2">{{prewide}}</td></tr>
+        {{/prewide}}
+        {{#header}}
+        <tr><td class="tcat-header"><span>{{header}}</span></td><td class="tcat-header"><span>{{item}}</span></td></tr>
+        {{/header}}
+        {{#allprops() title flavor roll results subtitle header item suggestionsExist success advantage triumph failure threat despair 1advantage1triumph 2advantage1triumph 3advantage1triumph 1triumph 2triumph 1threat1despair 2threat1despair 3threat1despair 1despair 2despair}}
+        <tr><td><span class="sheet-tcat">{{key}}</span></td><td>{{value}}</td></tr>
+        {{/allprops() title flavor roll results subtitle header item suggestionsExist success advantage triumph failure threat despair 1advantage1triumph 2advantage1triumph 3advantage1triumph 1triumph 2triumph 1threat1despair 2threat1despair 3threat1despair 1despair 2despair}}
+        {{#wide}}
+        <tr><td colspan="2">{{wide}}</td></tr>
+        {{/wide}}
+        {{#wide2}}
+        <tr><td colspan="2">{{wide2}}</td></tr>
+        {{/wide2}}
+        {{#wide3}}
+        <tr><td colspan="2">{{wide3}}</td></tr>
+        {{/wide3}}
+        {{#wide4}}
+        <tr><td colspan="2">{{wide4}}</td></tr>
+        {{/wide4}}
+        {{#wide5}}
+        <tr><td colspan="2">{{wide5}}</td></tr>
+        {{/wide5}}
+        {{#roll}}
+        <tr><td colspan="2"><span class="tcat">Dice Roll</span></td></tr>
+        <tr><td colspan="2">{{roll}}</td></tr>
+        {{/roll}}
+        {{#results}}
+        <tr><td colspan="2"><span class="tcat">Results</span></td></tr>
+        <tr><td colspan="2">{{results}}</td></tr>
+        {{/results}}
+        {{#suggestionsExist}}
+        <tr><td colspan="2"><span class="tcat">Spending Suggestions</span></td></tr>
+        {{/suggestionsExist}}
+        {{#success}}
+        <tr><td><span class="sheet-tcat">Success</span></td><td>{{success}}</td></tr>
+        {{/success}}
+        {{#advantage}}
+        <tr><td><span class="sheet-tcat">Advantage</span></td><td>{{advantage}}</td></tr>
+        {{/advantage}}
+        {{#triumph}}
+        <tr><td><span class="sheet-tcat">Triumph</span></td><td>{{triumph}}</td></tr>
+        {{/triumph}}
+        {{#failure}}
+        <tr><td><span class="sheet-tcat">Failure</span></td><td>{{failure}}</td></tr>
+        {{/failure}}
+        {{#threat}}
+        <tr><td><span class="sheet-tcat">Threat</span></td><td>{{threat}}</td></tr>
+        {{/threat}}
+        {{#despair}}
+        <tr><td><span class="sheet-tcat">Despair</span></td><td>{{despair}}</td></tr>
+        {{/despair}}
+        {{#1advantage1triumph}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/A.png" title="advantage" height="20" width="20"/> or <img src="http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png" title="triumph" height="20" width="20"/></td><td>{{1advantage1triumph}}</td></tr>
+        {{/1advantage1triumph}}
+        {{#2advantage1triumph}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/A.png" title="advantage" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/A.png" title="advantage" height="20" width="20"/> or <img src="http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png" title="triumph" height="20" width="20"/></td><td>{{2advantage1triumph}}</td></tr>
+        {{/2advantage1triumph}}
+        {{#3advantage1triumph}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/A.png" title="advantage" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/A.png" title="advantage" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/A.png" title="advantage" height="20" width="20"/> or <img src="http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png" title="triumph" height="20" width="20"/></td><td>{{3advantage1triumph}}</td></tr>
+        {{/3advantage1triumph}}
+        {{#1triumph}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png" title="triumph" height="20" width="20"/></td><td>{{1triumph}}</td></tr>
+        {{/1triumph}}
+        {{#2triumph}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png" title="triumph" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png" title="triumph" height="20" width="20"/></td><td>{{2triumph}}</td></tr>
+        {{/2triumph}}
+        {{#1threat1despair}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/T.png" title="threat" height="20" width="20"/> or <img src="http://galacticcampaigns.com/images/EotE/Symbols/Despair.png" title="despair" height="20" width="20"/></td><td>{{1threat1despair}}</td></tr>
+        {{/1threat1despair}}
+        {{#2threat1despair}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/T.png" title="threat" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/T.png" title="threat" height="20" width="20"/> or <img src="http://galacticcampaigns.com/images/EotE/Symbols/Despair.png" title="despair" height="20" width="20"/></td><td>{{2threat1despair}}</td></tr>
+        {{/2threat1despair}}
+        {{#3threat1despair}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/T.png" title="threat" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/T.png" title="threat" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/T.png" title="threat" height="20" width="20"/> or <img src="http://galacticcampaigns.com/images/EotE/Symbols/Despair.png" title="despair" height="20" width="20"/></td><td>{{3threat1despair}}</td></tr>
+        {{/3threat1despair}}
+        {{#1despair}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/Despair.png" title="despair" height="20" width="20"/></td><td>{{1despair}}</td></tr>
+        {{/1despair}}
+        {{#2despair}}
+        <tr><td><img src="http://galacticcampaigns.com/images/EotE/Symbols/Despair.png" title="despair" height="20" width="20"/><img src="http://galacticcampaigns.com/images/EotE/Symbols/Despair.png" title="despair" height="20" width="20"/></td><td>{{2despair}}</td></tr>
+        {{/2despair}}
+    </table>
+</rolltemplate><!-- Roll Template-Suggestions -->
\ No newline at end of file
diff --git a/Star Wars FFG API-Compatible/README.md b/Star Wars FFG API-Compatible/README.md
index dd7d6b6614..5c68cd318a 100644
--- a/Star Wars FFG API-Compatible/README.md	
+++ b/Star Wars FFG API-Compatible/README.md	
@@ -11,4 +11,9 @@ Fixed display of Species/Career/Specialization to look more crisp.
 4.0.4.3 Updates;
 Fixed spelling mistakes
 Code cleanup
-Changed display of Old Vehicle Tabs
\ No newline at end of file
+Changed display of Old Vehicle Tabs
+
+6.3.0 Updates
+NPC Sheet
+Skill Suggestion Engine
+Collapsible sections
diff --git a/Star Wars FFG API-Compatible/sheet.json b/Star Wars FFG API-Compatible/sheet.json
index 03a002bfa5..da2090c763 100644
--- a/Star Wars FFG API-Compatible/sheet.json	
+++ b/Star Wars FFG API-Compatible/sheet.json	
@@ -1,8 +1,8 @@
 {
   "html": "FFG-SWRPG-CharacterSheet.html",
   "css": "FFG-SWRPG-CharacterSheet.css",
-  "authors": "GM Knowledge Rhino",
-  "roll20userid": "472728",
+  "authors": "Tim P.",
+  "roll20userid": "1190923",
   "preview": "Character Sheet Preview.png",
   "instructions": "This character sheet utilizes the FFG-SWRPG-Dice-Roller.js to perform many of the rolls of the sheet, please make sure this is loaded. For information about the sheet and instructions how to load the script please visit the wiki page at https://wiki.roll20.net/SWRPG-API-Compatible . Version 4.0.4.6 adds version history display to the header of the sheet."
 }
\ No newline at end of file