diff --git a/Genesys-RPG/Genesys-CharacterSheet.css b/Genesys-RPG/Genesys-CharacterSheet.css
index d8c9a11c5d..0bfc6d11fc 100644
--- a/Genesys-RPG/Genesys-CharacterSheet.css
+++ b/Genesys-RPG/Genesys-CharacterSheet.css
@@ -466,6 +466,14 @@ input.sheet-tab-new:checked + span {
     /*color: #692927;*/
 }
 
+input.sheet-tab-new.sheet-tab-talents {
+    width: 212px;
+}
+
+input.sheet-tab-new.sheet-tab-talents + span {
+    margin-left: -214px;
+}
+
 /* END TAB CODE */
 
 div.sheet-tab-content {
@@ -713,6 +721,14 @@ input.sheet-gm:checked ~ div.sheet-tab-gm-dice {
     cursor: pointer;
 }
 
+input[type=number].sheet-characteristic {
+    background-color: transparent;
+    border-color: transparent;
+    font-size: 16pt;
+    width: 2.5em;
+    margin-top: 0.05em;
+}
+
 .charsheet input[type=text],
 .charsheet textarea,
 .charsheet select {
@@ -2077,4 +2093,118 @@ input.sheet-footer-toggle ~ div.sheet-footer {
 .repcontrol_add, .repcontrol_edit, .repcontrol_del, .repcontrol_move {
     background: #444;
     color: #f3f3f3;
+}
+
+.sheet-settings-container {
+    float: right;
+    position: relative;
+}
+
+input.sheet-settings-checkbox {
+    width: 15px;
+    height: 15px;
+    position: absolute;
+    top: 0px;
+    right: 4px;
+    
+    cursor: pointer;
+    z-index: 1;
+    opacity: 0;
+}
+
+input.sheet-settings-checkbox + span::before {
+    content: "y";
+    font-family: pictos;
+    
+    text-align: center;
+    display: inline-block;
+    
+    background: transparent;
+    
+    width: 17px;
+    height: 17px;
+    font-size: 15px;
+    color: darkgrey;
+    
+    position: absolute;
+    right: 4px;
+}
+
+input.sheet-settings-checkbox:checked + span::before{
+    color: black;
+}
+
+div.sheet-settings {
+    display: none;
+}
+
+input.sheet-settings-checkbox:checked ~ div.sheet-settings{
+    display: block;
+    position: absolute;
+    top: 15px;
+    right: 10px;
+    
+    background-color: #f1f1f1;
+    border: solid 1px #a8a8a8;
+    border-bottom-color: black;
+    text-align: center;
+    
+    padding: 2px;
+}
+
+.sheet-setting-check {
+    display: none;
+}
+
+.sheet-settings label {
+    white-space: nowrap;
+}
+
+input.sheet-hideskills:not(:checked) ~ * .sheet-hideskills {
+    display: none;
+}
+
+input.sheet-hide-alchemy:checked ~ * .sheet-hide-alchemy,
+input.sheet-hide-arcana:checked ~ * .sheet-hide-arcana,
+input.sheet-hide-astrogation:checked ~ * .sheet-hide-astrogation,
+input.sheet-hide-athletics:checked ~ * .sheet-hide-athletics,
+input.sheet-hide-brawl:checked ~ * .sheet-hide-brawl,
+input.sheet-hide-charm:checked ~ * .sheet-hide-charm,
+input.sheet-hide-coercion:checked ~ * .sheet-hide-coercion,
+input.sheet-hide-computers:checked ~ * .sheet-hide-computers,
+input.sheet-hide-cool:checked ~ * .sheet-hide-cool,
+input.sheet-hide-coordination:checked ~ * .sheet-hide-coordination,
+input.sheet-hide-deception:checked ~ * .sheet-hide-deception,
+input.sheet-hide-discipline:checked ~ * .sheet-hide-discipline,
+input.sheet-hide-divine:checked ~ * .sheet-hide-divine,
+input.sheet-hide-driving:checked ~ * .sheet-hide-driving,
+input.sheet-hide-gunnery:checked ~ * .sheet-hide-gunnery,
+input.sheet-hide-knowledge:checked ~ * .sheet-hide-knowledge,
+input.sheet-hide-leadership:checked ~ * .sheet-hide-leadership,
+input.sheet-hide-mechanics:checked ~ * .sheet-hide-mechanics,
+input.sheet-hide-medicine:checked ~ * .sheet-hide-medicine,
+input.sheet-hide-melee:checked ~ * .sheet-hide-melee,
+input.sheet-hide-meleeheavy:checked ~ * .sheet-hide-meleeheavy,
+input.sheet-hide-meleelight:checked ~ * .sheet-hide-meleelight,
+input.sheet-hide-negotiation:checked ~ * .sheet-hide-negotiation,
+input.sheet-hide-operating:checked ~ * .sheet-hide-operating,
+input.sheet-hide-perception:checked ~ * .sheet-hide-perception,
+input.sheet-hide-piloting:checked ~ * .sheet-hide-piloting,
+input.sheet-hide-primal:checked ~ * .sheet-hide-primal,
+input.sheet-hide-ranged:checked ~ * .sheet-hide-ranged,
+input.sheet-hide-rangedheavy:checked ~ * .sheet-hide-rangedheavy,
+input.sheet-hide-rangedlight:checked ~ * .sheet-hide-rangedlight,
+input.sheet-hide-resilience:checked ~ * .sheet-hide-resilience,
+input.sheet-hide-riding:checked ~ * .sheet-hide-riding,
+input.sheet-hide-skulduggery:checked ~ * .sheet-hide-skulduggery,
+input.sheet-hide-stealth:checked ~ * .sheet-hide-stealth,
+input.sheet-hide-streetwise:checked ~ * .sheet-hide-streetwise,
+input.sheet-hide-survival:checked ~ * .sheet-hide-survival,
+input.sheet-hide-vigilance:checked ~ * .sheet-hide-vigilance {
+    display: none;
+}
+
+
+input.sheet-hideskills:checked ~ * .sheet-hide-skill-row {
+    display: table-row;
 }
\ No newline at end of file
diff --git a/Genesys-RPG/Genesys-CharacterSheet.html b/Genesys-RPG/Genesys-CharacterSheet.html
index b977bcf401..4f60004a49 100644
--- a/Genesys-RPG/Genesys-CharacterSheet.html
+++ b/Genesys-RPG/Genesys-CharacterSheet.html
@@ -2,6 +2,56 @@
 <input type="radio" name="attr_gmdicepool" class="sheet-player" value="1" checked="checked" style="display:none">
 <input type="radio" name="attr_gmdicepool" class="sheet-gm" value="2" style="display:none">
 
+<input type="checkbox" name="attr_showskillhide" value="show" class="setting-check hideskills" />
+<div class="settings-container">
+    <input class="sheet-settings-checkbox" type="checkbox" name="attr_show_settings" value="1" /><span></span>
+    <div class="sheet-settings">
+        <label>
+            <input type="checkbox" name="attr_showskillhide" value="show" />
+            <span data-i18n="showskillhide">Show Skill Hide Options</span>
+        </label>
+    </div>
+</div>
+
+<input type="checkbox" name="attr_hide-alchemy" value="1" class="setting-check hide-alchemy" />
+<input type="checkbox" name="attr_hide-arcana" value="1" class="setting-check hide-arcana" />
+<input type="checkbox" name="attr_hide-astrogation" value="1" class="setting-check hide-astrogation" />
+<input type="checkbox" name="attr_hide-athletics" value="1" class="setting-check hide-athletics" />
+<input type="checkbox" name="attr_hide-brawl" value="1" class="setting-check hide-brawl" />
+<input type="checkbox" name="attr_hide-charm" value="1" class="setting-check hide-charm" />
+<input type="checkbox" name="attr_hide-coercion" value="1" class="setting-check hide-coercion" />
+<input type="checkbox" name="attr_hide-computers" value="1" class="setting-check hide-computers" />
+<input type="checkbox" name="attr_hide-cool" value="1" class="setting-check hide-cool" />
+<input type="checkbox" name="attr_hide-coordination" value="1" class="setting-check hide-coordination" />
+<input type="checkbox" name="attr_hide-deception" value="1" class="setting-check hide-deception" />
+<input type="checkbox" name="attr_hide-discipline" value="1" class="setting-check hide-discipline" />
+<input type="checkbox" name="attr_hide-divine" value="1" class="setting-check hide-divine" />
+<input type="checkbox" name="attr_hide-driving" value="1" class="setting-check hide-driving" />
+<input type="checkbox" name="attr_hide-gunnery" value="1" class="setting-check hide-gunnery" />
+<input type="checkbox" name="attr_hide-knowledge" value="1" class="setting-check hide-knowledge" />
+<input type="checkbox" name="attr_hide-leadership" value="1" class="setting-check hide-leadership" />
+<input type="checkbox" name="attr_hide-mechanics" value="1" class="setting-check hide-mechanics" />
+<input type="checkbox" name="attr_hide-medicine" value="1" class="setting-check hide-medicine" />
+<input type="checkbox" name="attr_hide-melee" value="1" class="setting-check hide-melee" />
+<input type="checkbox" name="attr_hide-meleeheavy" value="1" class="setting-check hide-meleeheavy" />
+<input type="checkbox" name="attr_hide-meleelight" value="1" class="setting-check hide-meleelight" />
+<input type="checkbox" name="attr_hide-negotiation" value="1" class="setting-check hide-negotiation" />
+<input type="checkbox" name="attr_hide-operating" value="1" class="setting-check hide-operating" />
+<input type="checkbox" name="attr_hide-perception" value="1" class="setting-check hide-perception" />
+<input type="checkbox" name="attr_hide-piloting" value="1" class="setting-check hide-piloting" />
+<input type="checkbox" name="attr_hide-primal" value="1" class="setting-check hide-primal" />
+<input type="checkbox" name="attr_hide-ranged" value="1" class="setting-check hide-ranged" />
+<input type="checkbox" name="attr_hide-rangedheavy" value="1" class="setting-check hide-rangedheavy" />
+<input type="checkbox" name="attr_hide-rangedlight" value="1" class="setting-check hide-rangedlight" />
+<input type="checkbox" name="attr_hide-resilience" value="1" class="setting-check hide-resilience" />
+<input type="checkbox" name="attr_hide-riding" value="1" class="setting-check hide-riding" />
+<input type="checkbox" name="attr_hide-skulduggery" value="1" class="setting-check hide-skulduggery" />
+<input type="checkbox" name="attr_hide-stealth" value="1" class="setting-check hide-stealth" />
+<input type="checkbox" name="attr_hide-streetwise" value="1" class="setting-check hide-streetwise" />
+<input type="checkbox" name="attr_hide-survival" value="1" class="setting-check hide-survival" />
+<input type="checkbox" name="attr_hide-vigilance" value="1" class="setting-check hide-vigilance" />
+
+
 <div>
     <h3 class="sheet-section-header" data-i18n="genesysrpg">Genesys Role Playing Game System</></h3>
     <input style="width: 250px;height: 30px;margin: -44px -20px 0 297px;float:left;" class="sheet-toggle sheet-header-section-toggle" type="checkbox" checked="checked" />
@@ -329,32 +379,32 @@
                             <tr>
                                 <td>
                                     <label data-i18n="brawn">Brawn</label>
-                                    <input name='attr_brawn' type="number" max="7" min="1" value="1" />
+                                    <input name='attr_brawn' type="number" max="7" min="1" value="1" class="characteristic" />
                                 </td>
                                 <td></td>
                                 <td>
                                     <label data-i18n="agility">Agility</label>
-                                    <input name='attr_agility' type="number" max="7" min="1" value="1" />
+                                    <input name='attr_agility' type="number" max="7" min="1" value="1" class="characteristic" />
                                 </td>
                                 <td></td>
                                 <td>
                                     <label data-i18n="intellect">Intellect</label>
-                                    <input name='attr_intellect' type="number" max="7" min="1" value="1" />
+                                    <input name='attr_intellect' type="number" max="7" min="1" value="1" class="characteristic" />
                                 </td>
                                 <td></td>
                                 <td>
                                     <label data-i18n="cunning">Cunning</label>
-                                    <input name='attr_cunning' type="number" max="7" min="1" value="1" />
+                                    <input name='attr_cunning' type="number" max="7" min="1" value="1" class="characteristic" />
                                 </td>
                                 <td></td>
                                 <td>
                                     <label data-i18n="willpower">Willpower</label>
-                                    <input name='attr_willpower' type="number" max="7" min="1" value="1" />
+                                    <input name='attr_willpower' type="number" max="7" min="1" value="1" class="characteristic" />
                                 </td>
                                 <td></td>
                                 <td>
                                     <label data-i18n="presence">Presence</label>
-                                    <input name='attr_presence' type="number" max="7" min="1" value="1" />
+                                    <input name='attr_presence' type="number" max="7" min="1" value="1" class="characteristic" />
                                 </td>
                             </tr>
                         </tbody>
@@ -403,8 +453,8 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr data-i18n-list-item="alchemy">
-                                <td><label data-i18n="alchemyint">Alchemy (Int)</label></td>
+                            <tr data-i18n-list-item="alchemy" class="hide-alchemy hide-skill-row">
+                                <td><label data-i18n="alchemyint">Alchemy (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-alchemy" value="1"/> <span data-i18n="hide">Hide</span></label></td>
                                 <td><input name='attr_careerskillAlchemy' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankAlchemy" max="6" min="0" value="0" /></td>
                                 <td>
@@ -417,9 +467,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Alchemy' value='!eed characterID(@{character_id}) label(skill:Alchemy) @{diceAlchemy} skill(@{rankAlchemy}|@{intellect}|Alchemy) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Alchemy-->
-                            <tr data-i18n-list-item="astrogation">
+                            <tr data-i18n-list-item="astrogation" class="hide-astrogation hide-skill-row">
                                 <td>
-                                    <label data-i18n="astrogationint">Astrocartography (Int)</label>
+                                    <label data-i18n="astrogationint">Astrocartography (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-astrogation" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillAstrogation' type="checkbox" value="1"></td>
                                 <td>
@@ -437,9 +487,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Alchemy' value='!eed characterID(@{character_id}) label(skill:Astrocartography) @{diceAstrogation} skill(@{rankAstrogation}|@{intellect}|Astrogation) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Astrocartography-->
-                            <tr data-i18n-list-item="athletics">
+                            <tr data-i18n-list-item="athletics" class="hide-athletics hide-skill-row">
                                 <td>
-                                    <label data-i18n="athleticsbr">Athletics (Br)</label>
+                                    <label data-i18n="athleticsbr">Athletics (Br)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-athletics" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -455,9 +505,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="computers">
+                            <tr data-i18n-list-item="computers" class="hide-computers hide-skill-row">
                                 <td>
-                                    <label data-i18n="computerint">Computers (Int)</label>
+                                    <label data-i18n="computerint">Computers (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-computers" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -473,9 +523,9 @@
                                 </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 data-i18n-list-item="cool">
+                            <tr data-i18n-list-item="cool" class="hide-cool hide-skill-row">
                                 <td>
-                                    <label data-i18n="coolpr">Cool (Pr)</label>
+                                    <label data-i18n="coolpr">Cool (Pr)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-cool" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -491,9 +541,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="coordination">
+                            <tr data-i18n-list-item="coordination" class="hide-coordination hide-skill-row">
                                 <td>
-                                    <label data-i18n="coordinationag">Coordination (Ag)</label>
+                                    <label data-i18n="coordinationag">Coordination (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-coordination" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -509,9 +559,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="discipline">
+                            <tr data-i18n-list-item="discipline" class="hide-discipline hide-skill-row">
                                 <td>
-                                    <label data-i18n="disciplinewill">Discipline (Will)</label>
+                                    <label data-i18n="disciplinewill">Discipline (Will)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-discipline" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -527,9 +577,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="driving">
+                            <tr data-i18n-list-item="driving" class="hide-driving hide-skill-row">
                                 <td>
-                                    <label data-i18n="drivingag">Driving (Ag)</label>
+                                    <label data-i18n="drivingag">Driving (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-driving" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillDriving' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankDriving" max="6" min="0" value="0" /></td>
@@ -545,9 +595,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Driving' value='!eed characterID(@{character_id}) label(skill:Driving) @{diceDriving} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankDriving}|@{agility}|Driving) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Driving-->
-                            <tr data-i18n-list-item="mechanics">
+                            <tr data-i18n-list-item="mechanics" class="hide-mechanics hide-skill-row">
                                 <td>
-                                    <label data-i18n="mechanicsint">Mechanics (Int)</label>
+                                    <label data-i18n="mechanicsint">Mechanics (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-mechanics" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -563,9 +613,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="medicine">
+                            <tr data-i18n-list-item="medicine" class="hide-medicine hide-skill-row">
                                 <td>
-                                    <label data-i18n="medecineint">Medicine (Int)</label>
+                                    <label data-i18n="medecineint">Medicine (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-medicine" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -581,9 +631,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="operating">
+                            <tr data-i18n-list-item="operating" class="hide-operating hide-skill-row">
                                 <td>
-                                    <label data-i18n="operatingint">Operating (Int)</label>
+                                    <label data-i18n="operatingint">Operating (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-operating" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillOperating' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankOperating" max="6" min="0" value="0" /></td>
@@ -599,9 +649,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Operating' value='!eed characterID(@{character_id}) label(skill:Operating) @{diceOperating} skill(@{rankOperating}|@{intellect}|Operating) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Operating-->
-                            <tr data-i18n-list-item="perception">
+                            <tr data-i18n-list-item="perception" class="hide-perception hide-skill-row">
                                 <td>
-                                    <label data-i18n="perceptioncun">Perception (Cun)</label>
+                                    <label data-i18n="perceptioncun">Perception (Cun)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-perception" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -617,9 +667,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="piloting">
+                            <tr data-i18n-list-item="piloting" class="hide-piloting hide-skill-row">
                                 <td>
-                                    <label data-i18n="pilotingag">Piloting (Ag)</label>
+                                    <label data-i18n="pilotingag">Piloting (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-piloting" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -635,9 +685,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Piloting' value='!eed characterID(@{character_id}) label(skill:Piloting) @{dicePlanetary} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankPlanetary}|@{agility}|PilotingPlanetary) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Piloting-->
-                            <tr data-i18n-list-item="resilience">
+                            <tr data-i18n-list-item="resilience" class="hide-resilience hide-skill-row">
                                 <td>
-                                    <label data-i18n="resiliencebr">Resilience (Br)</label>
+                                    <label data-i18n="resiliencebr">Resilience (Br)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-resilience" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -653,9 +703,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="riding">
+                            <tr data-i18n-list-item="riding" class="hide-riding hide-skill-row">
                                 <td>
-                                    <label data-i18n="ridingag">Riding (Ag)</label>
+                                    <label data-i18n="ridingag">Riding (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-riding" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillRiding' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankRiding" max="6" min="0" value="0" /></td>
@@ -671,9 +721,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Riding' value='!eed characterID(@{character_id}) label(skill:Riding) @{diceRiding} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankRiding}|@{agility}|Riding) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Riding-->
-                            <tr data-i18n-list-item="skulduggery">
+                            <tr data-i18n-list-item="skulduggery" class="hide-skulduggery hide-skill-row">
                                 <td>
-                                    <label data-i18n="skulduggerycun">Skulduggery (Cun)</label>
+                                    <label data-i18n="skulduggerycun">Skulduggery (Cun)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-skulduggery" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -689,9 +739,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="stealth">
+                            <tr data-i18n-list-item="stealth" class="hide-stealth hide-skill-row">
                                 <td>
-                                    <label data-i18n="stealthag">Stealth (Ag)</label>
+                                    <label data-i18n="stealthag">Stealth (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-stealth" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -707,9 +757,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="streetwise">
+                            <tr data-i18n-list-item="streetwise" class="hide-streetwise hide-skill-row">
                                 <td>
-                                    <label data-i18n="streetwisecun">Streetwise (Cun)</label>
+                                    <label data-i18n="streetwisecun">Streetwise (Cun)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-streetwise" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -725,9 +775,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="survival">
+                            <tr data-i18n-list-item="survival" class="hide-survival hide-skill-row">
                                 <td>
-                                    <label data-i18n="survivalcun">Survival (Cun)</label>
+                                    <label data-i18n="survivalcun">Survival (Cun)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-survival" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -743,9 +793,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="vigilance">
+                            <tr data-i18n-list-item="vigilance" class="hide-vigilance hide-skill-row">
                                 <td>
-                                    <label data-i18n="vigilancewill">Vigilance (Will)</label>
+                                    <label data-i18n="vigilancewill">Vigilance (Will)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-vigilance" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -773,9 +823,9 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr data-i18n-list-item="arcana">
+                            <tr data-i18n-list-item="arcana" class="hide-arcana hide-skill-row">
                                 <td>
-                                    <label data-i18n="arcanaint">Arcana (Int)</label>
+                                    <label data-i18n="arcanaint">Arcana (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-arcana" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillArcana' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankArcana" max="6" min="0" value="0" /></td>
@@ -791,9 +841,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Arcana' value='!eed characterID(@{character_id}) label(skill:Arcana) @{diceArcana} skill(@{rankArcana}|@{intellect}|Arcana) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Arcana-->
-                            <tr data-i18n-list-item="divine">
+                            <tr data-i18n-list-item="divine" class="hide-divine hide-skill-row">
                                 <td>
-                                    <label data-i18n="divinewill">Divine (Will)</label>
+                                    <label data-i18n="divinewill">Divine (Will)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-divine" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillDivine' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankDivine" max="6" min="0" value="0" /></td>
@@ -809,9 +859,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Divine' value='!eed characterID(@{character_id}) label(skill:Divine) @{diceDivine} skill(@{rankDivine}|@{willpower}|Divine) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Divine-->
-                            <tr data-i18n-list-item="primal">
+                            <tr data-i18n-list-item="primal" class="hide-primal hide-skill-row">
                                 <td>
-                                    <label data-i18n="primalcun">Primal (Cun)</label>
+                                    <label data-i18n="primalcun">Primal (Cun)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-primal" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillPrimal' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankPrimal" max="6" min="0" value="0" /></td>
@@ -839,9 +889,9 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr data-i18n-list-item="brawl">
+                            <tr data-i18n-list-item="brawl" class="hide-brawl hide-skill-row">
                                 <td>
-                                    <label data-i18n="brawlbr">Brawl (Br)</label>
+                                    <label data-i18n="brawlbr">Brawl (Br)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-brawl" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -857,9 +907,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Brawl' value='!eed characterID(@{character_id}) label(skill:Brawl) @{diceBrawl} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankBrawl}|@{brawn}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Brawl-->
-                            <tr data-i18n-list-item="gunnery">
+                            <tr data-i18n-list-item="gunnery" class="hide-gunnery hide-skill-row">
                                 <td>
-                                    <label data-i18n="gunneryagi">Gunnery (Agi)</label>
+                                    <label data-i18n="gunneryagi">Gunnery (Agi)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-gunnery" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -875,9 +925,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Gunnery' value='!eed characterID(@{character_id}) label(skill:Gunnery) @{diceGunnery} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankGunnery}|@{agility}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Gunnery-->
-                            <tr data-i18n-list-item="melee">
+                            <tr data-i18n-list-item="melee" class="hide-melee hide-skill-row">
                                 <td>
-                                    <label data-i18n="meleebr">Melee (Br)</label>
+                                    <label data-i18n="meleebr">Melee (Br)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-melee" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -893,9 +943,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Melee' value='!eed characterID(@{character_id}) label(skill:Melee) @{diceMelee} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankMelee}|@{brawn}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Melee-->
-                            <tr data-i18n-list-item="meleelight">
+                            <tr data-i18n-list-item="meleelight" class="hide-meleelight hide-skill-row">
                                 <td>
-                                    <label data-i18n="meleelightbr">Melee (Light)(Br)</label>
+                                    <label data-i18n="meleelightbr">Melee (Light)(Br)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-meleelight" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillMeleeLight' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankMeleeLight" max="6" min="0" value="0" /></td>
@@ -911,9 +961,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_MeleeLight' value='!eed characterID(@{character_id}) label(skill:MeleeLight) @{diceMeleeLight} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankMeleeLight}|@{brawn}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Melee - Light-->
-                            <tr data-i18n-list-item="meleeheavy">
+                            <tr data-i18n-list-item="meleeheavy" class="hide-meleeheavy hide-skill-row">
                                 <td>
-                                    <label data-i18n="meleeheavybr">Melee (Heavy)(Br)</label>
+                                    <label data-i18n="meleeheavybr">Melee (Heavy)(Br)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-meleeheavy" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillMeleeHeavy' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankMeleeHeavy" max="6" min="0" value="0" /></td>
@@ -929,9 +979,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_MeleeHeavy' value='!eed characterID(@{character_id}) label(skill:MeleeHeavy) @{diceMeleeHeavy} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankMeleeHeavy}|@{brawn}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Melee - Heavy-->
-                            <tr data-i18n-list-item="ranged">
+                            <tr data-i18n-list-item="ranged" class="hide-ranged hide-skill-row">
                                 <td>
-                                    <label data-i18n="rangedag">Ranged - Light (Ag)</label>
+                                    <label data-i18n="rangedag">Ranged - Light (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-ranged" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillranged' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankranged" max="6" min="0" value="0" /></td>
@@ -947,9 +997,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Ranged' value='!eed characterID(@{character_id}) label(skill:Ranged) @{diceRanged} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankRanged}|@{agility}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Ranged-->
-                            <tr data-i18n-list-item="rangedlight">
+                            <tr data-i18n-list-item="rangedlight" class="hide-rangedlight hide-skill-row">
                                 <td>
-                                    <label data-i18n="rangedlightag">Ranged - Light (Ag)</label>
+                                    <label data-i18n="rangedlightag">Ranged - Light (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-rangedlight" value="1"/> <span data-i18n="hide">Hide</span></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>
@@ -965,9 +1015,9 @@
                                 </td>
                                 <td><button type='roll' name='roll_Light' value='!eed characterID(@{character_id}) label(skill:Ranged - Light) @{diceLight} encum(@{encumbrancemax}|@{encumbrance}) skill(@{rankLight}|@{agility}) @{dicePool} (gmdice)'></button></td>
                             </tr><!--Ranged - Light-->
-                            <tr data-i18n-list-item="rangedheavy">
+                            <tr data-i18n-list-item="rangedheavy" class="hide-rangedheavy hide-skill-row">
                                 <td>
-                                    <label data-i18n="rangedheavyag">Ranged - Heavy (Ag)</label>
+                                    <label data-i18n="rangedheavyag">Ranged - Heavy (Ag)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-rangedheavy" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -995,9 +1045,9 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr data-i18n-list-item="charm">
+                            <tr data-i18n-list-item="charm" class="hide-charm hide-skill-row">
                                 <td>
-                                    <label data-i18n="charmpr">Charm (Pr)</label>
+                                    <label data-i18n="charmpr">Charm (Pr)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-charm" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -1013,9 +1063,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="coercion">
+                            <tr data-i18n-list-item="coercion" class="hide-coercion hide-skill-row">
                                 <td>
-                                    <label data-i18n="coercionwill">Coercion (Will)</label>
+                                    <label data-i18n="coercionwill">Coercion (Will)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-coercion" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -1031,9 +1081,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="deception">
+                            <tr data-i18n-list-item="deception" class="hide-deception hide-skill-row">
                                 <td>
-                                    <label data-i18n="deceptioncun">Deception (Cun)</label>
+                                    <label data-i18n="deceptioncun">Deception (Cun)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-deception" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -1049,9 +1099,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="leadership">
+                            <tr data-i18n-list-item="leadership" class="hide-leadership hide-skill-row">
                                 <td>
-                                    <label data-i18n="leadershippre">Leadership (Pr)</label>
+                                    <label data-i18n="leadershippre">Leadership (Pr)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-leadership" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -1067,9 +1117,9 @@
                                 </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--><!--All Settings-->
-                            <tr data-i18n-list-item="negotiation">
+                            <tr data-i18n-list-item="negotiation" class="hide-negotiation hide-skill-row">
                                 <td>
-                                    <label data-i18n="negotiationpr">Negotiation (Pr)</label>
+                                    <label data-i18n="negotiationpr">Negotiation (Pr)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-negotiation" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </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>
@@ -1097,9 +1147,9 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr data-i18n-list-item="knowledge">
+                            <tr data-i18n-list-item="knowledge" class="hide-knowledge hide-skill-row">
                                 <td>
-                                    <label data-i18n="knowledgeint">Knowledge (Int)</label>
+                                    <label data-i18n="knowledgeint">Knowledge (Int)</label> <label class="hideskills"><input type="checkbox" name="attr_hide-knowledge" value="1"/> <span data-i18n="hide">Hide</span></label>
                                 </td>
                                 <td><input name='attr_careerskillKnowledge' type="checkbox" value="1"></td>
                                 <td><input type="number" name="attr_rankKnowledge" max="6" min="0" value="0" /></td>
@@ -1420,84 +1470,87 @@
             </div>
             <div class="sheet-clear"></div>
         </div><!-- Weapons -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header" data-i18n="combatskills">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>
-                                <th style="width:50%" data-i18n="skillname">Skill Name</th>
-                                <th style="width:30%" data-i18n="modifiers">Modifiers</th>
-                            </tr>
-                        </thead>
-                    </table>
-                    <fieldset class="repeating_fightskills">
-                        <table cellspacing="0" cellpadding="0" border="0">
-                            <tbody>
+        <b data-i18n="combatskills">Combat Skills</b><input name="attr_character-Combat-Skills" value="1" checked="checked" style="width:78px;margin:-13px -20px 0 -62px" class="sheet-toggle sheet-combatskills-section-toggle" type="checkbox" /><span></span>
+        <div class="sheet-combatskills-section">
+            <div class="sheet-row">
+                <div class="sheet-small-12 sheet-column">
+                    <h3 class="sheet-section-header" data-i18n="combatskills">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'>
-                                            <optgroup label="General Skills">
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankAlchemy) label(skill:Alchemy) @{FightingDice} @{dicePool} (gmdice)" data-i18n="alchemy">Alchemy</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankAstrogation) label(skill:Astrogation) @{FightingDice} @{dicePool} (gmdice)" data-i18n="astrocartography">Astrocartography</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankAthletics) label(skill:Athletics) @{FightingDice} @{dicePool} (gmdice)" data-i18n="athletics">Athletics</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankComputers) label(skill:Computers) @{FightingDice} @{dicePool} (gmdice)" data-i18n="computers">Computers</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCool) label(skill:Cool) @{FightingDice} @{dicePool} (gmdice)" data-i18n="cool">Cool</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankCoordination) label(skill:Coordination) @{FightingDice} @{dicePool} (gmdice)" data-i18n="coordination">Coordination</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDiscipline) label(skill:Discipline) @{FightingDice} @{dicePool} (gmdice)" data-i18n="discipline">Discipline</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankDriving) label(skill:Driving) @{FightingDice} @{dicePool} (gmdice)" data-i18n="driving">Driving</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMechanics) label(skill:Mechanics) @{FightingDice} @{dicePool} (gmdice)" data-i18n="mechanics">Mechanics</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMedicine) label(skill:Medicine) @{FightingDice} @{dicePool} (gmdice)" data-i18n="medecine">Medicine</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankOperating) label(skill:Operating) @{FightingDice} @{dicePool} (gmdice)" data-i18n="operating">Operating</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankPerception) label(skill:Perception) @{FightingDice} @{dicePool} (gmdice)" data-i18n="perception">Perception</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankPiloting) label(skill:Piloting) @{FightingDice} @{dicePool} (gmdice)" data-i18n="piloting">Piloting</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankResilience) label(skill:Resilience) @{FightingDice} @{dicePool} (gmdice)" data-i18n="resilience">Resilience</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankRiding) label(skill:Riding) @{FightingDice} @{dicePool} (gmdice)" data-i18n="Riding">Riding</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSkulduggery) label(skill:Skulduggery) @{FightingDice} @{dicePool} (gmdice)" data-i18n="skulduggery">Skulduggery</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankStealth) label(skill:Stealth) @{FightingDice} @{dicePool} (gmdice)" data-i18n="stealth">Stealth</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankStreetwise) label(skill:Streetwise) @{FightingDice} @{dicePool} (gmdice)" data-i18n="streetwise">Streetwise</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSurvival) label(skill:Survival) @{FightingDice} @{dicePool} (gmdice)" data-i18n="survival">Survival</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankVigilance) label(skill:Vigilance) @{FightingDice} @{dicePool} (gmdice)" data-i18n="vigilance">Vigilance</option>
-                                            </optgroup>
-                                            <optgroup label="Magic Skills">
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankArcana) label(skill:Arcana) @{FightingDice} @{dicePool} (gmdice)" data-i18n="Arcana">Arcana</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDivine) label(skill:Divine) @{FightingDice} @{dicePool} (gmdice)" data-i18n="divine">Divine</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankPrimal) label(skill:Primal) @{FightingDice} @{dicePool} (gmdice)" data-i18n="primal">Primal</option>
-                                            </optgroup>
-                                            <optgroup label="Combat Skills">
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankBrawl) label(skill:Brawl) @{FightingDice} @{dicePool} (gmdice)" data-i18n="brawl">Brawl</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankGunnery) label(skill:Gunnery) @{FightingDice} @{dicePool} (gmdice)" data-i18n="gunnery">Gunnery</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankMelee) label(skill:Melee) @{FightingDice} @{dicePool} (gmdice)" data-i18n="melee">Melee</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankMeleeLight) label(skill:Melee [Light]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="melee">Melee (Light)</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankMeleeHeavy) label(skill:Melee [Heavy]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="melee">Melee (Heavy)</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankRanged) label(skill:Ranged) @{FightingDice} @{dicePool} (gmdice)" data-i18n="ranged">Ranged</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankLight) label(skill:Ranged [Light]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="rangedlight">Ranged (Light)</option>
-                                                <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankHeavy) label(skill:Ranged [Heavy]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="rangedheavy">Ranged (Heavy)</option>
-                                            </optgroup>
-                                            <optgroup label="Social Skills">
-                                                <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCharm) label(skill:Charm) @{FightingDice} @{dicePool} (gmdice)" data-i18n="charm">Charm</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCoercion) label(skill:Coercion) @{FightingDice} @{dicePool} (gmdice)" data-i18n="coercion">Coercion</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankDeception) label(skill:Deception) @{FightingDice} @{dicePool} (gmdice)" data-i18n="deception">Deception</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:presence,rankLeadership) label(skill:Leadership) @{FightingDice} @{dicePool} (gmdice)" data-i18n="leadership">Leadership</option>
-                                                <option value="!eed rollPlayer(character:@{name}|skill:presence,rankNegotiation) label(skill:Negotiation) @{FightingDice} @{dicePool} (gmdice)" data-i18n="negotiation">Negotiation</option>
-                                            </optgroup>
-                                            <optgroup label="Knowledge Skills">
-                                                <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankKnowledge) label(skill:Knowledge) @{FightingDice} @{dicePool} (gmdice)" data-i18n="knowledge">Knowledge</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>
+                                    <th style="width:50%" data-i18n="skillname">Skill Name</th>
+                                    <th style="width:30%" data-i18n="modifiers">Modifiers</th>
                                 </tr>
-                            </tbody>
+                            </thead>
                         </table>
-                    </fieldset>
+                        <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,rankAlchemy) label(skill:Alchemy) @{FightingDice} @{dicePool} (gmdice)" data-i18n="alchemy">Alchemy</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankAstrogation) label(skill:Astrogation) @{FightingDice} @{dicePool} (gmdice)" data-i18n="astrocartography">Astrocartography</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankAthletics) label(skill:Athletics) @{FightingDice} @{dicePool} (gmdice)" data-i18n="athletics">Athletics</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankComputers) label(skill:Computers) @{FightingDice} @{dicePool} (gmdice)" data-i18n="computers">Computers</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCool) label(skill:Cool) @{FightingDice} @{dicePool} (gmdice)" data-i18n="cool">Cool</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankCoordination) label(skill:Coordination) @{FightingDice} @{dicePool} (gmdice)" data-i18n="coordination">Coordination</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDiscipline) label(skill:Discipline) @{FightingDice} @{dicePool} (gmdice)" data-i18n="discipline">Discipline</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankDriving) label(skill:Driving) @{FightingDice} @{dicePool} (gmdice)" data-i18n="driving">Driving</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMechanics) label(skill:Mechanics) @{FightingDice} @{dicePool} (gmdice)" data-i18n="mechanics">Mechanics</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankMedicine) label(skill:Medicine) @{FightingDice} @{dicePool} (gmdice)" data-i18n="medecine">Medicine</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankOperating) label(skill:Operating) @{FightingDice} @{dicePool} (gmdice)" data-i18n="operating">Operating</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankPerception) label(skill:Perception) @{FightingDice} @{dicePool} (gmdice)" data-i18n="perception">Perception</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankPiloting) label(skill:Piloting) @{FightingDice} @{dicePool} (gmdice)" data-i18n="piloting">Piloting</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankResilience) label(skill:Resilience) @{FightingDice} @{dicePool} (gmdice)" data-i18n="resilience">Resilience</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankRiding) label(skill:Riding) @{FightingDice} @{dicePool} (gmdice)" data-i18n="Riding">Riding</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSkulduggery) label(skill:Skulduggery) @{FightingDice} @{dicePool} (gmdice)" data-i18n="skulduggery">Skulduggery</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankStealth) label(skill:Stealth) @{FightingDice} @{dicePool} (gmdice)" data-i18n="stealth">Stealth</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankStreetwise) label(skill:Streetwise) @{FightingDice} @{dicePool} (gmdice)" data-i18n="streetwise">Streetwise</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankSurvival) label(skill:Survival) @{FightingDice} @{dicePool} (gmdice)" data-i18n="survival">Survival</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankVigilance) label(skill:Vigilance) @{FightingDice} @{dicePool} (gmdice)" data-i18n="vigilance">Vigilance</option>
+                                                </optgroup>
+                                                <optgroup label="Magic Skills">
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankArcana) label(skill:Arcana) @{FightingDice} @{dicePool} (gmdice)" data-i18n="Arcana">Arcana</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:willpower,rankDivine) label(skill:Divine) @{FightingDice} @{dicePool} (gmdice)" data-i18n="divine">Divine</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankPrimal) label(skill:Primal) @{FightingDice} @{dicePool} (gmdice)" data-i18n="primal">Primal</option>
+                                                </optgroup>
+                                                <optgroup label="Combat Skills">
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankBrawl) label(skill:Brawl) @{FightingDice} @{dicePool} (gmdice)" data-i18n="brawl">Brawl</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankGunnery) label(skill:Gunnery) @{FightingDice} @{dicePool} (gmdice)" data-i18n="gunnery">Gunnery</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankMelee) label(skill:Melee) @{FightingDice} @{dicePool} (gmdice)" data-i18n="melee">Melee</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankMeleeLight) label(skill:Melee [Light]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="melee">Melee (Light)</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:brawn,rankMeleeHeavy) label(skill:Melee [Heavy]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="melee">Melee (Heavy)</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankRanged) label(skill:Ranged) @{FightingDice} @{dicePool} (gmdice)" data-i18n="ranged">Ranged</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankLight) label(skill:Ranged [Light]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="rangedlight">Ranged (Light)</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|encum|skill:agility,rankHeavy) label(skill:Ranged [Heavy]) @{FightingDice} @{dicePool} (gmdice)" data-i18n="rangedheavy">Ranged (Heavy)</option>
+                                                </optgroup>
+                                                <optgroup label="Social Skills">
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCharm) label(skill:Charm) @{FightingDice} @{dicePool} (gmdice)" data-i18n="charm">Charm</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankCoercion) label(skill:Coercion) @{FightingDice} @{dicePool} (gmdice)" data-i18n="coercion">Coercion</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:cunning,rankDeception) label(skill:Deception) @{FightingDice} @{dicePool} (gmdice)" data-i18n="deception">Deception</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankLeadership) label(skill:Leadership) @{FightingDice} @{dicePool} (gmdice)" data-i18n="leadership">Leadership</option>
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:presence,rankNegotiation) label(skill:Negotiation) @{FightingDice} @{dicePool} (gmdice)" data-i18n="negotiation">Negotiation</option>
+                                                </optgroup>
+                                                <optgroup label="Knowledge Skills">
+                                                    <option value="!eed rollPlayer(character:@{name}|skill:intellect,rankKnowledge) label(skill:Knowledge) @{FightingDice} @{dicePool} (gmdice)" data-i18n="knowledge">Knowledge</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>
-            <div class="sheet-clear"></div>
-        </div><!-- Skills Dropdown -->
+                <div class="sheet-clear"></div>
+            </div><!-- Skills Dropdown -->
+        </div>
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header" data-i18n="talentsandspecialabilities">Talents and Special Abilities</h3>
@@ -1515,7 +1568,7 @@
                         <table class="sheet-talent">
                             <tbody>
                                 <tr>
-                                    <td style="width:50%" colspan="4">
+                                    <td style="width:50%" colspan="6">
                                         <input type="text" name="attr_talentname" />
                                     </td>
                                     <td style="width:50%" rowspan="6">
@@ -1523,9 +1576,19 @@
                                     </td>
                                 </tr>
                                 <tr>
+                                    <td><label data-i18n="tier:">Tier:</label></td>
+                                    <td>
+                                        <select>
+                                            <option selected="selected">1</option>
+                                            <option>2</option>
+                                            <option>3</option>
+                                            <option>4</option>
+                                            <option>5</option>
+                                        </select>
+                                    </td>
                                     <td><label data-i18n="rank:">Rank:</label></td>
                                     <td><input type="number" name="attr_talentrank" /></td>
-                                    <td>
+                                    <td colspan="2">
                                         <div class="sheet-switch">
                                             <input type="radio" class="sheet-switch-input-on" name="attr_passiveActive" value="passive" title="Passive" checked="checked" data-i18n-title="passive">
                                             <input type="radio" class="sheet-switch-input-off" name="attr_passiveActive" value="active" title="Active" data-i18n-title="active">
@@ -1535,7 +1598,7 @@
                                 </tr>
                                 <tr>
                                     <td><label data-i18n="booknpage:">Book &amp; Page:</label></td>
-                                    <td><input type="text" name="attr_talentpagenum" /></td>
+                                    <td colspan="3"><input type="text" name="attr_talentpagenum" /></td>
                                     <td><label data-i18n="xpcost:">XP Cost:</label></td>
                                     <td><input type="number" style="width:50px" name="attr_talentcost" /></td>
                                 </tr>
@@ -1549,7 +1612,7 @@
         </div><!-- Talents and Abilities -->
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header" data-i18n="forcepowers">Magic Powers</h3>
+                <h3 class="sheet-section-header" data-i18n="powers">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">
@@ -5287,11 +5350,11 @@
         <div class="sheet-clear"></div>
         <div class="sheet-section-spacer sheet-talents-toggle-small"></div>
 
-        <b data-i18n="forcepowers">Magic 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>
+        <b data-i18n="powers">Magic 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 class="sheet-section-header" data-i18n="forcepowers">Magic Powers</h3>
+                    <h3 class="sheet-section-header" data-i18n="powers">Magic 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">
@@ -6625,11 +6688,11 @@
         <div class="sheet-clear"></div>
         <div class="sheet-section-spacer sheet-equipment-toggle-small"></div>
 
-        <b data-i18n="forcepowers">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>
+        <b data-i18n="powers">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" data-i18n="forcepowers">Magic Powers</h3>
+                    <h3 class="sheet-section-header" data-i18n="powers">Magic 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">
diff --git a/Genesys-RPG/translation.json b/Genesys-RPG/translation.json
index 5d997637f5..013e0aca9b 100644
--- a/Genesys-RPG/translation.json
+++ b/Genesys-RPG/translation.json
@@ -1,561 +1,565 @@
 {
-  "general-skills-list": "alchemy,astrocartography,athletics,computers,cool,coordination,discipline,driving,mechanics,medicine,operating,perception,piloting,resilience,skulduggery,stealth,streetwise,survival,vigilance",
-  "magic-skills-list": "arcane,divine,primal",
-  "combat-skills-list": "brawl,gunnery,melee,meleelight,meleeheavy,ranged,rangedlight,rangedheavy",
-  "social-skills-list": "charm,coercion,deception,leadership,negotiation",
-  "knowledge-skills-list": "knowledge",
-  "abilities": "Abilities",
-  "abilityname": "Ability Name",
-  "abilitysummary": "Ability Summary",
-  "active": "Active",
-  "actualtocomplete:": "Actual sessions to complete:",
-  "addcritical": "Add Critical",
-  "addingdice": "Adding Dice",
-  "addingdicetext": "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.",
-  "advantage": "Advantage",
-  "aft": "Aft",
-  "age:": "Age:",
-  "aggressor": "Aggressor",
-  "agility": "Agility",
-  "agitator": "Agitator",
-  "alchemy": "Alchemy",
-  "alchemyint": "Alchemy (Int)",
-  "all": "Personnage",
-  "arc": "Arc",
-  "Arcana": "Arcana",
-  "arcana": "Arcana",
-  "arcanaint": "Arcana (Int)",
-  "Arcanaint": "Arcana (Int)",
-  "archaeologist": "Archaeologist",
-  "armor": "Armor",
-  "assetsnresources": "Assets &amp; Resources",
-  "assignedby:": "Assigned By:",
-  "assignment": "Assignment",
-  "assignmentsandtasks": "Assignments and Tasks",
-  "Alchemy": "Alchemy",
-  "astrocartography": "Astrocartography",
-  "Astrogation": "Astrocartography",
-  "astrogation": "Astrocartography",
-  "astrogationint": "Astrocartography (Int)",
-  "atarustriker": "Ataru Striker",
-  "Athletics": "Athletics",
-  "athletics": "Athletics",
-  "athleticsbr": "Athletics (Br)",
-  "attachmentname": "Attachment Name",
-  "attachments": "Attachments",
-  "attacks": "Attacks",
-  "availablexp": "Available XP:",
-  "bardottan": "Bardottan",
-  "basemodifiers": "Base Modifiers",
-  "baseofoperations": "&emsp;Base of Operations &emsp;",
-  "basesetting:": "Base Setting/Genre:",
-  "basexp:": "Base XP:",
-  "beast": "&emsp;Riding Animal&emsp;",
-  "beastcriticalinjuries": "Beast Critical Injuries",
-  "bonus": "Bonus",
-  "bonusdescription": "Bonus/Description",
-  "bonusxpmotivation:": "Bonus XP (Motivation):",
-  "bonusxproleplaying:": "Bonus XP (Role Playing):",
-  "booknpage": "Book &amp; Page",
-  "booknpage:": "Book &amp; Page:",
-  "brawl": "Brawl",
-  "Brawl": "Brawl",
-  "brawlbr": "Brawl (Br)",
-  "brawn": "Brawn",
-  "build:": "Build:",
-  "business": "Business",
-  "businessname:": "Business Name:",
-  "campaigndetails": "&emsp;Campaign Details&emsp;",
-  "capacity": "Capacity",
-  "career": "Career",
-  "career:": "Career:",
-  "cargohold": "Cargo Hold",
-  "cargotype": "Cargo Type",
-  "category:": "Category:",
-  "categorydesire:": "Desire:",
-  "categoryfear:": "Fear:",
-  "categorystrength:": "Strength:",
-  "categoryflaw:": "Flaw:",
-  "char": "Char",
-  "characinfo": "&emsp;Character Info&emsp;",
-  "character": "Character",
-  "character:": "Character:",
-  "characterduties": "Character Duties",
-  "charactergroupobligations": "Character/Group Obligations",
-  "characteristics": "Characteristics",
-  "charactermoralities": "Character Moralities",
-  "charactermotivation": "Character Motivations",
-  "charactername": "Character Name",
-  "charactersheet": "Character Sheet",
-  "charm": "Charm",
-  "Charm": "Charm",
-  "charmpr": "Charm (Pr)",
-  "city:": "City:",
-  "clearpool": "Clear Pool",
-  "close": "Close",
-  "Coercion": "Coercion",
-  "coercion": "Coercion",
-  "coercionwill": "Coercion (Will)",
-  "combat": "&emsp; Weapons, Talents, &amp Powers &emsp;",
-  "combatskills": "Combat Skills",
-  "commited": "Committed",
-  "companion": "Companion",
-  "companioninfo": "&emsp;Companion Info&emsp;",
-  "companionsheet": "Companion Sheet",
-  "completed:": "Completed?:",
-  "computerint": "Computers (Int)",
-  "Computers": "Computers",
-  "computers": "Computers",
-  "condition:": "Condition:",
-  "conflict:": "Conflict:",
-  "consumables:": "Consumables:",
-  "continent:": "Continent:",
-  "contributionrank:": "Contribution Rank:",
-  "cool": "Cool",
-  "Cool": "Cool",
-  "coolifprepared": "Cool (if prepared):",
-  "coolpr": "Cool (Pr)",
-  "coordination": "Coordination",
-  "Coordination": "Coordination",
-  "coordinationag": "Coordination (Ag)",
-  "coretype:": "Core Type:",
-  "correllianhuman": "Corellian Human",
-  "cost:": "Cost:",
-  "credits:": "Money:",
-  "crew:": "Crew:",
-  "crewroles": "Crew Roles",
-  "crit": "Crit",
-  "critical": "Critical",
-  "criticalhits": "&emsp;Critical Hits&emsp;",
-  "criticalinjuries": "Critical Injuries",
-  "criticalnumber:": "Critical number:",
-  "criticalrolloffset:": "Critical roll offset:",
-  "critinj": "&emsp;Critical Injuries&emsp;",
-  "cunning": "Cunning",
-  "current": "Current",
-  "currentencumbrance": "Current Encumbrance",
-  "currentlocation:": "Current Location:",
-  "custom": "Custom",
-  "customskill1": "Custom Skill 1",
-  "customskill2": "Custom Skill 2",
-  "customskill3": "Custom Skill 3",
-  "customskill4": "Custom Skill 4",
-  "customskill5": "Custom Skill 5",
-  "customskills": "Custom Skills",
-  "cybernetics": "Cybernetics",
-  "damage": "Damage",
-  "dark": "GM",
-  "deception": "Deception",
-  "Deception": "Deception",
-  "deceptioncun": "Deception (Cun)",
-  "defense": "Defense",
-  "demolitionist": "Demolitionist",
-  "description": "Description",
-  "description:": "Description:",
-  "desire:": "Desire:",
-  "despair": "Despair",
-  "destination": "Destination",
-  "details": "Details",
-  "details:": "Details:",
-  "dice": "Dice",
-  "dice:": "Dice:",
-  "dicendesitnypool": "Dice &amp; Story Point Pool",
-  "dicepool": "Dice Pool",
-  "diceroll": "Dice Roll",
-  "discipline": "Discipline",
-  "Discipline": "Discipline",
-  "disciplinewill": "Discipline (Will)",
-  "displayinskill": "Display in Skill",
-  "divine": "Divine",
-  "divinewill": "Divine (Will)",
-  "dmg": "Dmg",
-  "downgrade": ":Downgrade",
-  "dresselliannp": "Dressellian (Non-Primitive)",
-  "dressellianp": "Dressellian (Primitive)",
-  "driver": "Driver",
-  "driving": "Driving",
-  "drivingag": "Driving (Ag)",
-  "dropoff": "Dropoff",
-  "effect:": "Effect:",
-  "enablecombatsuggestions": "Enable Combat Suggestions?",
-  "enablegeneralsuggestions": "Enable General Suggestions?",
-  "encum": "Encum",
-  "encumbrance": "Encumbrance",
-  "encumbrancecapacity": "Encumbrance Capacity",
-  "engaged": "Engaged",
-  "entertainment": "Entertainment",
-  "equipment": "Equipment",
-  "example:": "Example: <b>1b 1g</b>",
-  "exampletext": "b -> Blue = Boost,<br> blk -> BLacK = Setback,<br>g -> Green = Ability,<br> y -> Yellow = Proficiency,<br>p-> Purple = Difficulty,<br> r -> Red = Challenge,<br>s = Success, f = Failure,<br> a = Advantage, t = Threat",
-  "expectedsessionstocomplete:": "Expected sessions to complete:",
-  "extreme": "Extreme",
-  "eyes:": "Eyes:",
-  "factions:": "What are the major factions and organizations in the setting, and what are their objectives?:",
-  "failure": "Failure",
-  "farm": "Farm",
-  "fear:": "Fear:",
-  "fearcheck": "Fear Check?",
-  "features:": "Features:",
-  "flaw:": "Flaw:",
-  "foodstuffs": "Foodstuffs",
-  "forceplayerupdate": "Force Player Update",
-  "forcepowers": "Magic Powers",
-  "fore": "Fore",
-  "gender:": "Gender:",
-  "generalinfo": "General Info",
-  "generalinformation": "&emsp;General Information&emsp;",
-  "generalskills": "General Skills",
-  "genesysrpg": "Genesys RPG System",
-  "gmdicepool": "GM Dice Pool",
-  "gmresources": "GM Resources",
-  "groupcontacts": "Group Contacts",
-  "groupcredits:": "Group Money:",
-  "groupdetails": "Group Details",
-  "groupdetailstitle": "&emsp;Group Motivations&emsp;",
-  "groupexpenses:": "Group Expenses:",
-  "groupname:": "Group Name:",
-  "groupobligations": "Group Obligations",
-  "grouppossessions": "Group Possessions",
-  "groupresources": "Group Resources",
-  "groupsavings:": "Group Savings:",
-  "groupsheet": "Group Sheet",
-  "grouptasks": "Group Tasks",
-  "gunnery": "Gunnery",
-  "Gunnery": "Gunnery",
-  "gunneryagi": "Gunnery (Agi)",
-  "hair:": "Hair:",
-  "handling": "Handling",
-  "hardpoints": "Hard Points",
-  "hardpoints:": "Hard Points:",
-  "heal": "Heal",
-  "height:": "Height:",
-  "hermit": "Hermit",
-  "homestead": "Homestead",
-  "homesteadname:": "Homestead Name:",
-  "hook:": "Hook:",
-  "hp": "HP",
-  "hulltrauma": "Hull Trauma",
-  "hulltypeclass:": "Hull Type/Class:",
-  "hyperdriveprimclass:": "Hyperdrive Primary Class:",
-  "hyperdrivesecondclass:": "Hyperdrive Backup Class:",
-  "ifknown": "(if known)",
-  "illicitmaterials": "Illicit Materials",
-  "infiltrator": "Infiltrator",
-  "initiative": "Initiative",
-  "instructor": "Instructor",
-  "intellect": "Intellect",
-  "isitcareer": "Is it in your Career?",
-  "iteminventory": "&emsp;Item Inventory&emsp;",
-  "itemss:": "Item(s):",
-  "keyitems:": "Key Items:",
-  "knowledge": "Knowledge",
-  "knowledgeint": "Knowledge (Int)",
-  "knowledgeskills": "Knowledge Skills",
-  "leadership": "Leadership",
-  "Leadership": "Leadership",
-  "leadershippre": "Leadership (Pr)",
-  "legal": "Legal?",
-  "light": "Players",
-  "location": "Location",
-  "location:": "Location:",
-  "long": "Long",
-  "lore": "Lore",
-  "Lore": "Lore",
-  "loreint": "Lore (Int)",
-  "lowtech": "Low Tech",
-  "magicskills": "Magic Skills",
-  "magnitude:": "Magnitude:",
-  "major": "Major",
-  "makemodel": "Make / Model",
-  "makemodel:": "Make / Model:",
-  "manufacturer:": "Manufacturer:",
-  "max": "Max",
-  "maxaltitude:": "Maximum Altitude:",
-  "maybe": "Maybe?",
-  "Mechanics": "Mechanics",
-  "mechanics": "Mechanics",
-  "mechanicsint": "Mechanics (Int)",
-  "medecine": "Medecine",
-  "Medecine": "Medecine",
-  "medecineint": "Medicine (Int)",
-  "medic": "Medic",
-  "medium": "Medium",
-  "meetingcenter": "Meeting Center",
-  "melee": "Melee",
-  "Melee": "Melee",
-  "meleelight": "Melee - Light (Br)",
-  "MeleeLight": "Melee - Light (Br)",
-  "meleeheavy": "Melee - Heavy (Br)",
-  "MeleeHeavy": "Melee - Heavy (Br)",
-  "meleeshort": "Melee",
-  "meleebr": "Melee (Br)",
-  "meleelightbr": "Melee (Light) (Br)",
-  "meleeheavybr": "Melee (Heavy) (Br)",
-  "mercenarysoldier": "Mercenary Soldier",
-  "metals": "Metals",
-  "midtech": "Mid Tech",
-  "mine": "Mine",
-  "minerals": "Minerals",
-  "minion": "Minion",
-  "miniongroupsize:": "Minion Group Size:",
-  "minionrivalnemesis": "(Minion, Rival, or Nemesis)",
-  "minor": "Minor",
-  "miscinfo": "Misc Info",
-  "missioncontacts:": "Mission Contacts:",
-  "missiondetails": "Mission Details",
-  "missionobjectives:": "Mission Objectives:",
-  "missiontasknumber:": "Mission/Task Number:",
-  "missiontype:": "Mission Type:",
-  "modder": "Modder",
-  "moderate": "Moderate",
-  "modifications": "Modifications",
-  "modifiers": "Modifiers",
-  "modifiers:": "Modifiers:",
-  "mods": "Mods",
-  "money:": "Money:",
-  "morality": "Morality",
-  "morality:": "Morality:",
-  "moreinfo": "For more information on this version visit:",
-  "motivations": "Motivations",
-  "name": "Name",
-  "name:": "Name:",
-  "navicomputer:": "Navicomputer:",
-  "navigator": "Navigator",
-  "needhelp": "Need Help?",
-  "negotiation": "Negotiation",
-  "Negotiation": "Negotiation",
-  "negotiationpr": "Negotiation (Pr)",
-  "nemesis": "Nemesis",
-  "new": "New",
-  "no": "No",
-  "noinprogress": "No - In Progress",
-  "none": "None",
-  "nonostarted": "No - Not Started",
-  "noskill": "No Skill",
-  "notablefeatures": "Notable Features",
-  "notes": "&emsp; &emsp;Notes&emsp; &emsp;",
-  "notes:": "Notes:",
-  "npc": "NPC",
-  "npcinfo": "NPC Info",
-  "npclist": "NPC List",
-  "npcname": "NPC Name",
-  "npcroll:": "NPC Roll:",
-  "npcs": "NPCs",
-  "npcsheet": "NPC Sheet",
-  "npctitle": "&emsp;NPC&emsp;",
-  "npctype:": "NPC Type:",
-  "number": "Number",
-  "numberofupgrades:": "Number of Upgrades:",
-  "off": "Off",
-  "on": "On",
-  "operating": "Operating",
-  "operatingint": "Operating (Int)",
-  "option": "Option",
-  "other": "Other",
-  "othergear": "Other Gear",
-  "otherinformations": "Other Information",
-  "otherskills": "Other Skills",
-  "overview:": "Overview:",
-  "page:": "Page:",
-  "partycareerskill:": "Party Career Skill:",
-  "passengername": "Passenger Name",
-  "passengers": "Passengers",
-  "passive": "Passive",
-  "pc": "PC",
-  "peacekeeper": "Peace Keeper",
-  "perception": "Perception",
-  "Perception": "Perception",
-  "perceptioncun": "Perception (Cun)",
-  "performer": "Performer",
-  "personalarmor": "Armor",
-  "personalgear": "Personal Gear",
-  "pettycash:": "Petty Cash:",
-  "pickup": "Pickup",
-  "pilotecopiloteetc": "(Pilot, Co-pilot, Engineer)",
-  "Piloting": "Piloting",
-  "piloting": "Piloting",
-  "pilotingag": "Piloting (Ag)",
-  "planet:": "Planet:",
-  "planetary": "&emsp;Vehicle&emsp;",
-  "planetaryvehiculecritical": "Vehicle Critical",
-  "planetaryvehiculedetails": "Vehicle Details",
-  "player:": "Player:",
-  "playergroupsheet": "&emsp;Group Information&emsp;",
-  "playername": "Player Name:",
-  "port": "Port",
-  "positionrole:": "Position/Role:",
-  "powername": "Power Name",
-  "powersummary": "Power Summary",
-  "presence": "Presence",
-  "primal": "Primal",
-  "primalcun": "Primal (Cun)",
-  "qualities:": "Qualities:",
-  "quantity": "Quantity",
-  "ranch": "Ranch",
-  "range": "Range",
-  "range:": "Range:",
-  "ranged": "Ranged",
-  "rangedheavy": "Ranged - Heavy",
-  "rangedag": "Ranged (Ag)",
-  "Ranged - Heavy": "Ranged - Heavy",
-  "rangedheavyag": "Ranged - Heavy (Ag)",
-  "rangedlight": "Ranged - Light",
-  "Ranged - Light": "Ranged - Light",
-  "rangedlightag": "Ranged - Light (Ag)",
-  "rangeskill": "Range/Skill",
-  "rank": "Rank",
-  "rank:": "Rank:",
-  "rarity": "Rarity",
-  "rarity:": "Rarity:",
-  "rebelbase": "Base Info",
-  "rebelbasename:": "Base Name:",
-  "recruit": "Recruit",
-  "repair": "Repair",
-  "resilience": "Resilience",
-  "Resilience": "Resilience",
-  "resiliencebr": "Resilience (Br)",
-  "restricted:": "Restricted:",
-  "results": "Results",
-  "retail": "Retail",
-  "rewardgiven:": "Rewards Given:",
-  "rewards": "Rewards",
-  "rewardss": "Reward(s)",
-  "ridingag": "Riding (Ag)",
-  "riding": "Riding",
-  "Riding": "Riding",
-  "ridingbeastdetails": "Riding Beast Details",
-  "rival": "Rival",
-  "role": "Role",
-  "rollcritical": "Roll Critical",
-  "rolldestiny": "Roll Destiny",
-  "safehouse": "Safe House",
-  "sensorrange:": "Sensor Range:",
-  "service": "Service",
-  "setting": "Setting",
-  "setting:": "Setting:",
-  "settings": "&emsp;Settings&emsp;",
-  "setting-speciesdescription:": "Description",
-  "setting-speciesname:": "Name",
-  "settinginfo": "Genre/Setting Tropes and Themes",
-  "settingtitle": "Setting Worksheet",
-  "settingtitle2": "&emsp;Setting Worksheet&emsp;",
-  "settingtitle-setting": "Setting",
-  "settingtitle-faction": "Factions and Organizations",
-  "settingtitle-genre": "Genre/Setting Tropes and Themes",
-  "settingtitle-movers": "Movers and Shakers",
-  "settingtitle-skills": "Setting Specific Skills",
-  "settingtitle-species": "Major Species Types",
-  "setting-speciesdescription": "Description",
-  "settingtitle-tech": "Tech Level",
-  "setup:": "Setup:",
-  "shadow": "Shadow",
-  "shakers:": "Who are the major personalities in the setting, and what are their objectives?:",
-  "sharedresources": "&emsp;Shared Resources &emsp;",
-  "shipscomplement:": "Ship's Complement:",
-  "short": "Short",
-  "showsuggestionsbutton": "Show Suggestions Button",
-  "signatureablities": "Signature Abilities",
-  "silhouette": "Silhouette",
-  "skill": "Skill",
-  "skill:": "Skill:",
-  "skilllist": "Skill List",
-  "skillname": "Skill Name",
-  "skills": "Skills",
-  "skillstitle": "&emsp; &emsp;Skills&emsp; &emsp;",
-  "skillstalentsweaponspowers": "&emsp;Weapons, Skills, Talents &amp; Powers&emsp;",
-  "skillsuggestions": "Skill Suggestions",
-  "skillsuggestionsdisplay": "Skill Suggestions Display",
-  "skulduggery": "Skulduggery",
-  "Skulduggery": "Skulduggery",
-  "skulduggerycun": "Skulduggery (Cun)",
-  "soak": "Soak",
-  "socialskills": "Social Skills",
-  "soldier": "Soldier",
-  "spacestation": "Space Station",
-  "spacevehiculedetails": "Space Vehicle Details",
-  "special:": "Special:",
-  "specialization": "Specialization",
-  "specializationattached": "Specialization attached?",
-  "species:": "Archetype/Species:",
-  "specificdetails": "Specific Details",
-  "speed": "Speed",
-  "spendingsuggestions": "Spending Suggestions",
-  "spy": "Spy",
-  "starboard": "Starboard",
-  "starfighterace": "Starfighter Ace",
-  "starship": "&emsp;Spaceship&emsp;",
-  "starshipcritical": "Starship Critical",
-  "stats": "Stats",
-  "stealth": "Stealth",
-  "Stealth": "Stealth",
-  "stealthag": "Stealth (Ag)",
-  "storypointpool": "Story Point Pool",
-  "strain": "Strain",
-  "streetwise": "Streetwise",
-  "Streetwise": "Streetwise",
-  "streetwisecun": "Streetwise (Cun)",
-  "strength:": "Strength:",
-  "strenghdetails:": "Strength Details:",
-  "success": "Success",
-  "summary": "Summary",
-  "survival": "Survival",
-  "Survival": "Survival",
-  "survivalcun": "Survival (Cun)",
-  "survivalist": "Survivalist",
-  "syncpoolgm": "Sync Pool with GM",
-  "sysstrain": "Sys Strain",
-  "talentsandabilities": "Talents &amp; Abilities",
-  "talentsandspecialabilities": "Talents and Special Abilities",
-  "task:": "Task:",
-  "terrain:": "Terrain:",
-  "threshold": "Threshold",
-  "timeshandled:": "Times Handled:",
-  "timeshandledstrengh:": "Times Handled (Strength):",
-  "timeshandledweakness:": "Times Handled (Weakness):",
-  "timestriggered:": "Times Triggered:",
-  "threat": "Threat",
-  "tone:": "Tone:",
-  "toolname": "Tool Name",
-  "tools": "Tools",
-  "totalxp": "Total XP:",
-  "trainingcamp": "Training Camp",
-  "triumph": "Triumph",
-  "tropesadd:": "What Tropes/Themes about Technology, Human Nature, Morality, or Reality are you including?:",
-  "tropesexclude:": "What Tropes/Themes are you excluding?:",
-  "tropessubvert:": "What Tropes/Themes are you subverting?:",
-  "type": "Type",
-  "type:": "Type:",
-  "upgrade": "&nbsp;&nbsp;&nbsp;&nbsp;Upgrade:",
-  "upgrades": "Upgrades",
-  "upgradetype:": "Upgrade Type:",
-  "usedarkside": "Use GM Story Point &#8594;",
-  "uselight": "&#8592; Use Player Story Point",
-  "value": "Value",
-  "value:": "Value:",
-  "vehiculesheet": "Vehicle Sheet",
-  "vehiculetypemodel:": "Vehicle Type/Model:",
-  "viewattachments": "View Attachments",
-  "viewupgrades": "View Upgrades",
-  "vigilance": "Vigilance",
-  "Vigilance": "Vigilance",
-  "vigilanceifunexpected": "Vigilance (if unexpected):",
-  "vigilancewill": "Vigilance (Will)",
-  "visitforum:": "Visit the forum:",
-  "visitwiki:": "Visit the wiki:",
-  "wanted": "Wanted?",
-  "weaknessdetails:": "Weakness Details:",
-  "weapon": "Weapon",
-  "weaponname": "Weapon Name",
-  "weapons": "Weapons",
-  "weapontype:": "Weapon Type:",
-  "whatkindofslot": "What kind of Initiative Slot?",
-  "whispergm": "Whisper GM",
-  "willpower": "Willpower",
-  "wounds": "Wounds",
-  "world:": "World:",
-  "xpcost": "XP Cost",
-  "xpcost:": "XP Cost:",
-  "yes": "Yes",
-  "yescompleted": "Yes - Completed",
-  "yesfailed": "Yes - Failed"
+	"general-skills-list": "alchemy,astrocartography,athletics,computers,cool,coordination,discipline,driving,mechanics,medicine,operating,perception,piloting,resilience,skulduggery,stealth,streetwise,survival,vigilance",
+	"magic-skills-list": "arcane,divine,primal",
+	"combat-skills-list": "brawl,gunnery,melee,meleelight,meleeheavy,ranged,rangedlight,rangedheavy",
+	"social-skills-list": "charm,coercion,deception,leadership,negotiation",
+	"knowledge-skills-list": "knowledge",
+	"abilities": "Abilities",
+	"abilityname": "Ability Name",
+	"abilitysummary": "Ability Summary",
+	"active": "Active",
+	"actualtocomplete:": "Actual sessions to complete:",
+	"addcritical": "Add Critical",
+	"addingdice": "Adding Dice",
+	"addingdicetext": "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.",
+	"advantage": "Advantage",
+	"aft": "Aft",
+	"age:": "Age:",
+	"aggressor": "Aggressor",
+	"agility": "Agility",
+	"agitator": "Agitator",
+	"alchemy": "Alchemy",
+	"alchemyint": "Alchemy (Int)",
+	"all": "Personnage",
+	"arc": "Arc",
+	"Arcana": "Arcana",
+	"arcana": "Arcana",
+	"arcanaint": "Arcana (Int)",
+	"Arcanaint": "Arcana (Int)",
+	"archaeologist": "Archaeologist",
+	"armor": "Armor",
+	"assetsnresources": "Assets &amp; Resources",
+	"assignedby:": "Assigned By:",
+	"assignment": "Assignment",
+	"assignmentsandtasks": "Assignments and Tasks",
+	"Alchemy": "Alchemy",
+	"astrocartography": "Astrocartography",
+	"Astrogation": "Astrocartography",
+	"astrogation": "Astrocartography",
+	"astrogationint": "Astrocartography (Int)",
+	"atarustriker": "Ataru Striker",
+	"Athletics": "Athletics",
+	"athletics": "Athletics",
+	"athleticsbr": "Athletics (Br)",
+	"attachmentname": "Attachment Name",
+	"attachments": "Attachments",
+	"attacks": "Attacks",
+	"availablexp": "Available XP:",
+	"bardottan": "Bardottan",
+	"basemodifiers": "Base Modifiers",
+	"baseofoperations": "&emsp;Base of Operations &emsp;",
+	"basesetting:": "Base Setting/Genre:",
+	"basexp:": "Base XP:",
+	"beast": "&emsp;Riding Animal&emsp;",
+	"beastcriticalinjuries": "Beast Critical Injuries",
+	"bonus": "Bonus",
+	"bonusdescription": "Bonus/Description",
+	"bonusxpmotivation:": "Bonus XP (Motivation):",
+	"bonusxproleplaying:": "Bonus XP (Role Playing):",
+	"booknpage": "Book &amp; Page",
+	"booknpage:": "Book &amp; Page:",
+	"brawl": "Brawl",
+	"Brawl": "Brawl",
+	"brawlbr": "Brawl (Br)",
+	"brawn": "Brawn",
+	"build:": "Build:",
+	"business": "Business",
+	"businessname:": "Business Name:",
+	"campaigndetails": "&emsp;Campaign Details&emsp;",
+	"capacity": "Capacity",
+	"career": "Career",
+	"career:": "Career:",
+	"cargohold": "Cargo Hold",
+	"cargotype": "Cargo Type",
+	"category:": "Category:",
+	"categorydesire:": "Desire:",
+	"categoryfear:": "Fear:",
+	"categorystrength:": "Strength:",
+	"categoryflaw:": "Flaw:",
+	"char": "Char",
+	"characinfo": "&emsp;Character Info&emsp;",
+	"character": "Character",
+	"character:": "Character:",
+	"characterduties": "Character Duties",
+	"charactergroupobligations": "Character/Group Obligations",
+	"characteristics": "Characteristics",
+	"charactermoralities": "Character Moralities",
+	"charactermotivation": "Character Motivations",
+	"charactername": "Character Name",
+	"charactersheet": "Character Sheet",
+	"charm": "Charm",
+	"Charm": "Charm",
+	"charmpr": "Charm (Pr)",
+	"city:": "City:",
+	"clearpool": "Clear Pool",
+	"close": "Close",
+	"Coercion": "Coercion",
+	"coercion": "Coercion",
+	"coercionwill": "Coercion (Will)",
+	"combat": "&emsp; Weapons, Talents, &amp Powers &emsp;",
+	"combatskills": "Combat Skills",
+	"commited": "Committed",
+	"companion": "Companion",
+	"companioninfo": "&emsp;Companion Info&emsp;",
+	"companionsheet": "Companion Sheet",
+	"completed:": "Completed?:",
+	"computerint": "Computers (Int)",
+	"Computers": "Computers",
+	"computers": "Computers",
+	"condition:": "Condition:",
+	"conflict:": "Conflict:",
+	"consumables:": "Consumables:",
+	"continent:": "Continent:",
+	"contributionrank:": "Contribution Rank:",
+	"cool": "Cool",
+	"Cool": "Cool",
+	"coolifprepared": "Cool (if prepared):",
+	"coolpr": "Cool (Pr)",
+	"coordination": "Coordination",
+	"Coordination": "Coordination",
+	"coordinationag": "Coordination (Ag)",
+	"coretype:": "Core Type:",
+	"correllianhuman": "Corellian Human",
+	"cost:": "Cost:",
+	"credits:": "Money:",
+	"crew:": "Crew:",
+	"crewroles": "Crew Roles",
+	"crit": "Crit",
+	"critical": "Critical",
+	"criticalhits": "&emsp;Critical Hits&emsp;",
+	"criticalinjuries": "Critical Injuries",
+	"criticalnumber:": "Critical number:",
+	"criticalrolloffset:": "Critical roll offset:",
+	"critinj": "&emsp;Critical Injuries&emsp;",
+	"cunning": "Cunning",
+	"current": "Current",
+	"currentencumbrance": "Current Encumbrance",
+	"currentlocation:": "Current Location:",
+	"custom": "Custom",
+	"customskill1": "Custom Skill 1",
+	"customskill2": "Custom Skill 2",
+	"customskill3": "Custom Skill 3",
+	"customskill4": "Custom Skill 4",
+	"customskill5": "Custom Skill 5",
+	"customskills": "Custom Skills",
+	"cybernetics": "Cybernetics",
+	"damage": "Damage",
+	"dark": "GM",
+	"deception": "Deception",
+	"Deception": "Deception",
+	"deceptioncun": "Deception (Cun)",
+	"defense": "Defense",
+	"demolitionist": "Demolitionist",
+	"description": "Description",
+	"description:": "Description:",
+	"desire:": "Desire:",
+	"despair": "Despair",
+	"destination": "Destination",
+	"details": "Details",
+	"details:": "Details:",
+	"dice": "Dice",
+	"dice:": "Dice:",
+	"dicendesitnypool": "Dice &amp; Story Point Pool",
+	"dicepool": "Dice Pool",
+	"diceroll": "Dice Roll",
+	"discipline": "Discipline",
+	"Discipline": "Discipline",
+	"disciplinewill": "Discipline (Will)",
+	"displayinskill": "Display in Skill",
+	"divine": "Divine",
+	"divinewill": "Divine (Will)",
+	"dmg": "Dmg",
+	"downgrade": ":Downgrade",
+	"dresselliannp": "Dressellian (Non-Primitive)",
+	"dressellianp": "Dressellian (Primitive)",
+	"driver": "Driver",
+	"driving": "Driving",
+	"drivingag": "Driving (Ag)",
+	"dropoff": "Dropoff",
+	"effect:": "Effect:",
+	"enablecombatsuggestions": "Enable Combat Suggestions?",
+	"enablegeneralsuggestions": "Enable General Suggestions?",
+	"encum": "Encum",
+	"encumbrance": "Encumbrance",
+	"encumbrancecapacity": "Encumbrance Capacity",
+	"engaged": "Engaged",
+	"entertainment": "Entertainment",
+	"equipment": "Equipment",
+	"example:": "Example: <b>1b 1g</b>",
+	"exampletext": "b -> Blue = Boost,<br> blk -> BLacK = Setback,<br>g -> Green = Ability,<br> y -> Yellow = Proficiency,<br>p-> Purple = Difficulty,<br> r -> Red = Challenge,<br>s = Success, f = Failure,<br> a = Advantage, t = Threat",
+	"expectedsessionstocomplete:": "Expected sessions to complete:",
+	"extreme": "Extreme",
+	"eyes:": "Eyes:",
+	"factions:": "What are the major factions and organizations in the setting, and what are their objectives?:",
+	"failure": "Failure",
+	"farm": "Farm",
+	"fear:": "Fear:",
+	"fearcheck": "Fear Check?",
+	"features:": "Features:",
+	"flaw:": "Flaw:",
+	"foodstuffs": "Foodstuffs",
+	"forceplayerupdate": "Force Player Update",
+	"fore": "Fore",
+	"gender:": "Gender:",
+	"generalinfo": "General Info",
+	"generalinformation": "&emsp;General Information&emsp;",
+	"generalskills": "General Skills",
+	"genesysrpg": "Genesys RPG System",
+	"gmdicepool": "GM Dice Pool",
+	"gmresources": "GM Resources",
+	"groupcontacts": "Group Contacts",
+	"groupcredits:": "Group Money:",
+	"groupdetails": "Group Details",
+	"groupdetailstitle": "&emsp;Group Motivations&emsp;",
+	"groupexpenses:": "Group Expenses:",
+	"groupname:": "Group Name:",
+	"groupobligations": "Group Obligations",
+	"grouppossessions": "Group Possessions",
+	"groupresources": "Group Resources",
+	"groupsavings:": "Group Savings:",
+	"groupsheet": "Group Sheet",
+	"grouptasks": "Group Tasks",
+	"gunnery": "Gunnery",
+	"Gunnery": "Gunnery",
+	"gunneryagi": "Gunnery (Agi)",
+	"hair:": "Hair:",
+	"handling": "Handling",
+	"hardpoints": "Hard Points",
+	"hardpoints:": "Hard Points:",
+	"heal": "Heal",
+	"height:": "Height:",
+	"hermit": "Hermit",
+	"hide": "Hide",
+	"homestead": "Homestead",
+	"homesteadname:": "Homestead Name:",
+	"hook:": "Hook:",
+	"hp": "HP",
+	"hulltrauma": "Hull Trauma",
+	"hulltypeclass:": "Hull Type/Class:",
+	"hyperdriveprimclass:": "Hyperdrive Primary Class:",
+	"hyperdrivesecondclass:": "Hyperdrive Backup Class:",
+	"ifknown": "(if known)",
+	"illicitmaterials": "Illicit Materials",
+	"infiltrator": "Infiltrator",
+	"initiative": "Initiative",
+	"instructor": "Instructor",
+	"intellect": "Intellect",
+	"isitcareer": "Is it in your Career?",
+	"iteminventory": "&emsp;Item Inventory&emsp;",
+	"itemss:": "Item(s):",
+	"keyitems:": "Key Items:",
+	"knowledge": "Knowledge",
+	"knowledgeint": "Knowledge (Int)",
+	"knowledgeskills": "Knowledge Skills",
+	"leadership": "Leadership",
+	"Leadership": "Leadership",
+	"leadershippre": "Leadership (Pr)",
+	"legal": "Legal?",
+	"light": "Players",
+	"location": "Location",
+	"location:": "Location:",
+	"long": "Long",
+	"lore": "Lore",
+	"Lore": "Lore",
+	"loreint": "Lore (Int)",
+	"lowtech": "Low Tech",
+	"magicskills": "Magic Skills",
+	"magnitude:": "Magnitude:",
+	"major": "Major",
+	"makemodel": "Make / Model",
+	"makemodel:": "Make / Model:",
+	"manufacturer:": "Manufacturer:",
+	"max": "Max",
+	"maxaltitude:": "Maximum Altitude:",
+	"maybe": "Maybe?",
+	"Mechanics": "Mechanics",
+	"mechanics": "Mechanics",
+	"mechanicsint": "Mechanics (Int)",
+	"medecine": "Medecine",
+	"Medecine": "Medecine",
+	"medecineint": "Medicine (Int)",
+	"medic": "Medic",
+	"medium": "Medium",
+	"meetingcenter": "Meeting Center",
+	"melee": "Melee",
+	"Melee": "Melee",
+	"meleelight": "Melee - Light (Br)",
+	"MeleeLight": "Melee - Light (Br)",
+	"meleeheavy": "Melee - Heavy (Br)",
+	"MeleeHeavy": "Melee - Heavy (Br)",
+	"meleeshort": "Melee",
+	"meleebr": "Melee (Br)",
+	"meleelightbr": "Melee (Light) (Br)",
+	"meleeheavybr": "Melee (Heavy) (Br)",
+	"mercenarysoldier": "Mercenary Soldier",
+	"metals": "Metals",
+	"midtech": "Mid Tech",
+	"mine": "Mine",
+	"minerals": "Minerals",
+	"minion": "Minion",
+	"miniongroupsize:": "Minion Group Size:",
+	"minionrivalnemesis": "(Minion, Rival, or Nemesis)",
+	"minor": "Minor",
+	"miscinfo": "Misc Info",
+	"missioncontacts:": "Mission Contacts:",
+	"missiondetails": "Mission Details",
+	"missionobjectives:": "Mission Objectives:",
+	"missiontasknumber:": "Mission/Task Number:",
+	"missiontype:": "Mission Type:",
+	"modder": "Modder",
+	"moderate": "Moderate",
+	"modifications": "Modifications",
+	"modifiers": "Modifiers",
+	"modifiers:": "Modifiers:",
+	"mods": "Mods",
+	"money:": "Money:",
+	"morality": "Morality",
+	"morality:": "Morality:",
+	"moreinfo": "For more information on this version visit:",
+	"motivations": "Motivations",
+	"name": "Name",
+	"name:": "Name:",
+	"navicomputer:": "Navicomputer:",
+	"navigator": "Navigator",
+	"needhelp": "Need Help?",
+	"negotiation": "Negotiation",
+	"Negotiation": "Negotiation",
+	"negotiationpr": "Negotiation (Pr)",
+	"nemesis": "Nemesis",
+	"new": "New",
+	"no": "No",
+	"noinprogress": "No - In Progress",
+	"none": "None",
+	"nonostarted": "No - Not Started",
+	"noskill": "No Skill",
+	"notablefeatures": "Notable Features",
+	"notes": "&emsp; &emsp;Notes&emsp; &emsp;",
+	"notes:": "Notes:",
+	"npc": "NPC",
+	"npcinfo": "NPC Info",
+	"npclist": "NPC List",
+	"npcname": "NPC Name",
+	"npcroll:": "NPC Roll:",
+	"npcs": "NPCs",
+	"npcsheet": "NPC Sheet",
+	"npctitle": "&emsp;NPC&emsp;",
+	"npctype:": "NPC Type:",
+	"number": "Number",
+	"numberofupgrades:": "Number of Upgrades:",
+	"off": "Off",
+	"on": "On",
+	"operating": "Operating",
+	"operatingint": "Operating (Int)",
+	"option": "Option",
+	"other": "Other",
+	"othergear": "Other Gear",
+	"otherinformations": "Other Information",
+	"otherskills": "Other Skills",
+	"overview:": "Overview:",
+	"page:": "Page:",
+	"partycareerskill:": "Party Career Skill:",
+	"passengername": "Passenger Name",
+	"passengers": "Passengers",
+	"passive": "Passive",
+	"pc": "PC",
+	"peacekeeper": "Peace Keeper",
+	"perception": "Perception",
+	"Perception": "Perception",
+	"perceptioncun": "Perception (Cun)",
+	"performer": "Performer",
+	"personalarmor": "Armor",
+	"personalgear": "Personal Gear",
+	"pettycash:": "Petty Cash:",
+	"pickup": "Pickup",
+	"pilotecopiloteetc": "(Pilot, Co-pilot, Engineer)",
+	"Piloting": "Piloting",
+	"piloting": "Piloting",
+	"pilotingag": "Piloting (Ag)",
+	"planet:": "Planet:",
+	"planetary": "&emsp;Vehicle&emsp;",
+	"planetaryvehiculecritical": "Vehicle Critical",
+	"planetaryvehiculedetails": "Vehicle Details",
+	"player:": "Player:",
+	"playergroupsheet": "&emsp;Group Information&emsp;",
+	"playername": "Player Name:",
+	"port": "Port",
+	"positionrole:": "Position/Role:",
+	"powers": "Powers",
+	"powername": "Power Name",
+	"powersummary": "Power Summary",
+	"presence": "Presence",
+	"primal": "Primal",
+	"primalcun": "Primal (Cun)",
+	"qualities:": "Qualities:",
+	"quantity": "Quantity",
+	"ranch": "Ranch",
+	"range": "Range",
+	"range:": "Range:",
+	"ranged": "Ranged",
+	"rangedheavy": "Ranged - Heavy",
+	"rangedag": "Ranged (Ag)",
+	"Ranged - Heavy": "Ranged - Heavy",
+	"rangedheavyag": "Ranged - Heavy (Ag)",
+	"rangedlight": "Ranged - Light",
+	"Ranged - Light": "Ranged - Light",
+	"rangedlightag": "Ranged - Light (Ag)",
+	"rangeskill": "Range/Skill",
+	"rank": "Rank",
+	"rank:": "Rank:",
+	"rarity": "Rarity",
+	"rarity:": "Rarity:",
+	"rebelbase": "Base Info",
+	"rebelbasename:": "Base Name:",
+	"recruit": "Recruit",
+	"repair": "Repair",
+	"resilience": "Resilience",
+	"Resilience": "Resilience",
+	"resiliencebr": "Resilience (Br)",
+	"restricted:": "Restricted:",
+	"results": "Results",
+	"retail": "Retail",
+	"rewardgiven:": "Rewards Given:",
+	"rewards": "Rewards",
+	"rewardss": "Reward(s)",
+	"ridingag": "Riding (Ag)",
+	"riding": "Riding",
+	"Riding": "Riding",
+	"ridingbeastdetails": "Riding Beast Details",
+	"rival": "Rival",
+	"role": "Role",
+	"rollcritical": "Roll Critical",
+	"rolldestiny": "Roll Destiny",
+	"safehouse": "Safe House",
+	"sensorrange:": "Sensor Range:",
+	"service": "Service",
+	"setting": "Setting",
+	"setting:": "Setting:",
+	"settings": "&emsp;Settings&emsp;",
+	"setting-speciesdescription:": "Description",
+	"setting-speciesname:": "Name",
+	"settinginfo": "Genre/Setting Tropes and Themes",
+	"settingtitle": "Setting Worksheet",
+	"settingtitle2": "&emsp;Setting Worksheet&emsp;",
+	"settingtitle-setting": "Setting",
+	"settingtitle-faction": "Factions and Organizations",
+	"settingtitle-genre": "Genre/Setting Tropes and Themes",
+	"settingtitle-movers": "Movers and Shakers",
+	"settingtitle-skills": "Setting Specific Skills",
+	"settingtitle-species": "Major Species Types",
+	"setting-speciesdescription": "Description",
+	"settingtitle-tech": "Tech Level",
+	"setup:": "Setup:",
+	"shadow": "Shadow",
+	"shakers:": "Who are the major personalities in the setting, and what are their objectives?:",
+	"sharedresources": "&emsp;Shared Resources &emsp;",
+	"shipscomplement:": "Ship's Complement:",
+	"short": "Short",
+	"showskillhide": "Show Hide Skill Options",
+	"showsuggestionsbutton": "Show Suggestions Button",
+	"signatureablities": "Signature Abilities",
+	"silhouette": "Silhouette",
+	"skill": "Skill",
+	"skill:": "Skill:",
+	"skilllist": "Skill List",
+	"skillname": "Skill Name",
+	"skills": "Skills",
+	"skillstitle": "&emsp; &emsp;Skills&emsp; &emsp;",
+	"skillstalentsweaponspowers": "&emsp;Weapons, Skills, Talents &amp; Powers&emsp;",
+	"skillsuggestions": "Skill Suggestions",
+	"skillsuggestionsdisplay": "Skill Suggestions Display",
+	"skulduggery": "Skulduggery",
+	"Skulduggery": "Skulduggery",
+	"skulduggerycun": "Skulduggery (Cun)",
+	"soak": "Soak",
+	"socialskills": "Social Skills",
+	"soldier": "Soldier",
+	"spacestation": "Space Station",
+	"spacevehiculedetails": "Space Vehicle Details",
+	"special:": "Special:",
+	"specialization": "Specialization",
+	"specializationattached": "Specialization attached?",
+	"species:": "Archetype/Species:",
+	"specificdetails": "Specific Details",
+	"speed": "Speed",
+	"spendingsuggestions": "Spending Suggestions",
+	"spy": "Spy",
+	"starboard": "Starboard",
+	"starfighterace": "Starfighter Ace",
+	"starship": "&emsp;Spaceship&emsp;",
+	"starshipcritical": "Starship Critical",
+	"stats": "Stats",
+	"stealth": "Stealth",
+	"Stealth": "Stealth",
+	"stealthag": "Stealth (Ag)",
+	"storypointpool": "Story Point Pool",
+	"strain": "Strain",
+	"streetwise": "Streetwise",
+	"Streetwise": "Streetwise",
+	"streetwisecun": "Streetwise (Cun)",
+	"strength:": "Strength:",
+	"strenghdetails:": "Strength Details:",
+	"success": "Success",
+	"summary": "Summary",
+	"survival": "Survival",
+	"Survival": "Survival",
+	"survivalcun": "Survival (Cun)",
+	"survivalist": "Survivalist",
+	"syncpoolgm": "Sync Pool with GM",
+	"sysstrain": "Sys Strain",
+	"talentsandabilities": "Talents &amp; Abilities",
+	"talentsandspecialabilities": "Talents and Special Abilities",
+	"task:": "Task:",
+	"terrain:": "Terrain:",
+	"threshold": "Threshold",
+	"tier": "Tier",
+	"tier:": "Tier:",
+	"timeshandled:": "Times Handled:",
+	"timeshandledstrengh:": "Times Handled (Strength):",
+	"timeshandledweakness:": "Times Handled (Weakness):",
+	"timestriggered:": "Times Triggered:",
+	"threat": "Threat",
+	"tone:": "Tone:",
+	"toolname": "Tool Name",
+	"tools": "Tools",
+	"totalxp": "Total XP:",
+	"trainingcamp": "Training Camp",
+	"triumph": "Triumph",
+	"tropesadd:": "What Tropes/Themes about Technology, Human Nature, Morality, or Reality are you including?:",
+	"tropesexclude:": "What Tropes/Themes are you excluding?:",
+	"tropessubvert:": "What Tropes/Themes are you subverting?:",
+	"type": "Type",
+	"type:": "Type:",
+	"upgrade": "&nbsp;&nbsp;&nbsp;&nbsp;Upgrade:",
+	"upgrades": "Upgrades",
+	"upgradetype:": "Upgrade Type:",
+	"usedarkside": "Use GM Story Point &#8594;",
+	"uselight": "&#8592; Use Player Story Point",
+	"value": "Value",
+	"value:": "Value:",
+	"vehiculesheet": "Vehicle Sheet",
+	"vehiculetypemodel:": "Vehicle Type/Model:",
+	"viewattachments": "View Attachments",
+	"viewupgrades": "View Upgrades",
+	"vigilance": "Vigilance",
+	"Vigilance": "Vigilance",
+	"vigilanceifunexpected": "Vigilance (if unexpected):",
+	"vigilancewill": "Vigilance (Will)",
+	"visitforum:": "Visit the forum:",
+	"visitwiki:": "Visit the wiki:",
+	"wanted": "Wanted?",
+	"weaknessdetails:": "Weakness Details:",
+	"weapon": "Weapon",
+	"weaponname": "Weapon Name",
+	"weapons": "Weapons",
+	"weapontype:": "Weapon Type:",
+	"whatkindofslot": "What kind of Initiative Slot?",
+	"whispergm": "Whisper GM",
+	"willpower": "Willpower",
+	"wounds": "Wounds",
+	"world:": "World:",
+	"xpcost": "XP Cost",
+	"xpcost:": "XP Cost:",
+	"yes": "Yes",
+	"yescompleted": "Yes - Completed",
+	"yesfailed": "Yes - Failed"
 }
\ No newline at end of file