diff --git a/Rogue Trader Improved/RogueTraderImproved.css b/Rogue Trader Improved/RogueTraderImproved.css
index 905a096321..b61d329799 100644
--- a/Rogue Trader Improved/RogueTraderImproved.css	
+++ b/Rogue Trader Improved/RogueTraderImproved.css	
@@ -19,7 +19,6 @@
 .characterviewer .nav-tabs {
     padding-top: 0px;
 }
-
 /*Universal override for Roll20 content box*/
 .ui-dialog .charsheet .rti * {
     box-sizing: border-box;
@@ -49,36 +48,13 @@
     display: block;
 }
 
-/* action button used for CRP */ {}
-.charsheet .rti button[type="action"] {
-    width: 100%;
-    height: 24px;
-    font-size: 13px;
-    font-weight: bold;
-    color: black;
-    cursor: pointer;
-    background-color: rgb(255 182 0 / 17%);
-    border: 1px solid black;
-    white-space: nowrap;
-    border-radius: 4px;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-.charsheet .rti button[type="action"]:hover {
-    color: white;
-    border: 1px solid rgb(218, 165, 32, 1.0);
-    background-color: rgb(218, 165, 32, 1.0);
-}
-
-/* Main HTML tags Styling */
-/* general rules for some tags*/
-.charsheet .rti button[type="action"],
+/* HTML tags Styling general rules */{}
 .charsheet .rti button[type="roll"],
 .charsheet .rti span,
 .charsheet .rti label,
 .charsheet .rti select,
+.charsheet .rti b,
+.charsheet .rti i,
 .charsheet .rti input[type="text"],
 .charsheet .rti input[type="number"] {
     display: inline-block;
@@ -87,6 +63,20 @@
     vertical-align: middle;
     text-shadow: none;
     box-shadow: none;
+    color: black;
+}
+.charsheet .rti button[type="roll"],
+.charsheet .rti span,
+.charsheet .rti label,
+.charsheet .rti select,
+.charsheet .rti h1,
+.charsheet .rti h2,
+.charsheet .rti b,
+.charsheet .rti i {
+    -webkit-user-select: none; /* Safari and older Chrome versions */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* Internet Explorer and Edge */
+    user-select: none; /* Standard syntax */
 }
 
 /* Button type Roll */{}
@@ -99,11 +89,8 @@
     background-color: rgb(255 182 0 / 17%);
     border: 1px solid black;
     white-space: nowrap;
-    border-radius: 4px;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+    border-radius: 3px;
+    line-height: 24px;
 }
 .charsheet .rti button[type="roll"]:hover {
     background-color: #DAA520;
@@ -114,39 +101,32 @@
     font-size: 13px;
     font-weight: bold;
     text-align: center;
-    background: none;
-    border: none;
     margin: 0;
+    border: 0;
     cursor: inherit;
 }
 .charsheet .rti button[type="roll"]:hover label,
 .charsheet .rti button[type="roll"]:hover input {
     color: white;
-    border: none;
+}
+.charsheet .rti button[type="roll"] b {
+    margin: 0;
+    line-height: 22px;
 }
 
 /* SPAN tag */{}
 .charsheet .rti span {
     text-align: center;
-    color: black;
     font-size: 13px;
     font-weight: bold;
-    border: none;
 }
 .charsheet .rti span.hpl {
-    -webkit-user-select: all;
-    -ms-user-select: all;
-    user-select: all;
-    -moz-select: all;
+    -webkit-user-select: all; /* Safari and older Chrome versions */
+    -moz-user-select: all; /* Firefox */
+    -ms-user-select: all; /* Internet Explorer and Edge */
+    user-select: all; /* Standard syntax */
     cursor: pointer;
 }
-.charsheet .rti span.info {
-    height: 24px;
-    line-height: 24px;
-    font-size: 20px;
-    font-weight: normal;
-    cursor: help;
-}
 .charsheet .rti span.shipl {
     height: fit-content;
     width: fit-content;
@@ -154,29 +134,51 @@
     font-size: 10px;
 }
 
-/* Header tags H1 H2 H3 */{}
+/* Header tags H1 H2 */{}
 .charsheet .rti h1,
-.charsheet .rti h2,
-.charsheet .rti h3 {
+.charsheet .rti h2 {
     color: black;
     margin-top: 7px;
-    margin-bottom: 2px;
+    margin-bottom: 3px;
     padding: 0;
     font-weight: bold;
     text-transform: uppercase;
     text-align: center;
 }
-.charsheet .rti h3 {
+.charsheet .rti h1 {
     font-size: 18px;
     line-height: 18px;
 }
 .charsheet .rti h2 {
-    font-size: 16px;
-    line-height: 16px;
+    font-size: 15px;
+    line-height: 15px;
 }
-.charsheet .rti h1 {
-    font-size: 14px;
-    line-height: 14px;
+
+/* Tags B and I used for icons */{}
+.charsheet .rti b,
+.charsheet .rti i {
+    width: fit-content;
+    height: 24px;
+    font-style: normal;
+    font-weight: normal;
+    font-family: "pictos";
+    font-size: 18px;
+    text-align: center;
+    line-height: 24px;
+    cursor: help;
+}
+.charsheet .rti b:hover {
+    color: red;
+}
+.charsheet .rti i {
+    cursor: initial;
+    line-height: normal;
+}
+.charsheet .rti button[type="roll"] label.shct {
+    font-size: 22px;
+    font-family: "pictos";
+    margin: 0;
+    line-height: 20px;
 }
 
 /* TEXTAREA Field for descriptions */{}
@@ -184,7 +186,6 @@
     resize: vertical;
     display: inline-block;
     border: 1px solid #aaa;
-    height: 24px;
     width: 100%;
     margin: 0 0 5px 0;
     padding: 2px;
@@ -203,22 +204,6 @@
     text-align: start;
     box-shadow: none;
 }
-.charsheet .rti textarea.rulesbox {
-    width: 49.5%;
-    height: 70px;
-    color: black;
-    white-space: pre-line;
-    cursor: pointer;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    -moz-select: none;
-    overflow: hidden;
-    resize: none;
-}
-.charsheet .rti textarea.rulesbox:focus {  
-    height: 525px;
-}
 
 /* INPUT fields that record player info */{}
 .charsheet .rti input[type="text"],
@@ -229,7 +214,6 @@
     font-size: 14px;
     font-weight: bold;
     line-height: 16px;
-    color: black;
     text-align: center;
     background-color: transparent;
     cursor: auto;
@@ -238,12 +222,10 @@
     text-transform: none;
     text-indent: 0px;
     -webkit-user-select: text;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     border-radius: 3px;
 }
 
-/* INPUT fields type checkbox */{}
+/* INPUT type checkbox */{}
 .charsheet .rti input[type="checkbox"] {
     display: inline-block;
     height: 13px;
@@ -256,6 +238,9 @@
 }
 
 /* Improved Fancy checkbox Baleine version */{}
+.charsheet .rti label.fancyButton {
+    line-height: normal;
+}
 .charsheet .rti label.fancyButton > div {
     height:24px;
     display: inline-block;
@@ -268,7 +253,7 @@
     -moz-border-radius: 3px;
     border-radius: 3px;
     margin-bottom: 3px;
-    line-height: 24px;
+    line-height: normal;
     cursor: pointer;
     background-color: rgb(255 182 0 / 17%);
 }
@@ -277,11 +262,22 @@
     border: 1px solid rgb(218, 165, 32, 1.0);
     background-color: rgb(218, 165, 32, 1.0);
 }
+.charsheet .rti label.fancyButton input:checked ~ div,
+.charsheet .rti label.fancyButton input:checked ~ span {
+    background-color: rgba(255, 0, 0, 0.6);
+    color: white;
+}
 .charsheet .rti label.fancyButton > input {
     display: none;
 }
-.charsheet .rti label.fancyButton input:checked ~ div {
-    background-color: red;
+.charsheet .rti .fancyButton b,
+.charsheet .rti .fancyButton span {
+    margin: 0;
+}
+.charsheet .rti .fancyButton b {
+    line-height: 22px;
+}
+.charsheet .rti .fancyButton span:hover {
     color: white;
 }
 
@@ -297,11 +293,16 @@
     font-size: 20px;
     font-weight: bold;
 }
-.charsheet .rti input.hidden {
-    display: none;
+.charsheet .rti label.shipweapon > div {
+    font-size: 9px;
+    height: 18px;
+    line-height: 18px;
+    font-weight: bold;
 }
-
-/* Checkbox Arrow icon that toggles visibility may be combined with arrow class later */{}
+.charsheet .rti label.shipweapon {
+    height: 18px;
+}
+/* Checkbox Arrow icon that toggles visibility */{}
 .charsheet .rti input[type="checkbox"].icon {
     appearance: none;
     -webkit-appearance: none;
@@ -336,7 +337,6 @@
     font-size: 14px;
     line-height: 16px;
     font-weight: normal;
-    color: black;
     background-color: transparent;
     cursor: pointer;
     letter-spacing: normal;
@@ -376,7 +376,6 @@
     font-weight: bold;
     line-height: 24px;
     text-align: left;
-    color: black;
 }
 
 /*CSS Grid Cols and Rows architecture*/{}
@@ -430,7 +429,6 @@
 .charsheet .rti .gridbox3rd {
     grid-column: 3 / 4;
 }
-
 /* grid for nav powers */
 .charsheet .rti .gridnav {
     width: 100%;
@@ -438,15 +436,13 @@
     grid-template-columns: 5fr 1fr 32px 32px 32px 32px 32px;
     gap: 0;
 }
-
 /*grid with 9 blocks used in npc, custom skill, trade and advance skills*/
 .charsheet .rti .grid9 {
     width: 100%;
     display: grid;
-    grid-template-columns: 3fr 1fr 30px 30px 30px 30px 30px 30px 30px;
+    grid-template-columns: 4fr 1fr 30px 30px 30px 30px 30px 30px 30px;
     gap: 0;
 }
-
 /* grid with 8 blocks used in skill groups*/
 .charsheet .rti .grid8 {
     width: 100%;
@@ -454,23 +450,13 @@
     grid-template-columns: 1fr 30px 30px 30px 30px 30px 30px 30px;
     gap: 0;
 }
-
 /* grid with 8 blocks used in basic skills*/
 .charsheet .rti .grid8b {
     width: 100%;
     display: grid;
-    grid-template-columns: 3fr 1fr 30px 30px 30px 30px 30px 30px;
+    grid-template-columns: 5fr 1fr 30px 30px 30px 30px 30px 30px;
     gap: 0;
 }
-
-/* grid with 9 blocks used in intimidate skill*/
-.charsheet .rti .gridinputbasic9 {
-    width: 100%;
-    display: grid;
-    grid-template-columns: 9fr 2fr 1fr 30px 30px 30px 30px 30px 30px;
-    gap: 0;
-}
-
 /*element styling to fit the grid*/
 .charsheet .rti .label2 {
     font-size: 9px;
@@ -483,7 +469,8 @@
 }
 .charsheet .rti input[id="subitem"],
 .charsheet .rti select[id="subitem"],
-.charsheet .rti button[id="subitem"] {
+.charsheet .rti button[id="subitem"],
+.charsheet .rti span[id="gridspan"] {
     border-radius: 0;
     border: 1px solid black;
     margin: 0;
@@ -496,31 +483,6 @@
 }
 .charsheet .rti span[id="gridspan"] {
     font-size: 15px;
-    font-weight: normal;
-    margin: 0;
-    border: 1px solid black;
-    cursor: help;
-}
-/*element styling to fit intimidate*/
-.charsheet .rti span[id="gridspansp"] {
-    font-size: 15px;
-    font-weight: normal;
-    margin: 0;
-    border-top: 1px solid black;
-    border-bottom: 1px solid black;
-    border-right: 1px solid black;
-    border-left: none;
-    cursor: help;
-}
-.charsheet .rti select[id="subitem2"] {
-    border-radius: 0;
-    margin: 0;
-    border-top: 1px solid black;
-    border-bottom: 1px solid black;
-    border-right: none;
-    border-left: 1px solid black;
-    color: black;
-    font-size: 15px;
 }
 
 /* Grid for characteristics */
@@ -563,7 +525,7 @@
 .charsheet .rti button input {
     pointer-events: none;
 }
-/* This adds a backgroun color to some input fields */
+/* This adds a background color to some input fields */
 .charsheet .rti input[type="text"].cur,
 .charsheet .rti input[type="number"].cur {
     background-color: white;
@@ -581,7 +543,11 @@
 .charsheet .rti textarea.crewef:focus {
     height: 140px;
 }
-
+/*labels with tooltip*/
+.charsheet .rti label:hover.help {
+    cursor: help;
+    color: red;
+}
 /*Firefox spinner buttons mod*/
 /*by default is not visible*/
 .charsheet .rti input[Type="number"]{
@@ -602,20 +568,7 @@
 .charsheet .rti input[type="number"]:hover::-webkit-outer-spin-button {
     display: inline
 }
-/* small roll button */
-.charsheet .rti span[id="tinyroll"] {
-    font-size: 17px;
-    font-family: "dicefontd20";
-    margin: 0;
-    line-height: 22px;
-}
-/* small chat show button */
-.charsheet .rti button[type="roll"] label.shct {
-    font-size: 22px;
-    font-family: "pictos";
-    margin: 0;
-    line-height: 20px;
-}
+
 /* armour section */
 .charsheet .rti .quickborder {
     border: 1px solid #AAAAAA;
@@ -623,22 +576,20 @@
     margin-bottom: 3px;
 }
 .charsheet .rti .armourblock {
-    text-align: center;
     margin: auto auto 5px auto;
     width: calc(33% - 3px);
     display: inline-block;
 }
 .charsheet .rti .armourblock label {
     text-align: center;
-    text-transform: uppercase;    
+    height: inherit;
+    white-space: pre-wrap;
+    text-transform: uppercase;
 }
-.charsheet .rti .armourblock input {
-    text-align: center;
-    font-size: 14px;
-}
-.charsheet .rti .help {
-    cursor: help;
+.charsheet .rti .armourblock button {
+    height: 48px;
 }
+
 /*used as horizontal spacing for inline-block lines*/
 .charsheet .rti .spacing {
    display: inline-block;
@@ -680,33 +631,20 @@
     display: block;
 }
 
-/*radio input and div used in ship weapons*/
-.charsheet .rti div[id="shipwp1"],
-.charsheet .rti div[id="shipwp2"],
-.charsheet .rti div[id="shipwp3"],
-.charsheet .rti div[id="shipwp4"],
-.charsheet .rti div[id="shipwp5"] {
+/*tab setup for ship actions - replaces radio input*/
+.charsheet .rti .shipmanu,
+.charsheet .rti .shipaction,
+.charsheet .rti .shipnpc,
+.charsheet .rti .shipwp4,
+.charsheet .rti .shipwp5 {
     display: none;
 }
-
-.charsheet .rti input.macro,
-.charsheet .rti input.lance,
-.charsheet .rti input.torpedo,
-.charsheet .rti input.acraft,
-.charsheet .rti input.novac {
-    display: inline-block;
-    width: 4%;
-    margin-bottom: 3px
-}
-
-.charsheet .rti input.macro:checked ~ div[id="shipwp1"],
-.charsheet .rti input.lance:checked ~ div[id="shipwp2"],
-.charsheet .rti input.torpedo:checked ~ div[id="shipwp3"],
-.charsheet .rti input.acraft:checked ~ div[id="shipwp4"],
-.charsheet .rti input.novac:checked ~ div[id="shipwp5"] {
+.charsheet .rti .shiptoggle[value="shipmanu"] ~ div.shipmanu,
+.charsheet .rti .shiptoggle[value="shipaction"] ~ div.shipaction,
+.charsheet .rti .shiptoggle[value="shipnpc"] ~ div.shipnpc,
+.charsheet .rti .shiptoggle[value="shipwp4"] ~ div.shipwp4,
+.charsheet .rti .shiptoggle[value="shipwp5"] ~ div.shipwp5 {
     display: block;
-    padding: 0 3px;
-    margin-bottom: 8px;
 }
 
 /* Modification for Add, Delete, Move and Modify buttons under a fieldset */
@@ -754,9 +692,9 @@
 .repcontainer[data-groupname="repeating_shipweapons"] > .repitem {
     display: inline-block;
     width: 50%;
+    padding: 0 3px;
 }
 
-
 /* ROLL TEMPLATE STYLE CUSTOM based on "better default template"*/
 /* margin reduction to better fit the chat window */
 .sheet-rolltemplate-custom {
diff --git a/Rogue Trader Improved/RogueTraderImproved.html b/Rogue Trader Improved/RogueTraderImproved.html
index 01afb7b968..d608fa445e 100644
--- a/Rogue Trader Improved/RogueTraderImproved.html	
+++ b/Rogue Trader Improved/RogueTraderImproved.html	
@@ -3,15 +3,15 @@
 <div> 
     <!-- Basic Player Character Information -->
     <div>
-		<input name="attr_character_name" type="text" style="width:34%; font-weight:bold" placeholder="Character Name"></input>
+		<input name="attr_character_name" type="text" style="width:34%" data-i18n-placeholder="charname" placeholder="Character Name"></input>
 		<div class="spacing" style="width:2%"></div>
 		<div class="logo" style="width:28%"><img src="https://raw.githubusercontent.com/roguetradermago/Rogue-Trader-improved-assets/main/rt-tsr-logo.png"></div>
 		<div class="spacing" style="width:2%"></div>
-		<input name="attr_player" type="text" style="width:34%; font-weight:bold" placeholder="Player Name"></input>
+		<input name="attr_player" type="text" style="width:34%" data-i18n-placeholder="playername" placeholder="Player Name"></input>
 	</div>
 	<!--Characteristics-->
 	<div>
-        <h3>Characteristics</h3>
+        <h1>Characteristics</h1>
         <div class="CharGrid">
             <label style="text-align:center; line-height:16px; white-space:pre; height:35px">Weapon Skill&#10;(WS)</label>
             <label style="text-align:center; line-height:16px; white-space:pre; height:35px">Ballistic Skill&#10;(BS)</label>
@@ -66,13 +66,11 @@
                 <button name="roll_WS" type="roll" style="height: 60px;"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Weapon Skill**}} {{dosdof=[[(((  ([[(@{WeaponSkill}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                     <input name="attr_WeaponSkill" style="text-align:center; padding:0" type="text" id="CharBtnIn" readonly></input></button>
-                <!--<input name="attr_WSB" title="Weapon Skill Bonus" id="unnatural" type="number" value="0"></input>-->
             </div>
             <div>
                 <button name="roll_BS" type="roll" style="height: 60px;"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Ballistic Skill**}} {{dosdof=[[(((  ([[(@{BallisticSkill}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                     <input name="attr_BallisticSkill" style="text-align:center; padding:0" type="text" id="CharBtnIn" readonly></input></button>
-                <!--<input name="attr_BSB" title="Ballistic Skill Bonus" id="unnatural" type="number" value="0"></input>-->
             </div>
             <div>
                 <button name="roll_S" type="roll" style="height: 60px;"
@@ -202,82 +200,79 @@
         </div>
     </div>
     <!-- Fate, Fatigue and GM Rolls -->
-    <div style="margin: 5px 0 5px 0;">
+    <div style="margin: 5px 0">
+        <label style="width:11%; text-align:center">Fate Points</label>
+        <b style="width:3%" title="Using Fate Points&#10;As a Free Action (or Reaction) the Explorer can Spend FP in several effects:&#10;*Re-roll a failed test once. The results of the re-roll are final.&#10;*Gain a +10 bonus to a test. This must be chosen before dice are rolled.&#10;*Add an extra degree of success to a test. This can be done after dice are rolled.&#10;(test must be successful for this effect to apply.)&#10;*Count as having rolled a 10 for Initiative Roll.&#10;*Instantly remove 1d5 Damage (this does not remove Critical Damage).&#10;*Instantly recover from being Stunned.&#10;&#10;Spent FPs are restored by the end of the gaming season, at GMs discretion.&#10;&#10;Burning Fate Points&#10;The explorer may permanently reduce his Fate Point Pool by 1.&#10;This allows the character to survive whatever it was&#10;that would have killed him, but only barely.&#10;&#10;A Fate Point may be burnt even if it has been spent for that gaming session.">?</b>
+        <input style="width:4%" name="attr_fate_max" type="number"></input>
+        <i style="width:2%">&#10095;</i>
+        <input style="width:4%" class="cur" name="attr_fate" type="number"></input>
+        <div class="spacing" style="width:10%"></div>
+        <button name="roll_simpledice" type="roll" style="width:4%" value="@{gmroll}&{template:custom} {{name=Rolling 1d5}} {{d1=[[1d5]]}}"><label>1d5</label></button>
         <div class="spacing" style="width:1%"></div>
-        <span style="width:4%">Pool</span>
-        <input style="width:4%" name="attr_fate_max" type="number" value="0"></input>
-        <label style="width:15%; text-align:center" class="help" 
-        title="--Using Fate Points--&#10;As a Free Action (or Reaction) the Explorer can Spend FP in several effects:&#10;&#10;*Re-roll a failed test once. The results of the re-roll are final.&#10;*Gain a +10 bonus to a test. This must be chosen before dice are rolled.&#10;*Add an extra degree of success to a test. This can be done after dice are rolled.&#10;(test must be successful for this effect to apply.)&#10;*Count as having rolled a 10 for Initiative Roll.&#10;*Instantly remove 1d5 Damage (this does not remove Critical Damage).&#10;*Instantly recover from being Stunned.&#10;&#10;Tipically Spent FPs are restored by the end of the gaming season, at GMs discretion.&#10;&#10;--Burning Fate Points--&#10;The explorer may choose to burn a FP and permanently reduce&#10;his Fate Points pool by one. The result is that the character survives&#10;whatever it was that would have killed him, but only barely.&#10;&#10;A Fate Point may be burnt even if it has already been spent for that gaming session."
-        >&#9204; Fate Points &#128172; &#9205;</label>
-        <input style="width:4%" name="attr_fate" type="number" value="0"></input>
-        <span style="width:6%">Current</span>
-        <div class="spacing" style="width:3%"></div>
-        <button name="roll_simpledice" type="roll" style="width:3%" value="@{gmroll}&{template:custom} {{name=Simple Dice Roll}} {{d1= ?{Roll|1d5,[[1d5]]|1d10,[[1d10]]|1d100,[[1d100]]} }}"><span id="tinyroll" title="Roll simple Dice">0</span></button>
-        <div class="spacing" style="width:1%"></div>
-        <label class="fancyButton" style="width:10%" title="Sets all macro rolls to be visible only to the GM.">
-            <input type="checkbox" name="attr_gmroll" value="/w gm" hidden="true" />
-            <div>GM Roll &#128172;</div>
+        <label class="fancyButton" style="width:12%">
+            <input type="checkbox" name="attr_gmroll" value="/w gm" hidden="true"/>
+            <div style="font-size:0px"><span style="width:80%;" data-i18n="gmroll">GM Roll</span>
+            <b style="width:20%;" title="Sets all macro rolls to be visible only to the GM.">?</b></div>
         </label>
         <div class="spacing" style="width:1%"></div>
         <!--w16-->
-        <button name="roll_RighteousFury" type="roll" style="width:15%" 
+        <button name="roll_RighteousFury" type="roll" style="width:14%" 
             value="@{gmroll}&{template:custom} {{testtarget=[[?{Threshold|0}]] }} {{d100=[[1d100cs1cf100]] }} {{fury=@{character_name}&#10; }} {{xd10= ?{Target is?|On Foot,**Dealing [[1d10!]] Bonus Damage!**|Vehicle,**Dealing a Critical Hit! [[1d5]]**} }}">
             <label>Righteous Fury!</label></button>
         <!--w15-->
         <div class="spacing" style="width:3%"></div>
-        <span style="width:5%; cursor:help" title="Toughness Bonus">Limit:</span>
-        <span name="attr_TB" style="width:1%; cursor:help" title="Toughness Bonus"></span>
-        <span style="width:2%">&#9204;</span>
-        <label class="fancyButton" style="width:10%"
-            title="Any level of Fatigue adds a -10 Penalty to all Tests.&#10;&#10;Click here to apply this Penalty&#10;This will be seen in the Characteristic Scores above&#10;Uncheck to remove Penalty.&#10;&#10;Fatigue Limit equals Toughness Bonus.&#10;If the Character excedes its Fatigue Limit&#10;it falls Unconcious for 10 min -TB.">
-            <input type="checkbox" name="attr_fatiguepenalty" value="10" hidden="true" />
-            <div>Fatigue &#128172;</div>
+        <span style="width:5%">Limit:</span>
+        <span name="attr_TB" style="width:3%"></span>
+        <label class="fancyButton" style="width:12%">
+            <input type="checkbox" name="attr_fatiguepenalty" value="10" hidden="true"/>
+            <div style="font-size:0px"><span style="width:80%" data-i18n="fatigue">Fatigue</span>
+            <b style="width:20%" title="Any level of Fatigue adds a -10 Penalty to all Tests.&#10;&#10;Click here to apply this Penalty&#10;This will be seen in the Characteristic Scores above&#10;Uncheck to remove Penalty.&#10;&#10;Fatigue Limit equals Toughness Bonus.&#10;If the Character excedes its Fatigue Limit&#10;it falls Unconcious for 10 min -TB.">?</b>
+            </div>
         </label>
-        <span style="width:2%">&#9205;</span>
-        <input style="width:4%" name="attr_fatiguecurrent" type="number" value="0"></input>
-        <span style="width:6%">Level</span>
         <div class="spacing" style="width:1%"></div>
+        <input style="width:4%" name="attr_fatiguecurrent" type="number"/>
+        <span style="width:6%">Level</span>
     </div>
 </div>
 <!-- Tabs %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <input type="hidden" class="tabstoggle" name="attr_sheetTab" value="skill"/>
 <div>
-    <label class="fancyButton titleButton" title="Basic, Advanced and Custom Skills">
-        <input type="checkbox" name="attr_sheetTab" value="skill" hidden="true" />
+    <label class="fancyButton titleButton">
+        <input type="checkbox" name="attr_sheetTab" value="skill" hidden="true" checked="true"/>
         <div>Skills</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" title="Armour, Weapons, Initiative and more">
+    <label class="fancyButton titleButton">
         <input type="checkbox" name="attr_sheetTab" value="combat" hidden="true" />
         <div>Combat</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" title="Talents, Traits and more">
+    <label class="fancyButton titleButton">
         <input type="checkbox" name="attr_sheetTab" value="talent" hidden="true" />
         <div>Talents</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" title="Psychic Techniques and Navigator Powers">
+    <label class="fancyButton titleButton">
         <input type="checkbox" name="attr_sheetTab" value="psykana" hidden="true" />
         <div>Psykana</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" title="Origin Path, Advances and more">
+    <label class="fancyButton titleButton">
         <input type="checkbox" name="attr_sheetTab" value="journal" hidden="true" />
         <div>Journal</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" title="Ship Sheet and Naval Combat">
+    <label class="fancyButton titleButton">
         <input type="checkbox" name="attr_sheetTab" value="ship" hidden="true" />
         <div>Ship</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" title="NPCs and Companions mini sheet">
+    <label class="fancyButton titleButton">
         <input type="checkbox" name="attr_sheetTab" value="npcs" hidden="true" />
         <div>NPCs</div>
     </label>
     <div class="spacing" style="width:1%"></div>
-    <label class="fancyButton titleButton" style="width:9%" title="Extras">
+    <label class="fancyButton titleButton" style="width:9%">
         <input type="checkbox" name="attr_sheetTab" value="config" hidden="true" />
         <div style="font-size:14px">Extras</div>
     </label>
@@ -286,12 +281,11 @@
 <div class="skill">
     <!--Basic & Advanced skills-->
     <div class="grid2">
-        <!--Basic Skills-->
         <div class="leftbox">
-            <h2>&#128922; Basic Skills &#128922;</h2>
+            <h2>Basic Skills</h2>
                 <div class="grid8b">
                     <label class="label1">Roll Test</label>
-                    <label class="label1">Info</label>
+                    <label class="label1"></label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
                     <label class="label2">+20</label>
@@ -300,8 +294,11 @@
                     <label class="label2">Total</label>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Awareness" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Awareness**}} {{dosdof=[[(((  ([[(@{Awareness}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Awareness</label></button>
-                    <span id="gridspan" title="Awareness encompasses the Explorer’s subconscious ability to&#10;react to things his conscious mind may not perceive. He can use this Skill&#10;to notice threats, such as ambushes, traps, or cleverly&#10;hidden objects—or slight changes in the environment,&#10;such as a faint vibration in the deck plating or the smell of the air recyclers.&#10;&#10;When using Awareness against an opponent, the test is always Opposed.&#10;This use includes noticing ambushes, spotting traps,&#10;and other things involving another’s actions.&#10;&#10;-Skill Use: Free Action made in reaction to something.&#10;-Category: Exploration.">(Per) &#128712;</span>
+                    <button name="roll_Awareness" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Awareness**}} {{dosdof=[[(((  ([[(@{Awareness}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Awareness</label>
+                        <b style="width:10%" title="Awareness encompasses the Explorer’s subconscious ability to&#10;react to things his conscious mind may not perceive. He can use this Skill&#10;to notice threats, such as ambushes, traps, or cleverly&#10;hidden objects—or slight changes in the environment,&#10;such as a faint vibration in the deck plating or the smell of the air recyclers.&#10;&#10;When using Awareness against an opponent, the test is always Opposed.&#10;This use includes noticing ambushes, spotting traps,&#10;and other things involving another’s actions.&#10;&#10;-Skill Use: Free Action made in reaction to something.&#10;-Category: Exploration.">?</b>
+                    </button>
+                    <span id="gridspan">Per</span>
                     <div id="cbitem"><input name="attr_Awareness1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Awareness2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Awareness3" type="checkbox" value="10"/></div>
@@ -310,8 +307,11 @@
                     <input id="subitem" name="attr_Awareness" type="text" disabled value="(floor((0.5+@{Awareness1})*@{Perception})+@{Awareness2}+@{Awareness3}+@{TalentBonus1}+@{OtherBonus1})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Barter" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Barter**}} {{dosdof=[[(((  ([[(@{Barter}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Barter</label></button>
-                    <span id="gridspan" title="The Barter skill allows the Explorer to negotiate better&#10;prices or exchange for goods and services.&#10;This can modify the Acquisition Modifier for items where the price is not set,&#10;but rather the result of negotiation.&#10;&#10;All Barter Tests are Opposed, as they involve interaction by their very nature.&#10;Barter may sometimes be used to assist with Acquisition Tests (see page 271).&#10;&#10;-Skill Use: A typical Barter Test takes about five minutes,&#10;but delicate dealings and intricate negotiations may involve Extended Tests.&#10;-Category: Interaction.">(Fel) &#128712;</span>
+                    <button name="roll_Barter" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Barter**}} {{dosdof=[[(((  ([[(@{Barter}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Barter</label>
+                        <b style="width:10%" title="The Barter skill allows the Explorer to negotiate better&#10;prices or exchange for goods and services.&#10;This can modify the Acquisition Modifier for items where the price is not set,&#10;but rather the result of negotiation.&#10;&#10;All Barter Tests are Opposed, as they involve interaction by their very nature.&#10;Barter may sometimes be used to assist with Acquisition Tests (see page 271).&#10;&#10;-Skill Use: A typical Barter Test takes about five minutes,&#10;but delicate dealings and intricate negotiations may involve Extended Tests.&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Barter1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Barter2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Barter3" type="checkbox" value="10"/></div>
@@ -320,8 +320,11 @@
                     <input id="subitem" name="attr_Barter" type="text" disabled value="(floor((0.5+@{Barter1})*@{Fellowship})+@{Barter2}+@{Barter3}+@{TalentBonus2}+@{OtherBonus2})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Carouse" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Carouse**}} {{dosdof=[[(((  ([[(@{Carouse}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Carouse</label></button>
-                    <span id="gridspan" title="The Carouse Skill is used to resist the effects of alcohol and narcotics.&#10;The Explorer makes a Skill Test whenever he suffers the effects&#10;of alcohol or similar intoxicants.&#10;&#10;Each time he would otherwise suffer from the effects of an&#10;intoxicant, make a Carouse Test. Failure indicates he has gained&#10;a level of Fatigue or suffers the side effects of the substance.&#10;Should he lose conscious, the Explorer will remain passed out for&#10;a number of hours equal to 1d10 minus his Toughness Bonus (minimum 1 hour).&#10;&#10;-Skill Use: Free Action taken whenever the Explorer imbibes.">(T) &#128712;</span>
+                    <button name="roll_Carouse" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Carouse**}} {{dosdof=[[(((  ([[(@{Carouse}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Carouse</label>
+                        <b style="width:10%" title="The Carouse Skill is used to resist the effects of alcohol and narcotics.&#10;The Explorer makes a Skill Test whenever he suffers the effects&#10;of alcohol or similar intoxicants.&#10;&#10;Each time he would otherwise suffer from the effects of an&#10;intoxicant, make a Carouse Test. Failure indicates he has gained&#10;a level of Fatigue or suffers the side effects of the substance.&#10;Should he lose conscious, the Explorer will remain passed out for&#10;a number of hours equal to 1d10 minus his Toughness Bonus (minimum 1 hour).&#10;&#10;-Skill Use: Free Action taken whenever the Explorer imbibes.">?</b>
+                    </button>
+                    <span id="gridspan">T</span>
                     <div id="cbitem"><input name="attr_Carouse1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Carouse2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Carouse3" type="checkbox" value="10"/></div>
@@ -330,8 +333,11 @@
                     <input id="subitem" name="attr_Carouse" type="text" disabled value="(floor((0.5+@{Carouse1})*@{Toughness})+@{Carouse2}+@{Carouse3}+@{TalentBonus3}+@{OtherBonus3})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Charm" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Charm**}} {{dosdof=[[(((  ([[(@{Charm}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Charm</label></button>
-                    <span id="gridspan" title="The Explorer can use the Charm Skill to improve the disposition&#10;of others towards him, making a Charm Test whenever he&#10;wishes to change the minds of an individual or small group.&#10;He need not make a Charm Test each time he speaks with others&#10;in a pleasant manner, but only when he wishes to change their&#10;opinion, disposition, or convince them to do something.&#10;&#10;All Charm Tests are Opposed by Willpower and can affect&#10;a number of targets equal to the Explorer’s Fellowship Bonus.&#10;His targets must be able to see and hear clearly,&#10;and share a common language.&#10;&#10;-Skill Use: 1 minute.&#10;&#10;-Special Use: Inspire&#10;Those in positions of authority can use Charm to inspire a group.&#10;Success provides a +10 bonus to the next Skill Test of the motivated group.&#10;Characters can also use this skill as an Extended Test for&#10;purposes on improving morale on board their vessel. (Page 226).&#10;&#10;-Category: Interaction.">(Fel) &#128712;</span>
+                    <button name="roll_Charm" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Charm**}} {{dosdof=[[(((  ([[(@{Charm}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Charm</label>
+                        <b style="width:10%" title="The Explorer can use the Charm Skill to improve the disposition&#10;of others towards him, making a Charm Test whenever he&#10;wishes to change the minds of an individual or small group.&#10;He need not make a Charm Test each time he speaks with others&#10;in a pleasant manner, but only when he wishes to change their&#10;opinion, disposition, or convince them to do something.&#10;&#10;All Charm Tests are Opposed by Willpower and can affect&#10;a number of targets equal to the Explorer’s Fellowship Bonus.&#10;His targets must be able to see and hear clearly,&#10;and share a common language.&#10;&#10;-Skill Use: 1 minute.&#10;&#10;-Special Use: Inspire&#10;Those in positions of authority can use Charm to inspire a group.&#10;Success provides a +10 bonus to the next Skill Test of the motivated group.&#10;Characters can also use this skill as an Extended Test for&#10;purposes on improving morale on board their vessel.&#10;&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Charm1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Charm2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Charm3" type="checkbox" value="10"/></div>
@@ -340,8 +346,11 @@
                     <input id="subitem" name="attr_Charm" type="text" disabled value="(floor((0.5+@{Charm1})*@{Fellowship})+@{Charm2}+@{Charm3}+@{TalentBonus4}+@{OtherBonus4})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Climb" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Climb**}} {{dosdof=[[(((  ([[(@{Climb}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Climb</label></button>
-                    <span id="gridspan" title="With the Climb skill the Explorer can ascend or descend ropes,&#10;pipes, and both natural and man-made walls.&#10;The condition of the surface or item and the environmental&#10;conditions can impose additional bonuses or penalties.&#10;A successful Test allows the character to ascend or descend&#10;at one-half his half move rate.&#10;&#10;-Skill Use: Half Action.&#10;-Category: Movement.">(S) &#128712;</span>
+                    <button name="roll_Climb" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Climb**}} {{dosdof=[[(((  ([[(@{Climb}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Climb</label>
+                        <b style="width:10%" title="With the Climb skill the Explorer can ascend or descend ropes,&#10;pipes, and both natural and man-made walls.&#10;The condition of the surface or item and the environmental&#10;conditions can impose additional bonuses or penalties.&#10;A successful Test allows the character to ascend or descend&#10;at one-half his half move rate.&#10;&#10;-Skill Use: Half Action.&#10;-Category: Movement.">?</b>
+                    </button>
+                    <span id="gridspan">S</span>
                     <div id="cbitem"><input name="attr_Climb1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Climb2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Climb3" type="checkbox" value="10"/></div>
@@ -350,8 +359,11 @@
                     <input id="subitem" name="attr_Climb" type="text" disabled value="(floor((0.5+@{Climb1})*@{Strength})+@{Climb2}+@{Climb3}+@{TalentBonus5}+@{OtherBonus5})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Command" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Command**}} {{dosdof=[[(((  ([[(@{Command}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Command</label></button>
-                    <span id="gridspan" title="The Explorer utilizes the Command skill to both direct those under&#10;his authority and establish actions for groups to execute on command.&#10;This skill is only effective upon those under the Explorer’s authority.&#10;&#10;A successful Command Test indicates that those whom he directs&#10;follow his instructions in a timely manner. Failure on the Skill&#10;Test when used on an individual, means that he ignores the orders.&#10;Additional Degrees of Failure indicate that the individual reject&#10;or intentionally contradicts the given commands.&#10;&#10;For directing groups, Degrees of Success or Failure will increase&#10;or decrease the time necessary to execute the orders, with 3 or more&#10;Degrees of Failure subjecting them to confused inaction.&#10;&#10;A Command Test can affect a number of targets equal to the&#10;Explorer’s Fellowship Bonus. They must be able to see and hear him,&#10;though this could be done remotely, and use speak a common language.&#10;&#10;-Skill Use: Half Action for simple commands, Full Action for more involved direction.&#10;-Category: Interaction.">(Fel) &#128712;</span>
+                    <button name="roll_Command" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Command**}} {{dosdof=[[(((  ([[(@{Command}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Command</label>
+                        <b style="width:10%"  title="The Explorer utilizes the Command skill to both direct those under&#10;his authority and establish actions for groups to execute on command.&#10;This skill is only effective upon those under the Explorer’s authority.&#10;&#10;A successful Command Test indicates that those whom he directs&#10;follow his instructions in a timely manner. Failure on the Skill&#10;Test when used on an individual, means that he ignores the orders.&#10;Additional Degrees of Failure indicate that the individual reject&#10;or intentionally contradicts the given commands.&#10;&#10;For directing groups, Degrees of Success or Failure will increase&#10;or decrease the time necessary to execute the orders, with 3 or more&#10;Degrees of Failure subjecting them to confused inaction.&#10;&#10;A Command Test can affect a number of targets equal to the&#10;Explorer’s Fellowship Bonus. They must be able to see and hear him,&#10;though this could be done remotely.&#10;&#10;-Skill Use: Half Action for simple commands, Full Action for more involved direction.&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Command1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Command2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Command3" type="checkbox" value="10"/></div>
@@ -360,8 +372,11 @@
                     <input id="subitem" name="attr_Command" type="text" disabled value="(floor((0.5+@{Command1})*@{Fellowship})+@{Command2}+@{Command3}+@{TalentBonus6}+@{OtherBonus6})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Concealment" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Concealment**}} {{dosdof=[[(((  ([[(@{Concealment}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Concealment</label></button>
-                    <span id="gridspan" title="The Concealment Skill is used to hide things, from small&#10;objects to vehicles to starships, or objects on the character’s person.&#10;Use of the Skill requires an appropriate environment&#10;to mask the item in question: buildings and trees for a small&#10;shuttle or an asteroid field and space anomaly for a starship.&#10;&#10;Concealment is always an Opposed Test, pitting the Explorer’s&#10;Concealment against his opponent’s Awareness or Scrutiny.&#10;If the character or the object being hidden remains&#10;perfectly still, he gains a +10 bonus to the Skill Test.&#10;&#10;-Skill Use: Half Action.">(Ag) &#128712;</span>
+                    <button name="roll_Concealment" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Concealment**}} {{dosdof=[[(((  ([[(@{Concealment}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Concealment</label>
+                        <b style="width:10%"  title="The Concealment Skill is used to hide things, from small&#10;objects to vehicles to starships, or objects on the character’s person.&#10;Use of the Skill requires an appropriate environment&#10;to mask the item in question: buildings and trees for a small&#10;shuttle or an asteroid field and space anomaly for a starship.&#10;&#10;Concealment is always an Opposed Test, pitting the Explorer’s&#10;Concealment against his opponent’s Awareness or Scrutiny.&#10;If the character or the object being hidden remains&#10;perfectly still, he gains a +10 bonus to the Skill Test.&#10;&#10;-Skill Use: Half Action.">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_Concealment1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Concealment2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Concealment3" type="checkbox" value="10"/></div>
@@ -370,8 +385,11 @@
                     <input id="subitem" name="attr_Concealment" type="text" disabled value="(floor((0.5+@{Concealment1})*@{Agility})+@{Concealment2}+@{Concealment3}+@{TalentBonus7}+@{OtherBonus7})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Contortionist" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Contortionist**}} {{dosdof=[[(((  ([[(@{Contortionist}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Contortionist</label></button>
-                    <span id="gridspan" title="Explorers with Contortionist Skill can use their innate flexibility to allow them to:&#10;&#10;-Escape Bonds:&#10;The Explorer can Test to slip free of bonds. This is an Opposed Test,&#10;against his opponent’s Intelligence Characteristic. The quality of the bonds and time&#10;to employ them will affect the difficulty of the Test. This requires 1 min.&#10;with each Degree of Success reducing this time by 10 sec.&#10;&#10;-Escape Grapple:&#10;The Explorer may escape a grapple by making an Opposed Test against&#10;the grappler’s Strength Characteristic.&#10;Success frees the Explorer. Failure means he remains grappled.&#10;&#10;-Squeeze Through:&#10;The Explorer can Test to squeeze through a tight space or to cram himself into&#10;a space too small to fit a human body. 4 or more Degrees of Failure mean&#10;he has become stuck until he succeeds in another Contortionist Test or&#10;someone else pulls him free. This takes one minute, with each&#10;Degree of Success reducing this time by 10 sec.&#10;&#10;-Skill Use: Full Action unless otherwise noted.&#10;-Category: Movement, Combat.">(Ag) &#128712;</span>
+                    <button name="roll_Contortionist" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Contortionist**}} {{dosdof=[[(((  ([[(@{Contortionist}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Contortionist</label>
+                        <b style="width:10%"  title="Explorers with Contortionist Skill can use their innate flexibility to allow them to:&#10;&#10;-Escape Bonds:&#10;The Explorer can Test to slip free of bonds. This is an Opposed Test,&#10;against his opponent’s Intelligence Characteristic. The quality of the bonds and time&#10;to employ them will affect the difficulty of the Test. This requires 1 min.&#10;with each Degree of Success reducing this time by 10 sec.&#10;&#10;-Escape Grapple:&#10;The Explorer may escape a grapple by making an Opposed Test against&#10;the grappler’s Strength Characteristic.&#10;Success frees the Explorer. Failure means he remains grappled.&#10;&#10;-Squeeze Through:&#10;The Explorer can Test to squeeze through a tight space or to cram himself into&#10;a space too small to fit a human body. 4 or more Degrees of Failure mean&#10;he has become stuck until he succeeds in another Contortionist Test or&#10;someone else pulls him free. This takes one minute, with each&#10;Degree of Success reducing this time by 10 sec.&#10;&#10;-Skill Use: Full Action unless otherwise noted.&#10;-Category: Movement, Combat.">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_Contortionist1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Contortionist2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Contortionist3" type="checkbox" value="10"/></div>
@@ -380,8 +398,11 @@
                     <input id="subitem" name="attr_Contortionist" type="text" disabled value="(floor((0.5+@{Contortionist1})*@{Agility})+@{Contortionist2}+@{Contortionist3}+@{TalentBonus8}+@{OtherBonus8})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Deceive" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Deceive**}} {{dosdof=[[(((  ([[(@{Deceive}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Deceive</label></button>
-                    <span id="gridspan" title="The Deceive skill enables the Explorer to mislead others as&#10;to his true intent. Any time he tells a lie, reveal only part&#10;of the truth or spin information to his advantage with the&#10;intent to mislead someone, the character must make a Deceive Test.&#10;He need not make a Deceive Test for every lie, but only&#10;when that deception would change someone’s mind, opinion,&#10;or actions. Deceive is always an Opposed Test, using your&#10;Deceive Skill against the opponent’s Scrutiny.&#10;&#10;A Deceive Test affects a number of targets equal to the&#10;Explorer’s Fellowship Bonus.&#10;They must also speak a common language.&#10;&#10;-Skill Use: 1 minute, or more for complex deceptions.&#10;&#10;-Special Use: Con&#10;The ship’s master or officers can use deception to temporarily&#10;increase the crew’s morale during combat.&#10;Outside of combat, the Explorer can use this skill to reduce&#10;the effect of long warp passages on the crew’s morale. Each&#10;failure imposes a cumulative –10 penalty upon subsequent attempts.&#10;&#10;-Category: Interaction.">(Fel) &#128712;</span>
+                    <button name="roll_Deceive" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Deceive**}} {{dosdof=[[(((  ([[(@{Deceive}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Deceive</label>
+                        <b style="width:10%"  title="The Deceive skill enables the Explorer to mislead others as&#10;to his true intent. Any time he tells a lie, reveal only part&#10;of the truth or spin information to his advantage with the&#10;intent to mislead someone, the character must make a Deceive Test.&#10;He need not make a Deceive Test for every lie, but only&#10;when that deception would change someone’s mind, opinion,&#10;or actions. Deceive is always an Opposed Test, using your&#10;Deceive Skill against the opponent’s Scrutiny.&#10;&#10;A Deceive Test affects a number of targets equal to the&#10;Explorer’s Fellowship Bonus.&#10;They must also speak a common language.&#10;&#10;-Skill Use: 1 minute, or more for complex deceptions.&#10;&#10;-Special Use: Con&#10;The ship’s master or officers can use deception to temporarily&#10;increase the crew’s morale during combat.&#10;Outside of combat, the Explorer can use this skill to reduce&#10;the effect of long warp passages on the crew’s morale. Each&#10;failure imposes a cumulative –10 penalty upon subsequent attempts.&#10;&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Deceive1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Deceive2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Deceive3" type="checkbox" value="10"/></div>
@@ -390,8 +411,11 @@
                     <input id="subitem" name="attr_Deceive" type="text" disabled value="(floor((0.5+@{Deceive1})*@{Fellowship})+@{Deceive2}+@{Deceive3}+@{TalentBonus9}+@{OtherBonus9})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Disguise" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Disguise**}} {{dosdof=[[(((  ([[(@{Disguise}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Disguise</label></button>
-                    <span id="gridspan" title="The Disguise skill allows the Explorer to mask his features and even&#10;assume another’s appearance. The difficulty of the test depends upon&#10;the materials available, the differences between the character and&#10;the desired appearance, and any other elements that would&#10;affect the deception. Disguise is an Opposed Skill Test against&#10;a foe’s Scrutiny. The application of the most elementary of&#10;disguises takes one minute. The more elaborate the deception,&#10;the more time required, up to weeks or months in the case&#10;of impersonations involving prosthetics, surgery, or xeno mannerisms.&#10;&#10;-Skill Use: 1 minute or more depending on complexity.">(Fel) &#128712;</span>
+                    <button name="roll_Disguise" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Disguise**}} {{dosdof=[[(((  ([[(@{Disguise}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Deceive</label>
+                        <b style="width:10%"  title="The Disguise skill allows the Explorer to mask his features and even&#10;assume another’s appearance. The difficulty of the test depends upon&#10;the materials available, the differences between the character and&#10;the desired appearance, and any other elements that would&#10;affect the deception. Disguise is an Opposed Skill Test against&#10;a foe’s Scrutiny. The application of the most elementary of&#10;disguises takes one minute. The more elaborate the deception,&#10;the more time required, up to weeks or months in the case&#10;of impersonations involving prosthetics, surgery, or xeno mannerisms.&#10;&#10;-Skill Use: 1 minute or more depending on complexity.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Disguise1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Disguise2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Disguise3" type="checkbox" value="10"/></div>
@@ -400,8 +424,11 @@
                     <input id="subitem" name="attr_Disguise" type="text" disabled value="(floor((0.5+@{Disguise1})*@{Fellowship})+@{Disguise2}+@{Disguise3}+@{TalentBonus10}+@{OtherBonus10})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Dodge" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Dodge**}} {{dosdof=[[(((  ([[(@{Dodge}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Dodge</label></button>
-                    <span id="gridspan" title="Use the Dodge skill as a Reaction to nullify a successful hand-to-hand or ranged attack.&#10;&#10;After a character is hit, but before Damage is rolled,&#10;the character can make a Dodge Test. A character must be aware of the attack in order&#10;to make the test. If succeessful, the character dogges at the last moment and&#10;the attack is considered to have missed (No Damage).&#10;If he fails, the attack connects and deals Damage normally.&#10;Dodge can be used to avoid both melee and ranged attacks.&#10;&#10;When Dodging an area effect weapon (such as flamers), a successful Dodge&#10;moves the character to the edge of the area of effect,&#10;as long as it is no further away than the character’s Agility Bonus in metres.&#10;If the character would need to move further than this to avoid the attack then&#10;the Dodge Test automatically fails.&#10;&#10;When Dodging Fully-Auto or Semi-Auto Bursts, each degree of success on the&#10;Dodge Test negates one additional hit.&#10;&#10;-Skill Use: Reaction.&#10;-Category: Combat, Movement, Reaction.">(Ag) &#128712;</span>
+                    <button name="roll_Dodge" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Dodge**}} {{dosdof=[[(((  ([[(@{Dodge}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Dodge</label>
+                        <b style="width:10%" title="Use the Dodge skill as a Reaction to nullify a successful hand-to-hand or ranged attack.&#10;&#10;After a character is hit, but before Damage is rolled,&#10;the character can make a Dodge Test. A character must be aware of the attack in order&#10;to make the test. If succeessful, the character dogges at the last moment and&#10;the attack is considered to have missed (No Damage).&#10;If he fails, the attack connects and deals Damage normally.&#10;Dodge can be used to avoid both melee and ranged attacks.&#10;&#10;When Dodging an area effect weapon (such as flamers), a successful Dodge&#10;moves the character to the edge of the area of effect,&#10;as long as it is no further away than the character’s Agility Bonus in metres.&#10;If the character would need to move further than this to avoid the attack then&#10;the Dodge Test automatically fails.&#10;&#10;When Dodging Fully-Auto or Semi-Auto Bursts, each degree of success on the&#10;Dodge Test negates one additional hit.&#10;&#10;-Skill Use: Reaction.&#10;-Category: Combat, Movement, Reaction.">?</b>
+                    </button>
+                    <span id="gridspan" >Ag</span>
                     <div id="cbitem"><input name="attr_Dodge1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Dodge2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Dodge3" type="checkbox" value="10"/></div>
@@ -410,8 +437,11 @@
                     <input id="subitem" name="attr_Dodge" type="text" disabled value="(floor((0.5+@{Dodge1})*@{Agility})+@{Dodge2}+@{Dodge3}+@{TalentBonus11}+@{OtherBonus11})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Evaluate" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Evaluate**}} {{dosdof=[[(((  ([[(@{Evaluate}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Evaluate</label></button>
-                    <span id="gridspan" title="The Explorer can use Evaluate to determine the approximate&#10;value of an object or group of items.&#10;Success reveals the item’s Availability Modifier.&#10;Additional Degrees of Success will give additional information&#10;about the objects. A failure results in the miscalculation&#10;of an item’s true value, with the degree&#10;of error increasing with each Degree of Failure.&#10;&#10;The difficulty of the Test should be adjusted for the&#10;Explorer’s access to the item and the time allowed by the seller.&#10;Using Evaluate on large cargoes requires an Extended Test,&#10;though the Explorer can appraise single items in about&#10;a minute. Also, Evaluate can be used at the GM’s&#10;discretion to assist with determining the requirements for Endeavours.&#10;&#10;-Skill Use: 1 minute or more.&#10;-Category: Investigation.">(Int) &#128712;</span>
+                    <button name="roll_Evaluate" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Evaluate**}} {{dosdof=[[(((  ([[(@{Evaluate}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Evaluate</label>
+                        <b style="width:10%" title="The Explorer can use Evaluate to determine the approximate&#10;value of an object or group of items.&#10;Success reveals the item’s Availability Modifier.&#10;Additional Degrees of Success will give additional information&#10;about the objects. A failure results in the miscalculation&#10;of an item’s true value, with the degree&#10;of error increasing with each Degree of Failure.&#10;&#10;The difficulty of the Test should be adjusted for the&#10;Explorer’s access to the item and the time allowed by the seller.&#10;Using Evaluate on large cargoes requires an Extended Test,&#10;though the Explorer can appraise single items in about&#10;a minute. Also, Evaluate can be used at the GM’s&#10;discretion to assist with determining the requirements for Endeavours.&#10;&#10;-Skill Use: 1 minute or more.&#10;-Category: Investigation.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Evaluate1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Evaluate2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Evaluate3" type="checkbox" value="10"/></div>
@@ -420,8 +450,11 @@
                     <input id="subitem" name="attr_Evaluate" type="text" disabled value="(floor((0.5+@{Evaluate1})*@{Intelligence})+@{Evaluate2}+@{Evaluate3}+@{TalentBonus12}+@{OtherBonus12})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Gamble" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Gamble**}} {{dosdof=[[(((  ([[(@{Gamble}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Gamble</label></button>
-                    <span id="gridspan" title="The Explorer uses Gamble when participating in games of chance.&#10;Each participant wagers an amount, though these are&#10;typically the same, and makes an Opposed Test with the&#10;Gamble Skill. The player with the most Degrees of Success&#10;or fewest Degrees of Failure wins the pot. The Explorer may&#10;choose to lose against any player with a worse result as part&#10;of a Deceive attempt.&#10;&#10;Those with both Skills may use Sleight of Hand instead&#10;of Gamble to hide cards or alter dice rolls. Success gives the&#10;character a +20 bonus to his tests, but four or more Degrees&#10;of Failure indicates he has been caught in the act.&#10;&#10;-Skill Use: Full Action for an entire day of gaming.">(Int) &#128712;</span>
+                    <button name="roll_Gamble" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Gamble**}} {{dosdof=[[(((  ([[(@{Gamble}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Gamble</label>
+                        <b style="width:10%" title="The Explorer uses Gamble when participating in games of chance.&#10;Each participant wagers an amount, though these are&#10;typically the same, and makes an Opposed Test with the&#10;Gamble Skill. The player with the most Degrees of Success&#10;or fewest Degrees of Failure wins the pot. The Explorer may&#10;choose to lose against any player with a worse result as part&#10;of a Deceive attempt.&#10;&#10;Those with both Skills may use Sleight of Hand instead&#10;of Gamble to hide cards or alter dice rolls. Success gives the&#10;character a +20 bonus to his tests, but four or more Degrees&#10;of Failure indicates he has been caught in the act.&#10;&#10;-Skill Use: Full Action for an entire day of gaming.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Gamble1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Gamble2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Gamble3" type="checkbox" value="10"/></div>
@@ -430,8 +463,11 @@
                     <input id="subitem" name="attr_Gamble" type="text" disabled value="(floor((0.5+@{Gamble1})*@{Intelligence})+@{Gamble2}+@{Gamble3}+@{TalentBonus13}+@{OtherBonus13})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Inquiry" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Inquiry**}} {{dosdof=[[(((  ([[(@{Inquiry}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Inquiry</label></button>                    
-                    <span id="gridspan" title="The Explorer can use Inquiry to gain information by asking&#10;questions, through conversation or simple eavesdropping.&#10;Inquiry allows him to pick up general information about an&#10;area: its news, recent events, and more. Additional Degrees of&#10;Success reveal more detailed or more secretive tidings.&#10;&#10;Inquiry can also be used as an Investigation Skill, allowing&#10;the Explorer to hunt after a particular item of information&#10;from either individuals or resources, such as the ship’s&#10;librarium. This use is virtually always an Extended Test, with&#10;Difficulty and Duration set by the GM.&#10;&#10;-Skill Use: 1 hour or more.&#10;&#10;-Special Use: Hunt for Sedition&#10;A character may use his skills of inquiry among members&#10;of the crew to plumb for malcontents, malingerers and&#10;mutineers. Success means improves Morale by 1d5&#10;but for every point the ship’s Morale improves, the Population&#10;is reduced by 1 in turn as the seditious elements are purged.&#10;&#10;-Category: Interaction.">(Fel) &#128712;</span>
+                    <button name="roll_Inquiry" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Inquiry**}} {{dosdof=[[(((  ([[(@{Inquiry}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Inquiry</label>
+                        <b style="width:10%" title="The Explorer can use Inquiry to gain information by asking&#10;questions, through conversation or simple eavesdropping.&#10;Inquiry allows him to pick up general information about an&#10;area: its news, recent events, and more. Additional Degrees of&#10;Success reveal more detailed or more secretive tidings.&#10;&#10;Inquiry can also be used as an Investigation Skill, allowing&#10;the Explorer to hunt after a particular item of information&#10;from either individuals or resources, such as the ship’s&#10;librarium. This use is virtually always an Extended Test, with&#10;Difficulty and Duration set by the GM.&#10;&#10;-Skill Use: 1 hour or more.&#10;&#10;-Special Use: Hunt for Sedition&#10;A character may use his skills of inquiry among members&#10;of the crew to plumb for malcontents, malingerers and&#10;mutineers. Success means improves Morale by 1d5&#10;but for every point the ship’s Morale improves, the Population&#10;is reduced by 1 in turn as the seditious elements are purged.&#10;&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Inquiry1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Inquiry2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Inquiry3" type="checkbox" value="10"/></div>
@@ -439,14 +475,16 @@
                     <input id="subitem" name="attr_OtherBonus14" type="number" value="0"/>
                     <input id="subitem" name="attr_Inquiry" type="text" disabled value="(floor((0.5+@{Inquiry1})*@{Fellowship})+@{Inquiry2}+@{Inquiry3}+@{TalentBonus14}+@{OtherBonus14})"/>
                 </div>
-                <div class="gridinputbasic9">
-                    <button name="roll_Intimidate" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Intimidate**}} {{dosdof=[[(((  ([[(@{Intimidate}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Intimidate</label></button>      
-                    <select name="attr_Intimidate" id="subitem2">
+                <div class="grid8b">
+                    <button name="roll_Intimidate" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Intimidate**}} {{dosdof=[[(((  ([[(@{Intimidate}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Intimidate</label>
+                        <b style="width:10%" title="The Explorer uses Intimidate to pressure an individual to give&#10;in to his demands. The character does not make an Intimidate&#10;Test every time he makes a threat, but only when it involves&#10;coercion. Though Intimidate lists Strength as its associated&#10;characteristic, the Explorer may substitute either Intelligence&#10;or Fellowship if the threat involves more subtle methods than&#10;brute force, such as blackmail or humiliation.&#10;&#10;An Intimidate Test affects a number of targets equal to&#10;the Explorer’s Strength, Intelligence, or Fellowship Bonus,&#10;depending on the characteristic used for the test. His targets&#10;must be able to see and hear him clearly, either in person or&#10;via pict- or vox-caster, and speak a common language.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <select name="attr_Intimidate" id="subitem">
                         <option value="(floor((0.5+@{Intimidate1})*@{Strength})+@{Intimidate2}+@{Intimidate3}+@{TalentBonus15}+@{OtherBonus15})">S</option>
                         <option value="(floor((0.5+@{Intimidate1})*@{Intelligence})+@{Intimidate2}+@{Intimidate3}+@{TalentBonus15}+@{OtherBonus15})">Int</option>
                         <option value="(floor((0.5+@{Intimidate1})*@{Fellowship})+@{Intimidate2}+@{Intimidate3}+@{TalentBonus15}+@{OtherBonus15})">Fel</option>
                     </select>
-                    <span id="gridspansp" title="The Explorer uses Intimidate to pressure an individual to give&#10;in to his demands. The character does not make an Intimidate&#10;Test every time he makes a threat, but only when it involves&#10;coercion. Though Intimidate lists Strength as its associated&#10;characteristic, the Explorer may substitute either Intelligence&#10;or Fellowship if the threat involves more subtle methods than&#10;brute force, such as blackmail or humiliation.&#10;&#10;An Intimidate Test affects a number of targets equal to&#10;the Explorer’s Strength, Intelligence, or Fellowship Bonus,&#10;depending on the characteristic used for the test. His targets&#10;must be able to see and hear him clearly, either in person or&#10;via pict- or vox-caster, and speak a common language.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Interaction.">&#128712;</span>
                     <div id="cbitem"><input name="attr_Intimidate1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Intimidate2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Intimidate3" type="checkbox" value="10"/></div>
@@ -455,8 +493,11 @@
                     <input id="subitem" name="attr_IntimidateDisplay" type="text" disabled value="@{Intimidate}"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Logic" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Logic**}} {{dosdof=[[(((  ([[(@{Logic}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Logic</label></button>
-                    <span id="gridspan" title="The Explorer uses Logic to solve problems, decipher puzzles,&#10;and deal with other situations involving demonstration and&#10;inference. A Logic Test might infer the missing symbol in&#10;a series or to solve a particularly troublesome mathematical&#10;equation. He can also use the Skill to prepare a reasoned&#10;argument for debate or philosophical exchange.&#10;The preparations of complex reasoning or complicated&#10;problems are Extended Tests.&#10;&#10;-Skill Use: 1 minute, or longer for particularly complex problems.&#10;-Category: Investigation.">(Int) &#128712;</span>
+                    <button name="roll_Logic" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Logic**}} {{dosdof=[[(((  ([[(@{Logic}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Logic</label>
+                        <b style="width:10%" title="The Explorer uses Logic to solve problems, decipher puzzles,&#10;and deal with other situations involving demonstration and&#10;inference. A Logic Test might infer the missing symbol in&#10;a series or to solve a particularly troublesome mathematical&#10;equation. He can also use the Skill to prepare a reasoned&#10;argument for debate or philosophical exchange.&#10;The preparations of complex reasoning or complicated&#10;problems are Extended Tests.&#10;&#10;-Skill Use: 1 minute, or longer for particularly complex problems.&#10;-Category: Investigation.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Logic1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Logic2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Logic3" type="checkbox" value="10"/></div>
@@ -465,8 +506,11 @@
                     <input id="subitem" name="attr_Logic" type="text" disabled value="(floor((0.5+@{Logic1})*@{Intelligence})+@{Logic2}+@{Logic3}+@{TalentBonus16}+@{OtherBonus16})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Scrutiny" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Scrutiny**}} {{dosdof=[[(((  ([[(@{Scrutiny}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Scrutiny</label></button>
-                    <span id="gridspan" title="The Scrutiny Skill helps assess the people or objects the Explorer&#10;encounters. The character uses it to determine an individual’s&#10;truthfulness, his motives and generally appraise his personality&#10;and temperament. It can also be used to examine an object in&#10;detail, noticing small details and characteristics that might pass&#10;unseen in a casual inspection. For starship auspex returns, it&#10;allows determination of a vessel’s mass, velocity, and more.&#10;&#10;Scrutiny is an Opposed Test against the target’s Deceive Skill&#10;when trying to perceive falsehoods or deceptions. However,&#10;Scrutiny does not reveal hidden secrets or a target’s carefully&#10;concealed intent, and should never replace good roleplaying&#10;in an interactive situation. This Skill counters the Opposed&#10;Tests of many manipulative Interaction skills, such as Charm,&#10;Deceive, and Intimidate.&#10;&#10;-Skill Use: Full Action, though special uses may require more time.">(Per) &#128712;</span>
+                    <button name="roll_Scrutiny" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Scrutiny**}} {{dosdof=[[(((  ([[(@{Scrutiny}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Scrutiny</label>
+                        <b style="width:10%" title="The Scrutiny Skill helps assess the people or objects the Explorer&#10;encounters. The character uses it to determine an individual’s&#10;truthfulness, his motives and generally appraise his personality&#10;and temperament. It can also be used to examine an object in&#10;detail, noticing small details and characteristics that might pass&#10;unseen in a casual inspection. For starship auspex returns, it&#10;allows determination of a vessel’s mass, velocity, and more.&#10;&#10;Scrutiny is an Opposed Test against the target’s Deceive Skill&#10;when trying to perceive falsehoods or deceptions. However,&#10;Scrutiny does not reveal hidden secrets or a target’s carefully&#10;concealed intent, and should never replace good roleplaying&#10;in an interactive situation. This Skill counters the Opposed&#10;Tests of many manipulative Interaction skills, such as Charm,&#10;Deceive, and Intimidate.&#10;&#10;-Skill Use: Full Action, though special uses may require more time.">?</b>
+                    </button>
+                    <span id="gridspan">Per</span>
                     <div id="cbitem"><input name="attr_Scrutiny1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Scrutiny2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Scrutiny3" type="checkbox" value="10"/></div>
@@ -475,8 +519,11 @@
                     <input id="subitem" name="attr_Scrutiny" type="text" disabled value="(floor((0.5+@{Scrutiny1})*@{Perception})+@{Scrutiny2}+@{Scrutiny3}+@{TalentBonus17}+@{OtherBonus17})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Search" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Search**}} {{dosdof=[[(((  ([[(@{Search}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Search</label></button>
-                    <span id="gridspan" title="The Explorer uses the Search Skill to discover things that are&#10;physically hidden, from a hidden holdout pistol to a shuttle&#10;code. Search involves active investigation, whereas Awareness&#10;deals with passive or subconscious detection. Each Search Test&#10;covers a small room or area. When an object or individual has&#10;been deliberately hidden, the Search Test is an Opposed Test&#10;against the target’s Concealment.&#10;&#10;-Skill Use: 1 minute.&#10;&#10;-Special Use: Inspection&#10;The Search skill can also be used to find hidden stores,&#10;contraband, stowaways, and even evidence of sabotage on&#10;vehicles and starships. Depending on the size of the vehicle,&#10;the GM may designate this as an Extended Test with an&#10;appropriate Duration.&#10;&#10;-Category: Exploration.">(Per) &#128712;</span>
+                    <button name="roll_Search" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Search**}} {{dosdof=[[(((  ([[(@{Search}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Search</label>
+                        <b style="width:10%" title="The Explorer uses the Search Skill to discover things that are&#10;physically hidden, from a hidden holdout pistol to a shuttle&#10;code. Search involves active investigation, whereas Awareness&#10;deals with passive or subconscious detection. Each Search Test&#10;covers a small room or area. When an object or individual has&#10;been deliberately hidden, the Search Test is an Opposed Test&#10;against the target’s Concealment.&#10;&#10;-Skill Use: 1 minute.&#10;&#10;-Special Use: Inspection&#10;The Search skill can also be used to find hidden stores,&#10;contraband, stowaways, and even evidence of sabotage on&#10;vehicles and starships. Depending on the size of the vehicle,&#10;the GM may designate this as an Extended Test with an&#10;appropriate Duration.&#10;&#10;-Category: Exploration.">?</b>
+                    </button>
+                    <span id="gridspan">Per</span>
                     <div id="cbitem"><input name="attr_Search1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Search2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Search3" type="checkbox" value="10"/></div>
@@ -485,8 +532,11 @@
                     <input id="subitem" name="attr_Search" type="text" disabled value="(floor((0.5+@{Search1})*@{Perception})+@{Search2}+@{Search3}+@{TalentBonus18}+@{OtherBonus18})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_SilentMove" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Silent Move**}} {{dosdof=[[(((  ([[(@{SilentMove}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Silent Move</label></button>
-                    <span id="gridspan" title="Use the Silent Move Skill anytime silence and secrecy is&#10;essential in the Explorer’s activities. The GM sets the Difficulty&#10;of the Test depending on the environment, where the echoing&#10;steel halls of a cargo bay yields a greater Difficulty than the&#10;wood-panelled, carpeted environs of the officers’ quarters.&#10;Silent Move Tests are always Opposed Tests against the&#10;opponent’s Awareness or Scrutiny Skill.&#10;&#10;-Skill Use: Free Action as part of Movement.&#10;-Category: Movement.">(Ag) &#128712;</span>
+                    <button name="roll_SilentMove" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Silent Move**}} {{dosdof=[[(((  ([[(@{SilentMove}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Silent Move</label>
+                        <b style="width:10%" title="Use the Silent Move Skill anytime silence and secrecy is&#10;essential in the Explorer’s activities. The GM sets the Difficulty&#10;of the Test depending on the environment, where the echoing&#10;steel halls of a cargo bay yields a greater Difficulty than the&#10;wood-panelled, carpeted environs of the officers’ quarters.&#10;Silent Move Tests are always Opposed Tests against the&#10;opponent’s Awareness or Scrutiny Skill.&#10;&#10;-Skill Use: Free Action as part of Movement.&#10;-Category: Movement.">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_SilentMove1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_SilentMove2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_SilentMove3" type="checkbox" value="10"/></div>
@@ -495,8 +545,11 @@
                     <input id="subitem" name="attr_SilentMove" type="text" disabled value="(floor((0.5+@{SilentMove1})*@{Agility})+@{SilentMove2}+@{SilentMove3}+@{TalentBonus19}+@{OtherBonus19})"/>
                 </div>
                 <div class="grid8b">
-                    <button name="roll_Swim" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Swim**}} {{dosdof=[[(((  ([[(@{Swim}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Swim</label></button>
-                    <span id="gridspan" title="Swim allows the Explorer to swim through various liquid&#10;mediums. Under normal conditions swimming does not&#10;require a Test. More difficult waters, unusual circumstances,&#10;or long distances call for a Skill Test.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Movement.">(S) &#128712;</span>
+                    <button name="roll_Swim" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Swim**}} {{dosdof=[[(((  ([[(@{Swim}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Swim</label>
+                        <b style="width:10%" title="Swim allows the Explorer to swim through various liquid&#10;mediums. Under normal conditions swimming does not&#10;require a Test. More difficult waters, unusual circumstances,&#10;or long distances call for a Skill Test.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Movement.">?</b>
+                    </button>
+                    <span id="gridspan">S</span>
                     <div id="cbitem"><input name="attr_Swim1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Swim2" type="checkbox" value="10"/></div>
                     <div id="cbitem"><input name="attr_Swim3" type="checkbox" value="10"/></div>
@@ -505,12 +558,11 @@
                     <input id="subitem" name="attr_Swim" type="text" disabled value="(floor((0.5+@{Swim1})*@{Strength})+@{Swim2}+@{Swim3}+@{TalentBonus20}+@{OtherBonus20})"/>
                 </div>
         </div>
-        <!--Advanced Skills-->
         <div class="rightbox">
-            <h2>&#128923; Advanced Skills &#128923;</h2>
+            <h2>Advanced Skills</h2>
                 <div class="grid9">
                     <label class="label1">Roll Test</label>
-                    <label class="label1">Info</label>
+                    <label class="label1"></label>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -520,8 +572,11 @@
                     <label class="label2">Total</label>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Acrobatics" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Acrobatics**}} {{dosdof=[[(((  ([[(@{Acrobatics}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Acrobatics</label></button>
-                    <span id="gridspan" title="Acrobatics training supplements the Explorer’s natural agility&#10;to perform feats the less athletic would not even consider.&#10;&#10;-Skill Use: Full Action unless otherwise noted.&#10;&#10;-Special Use: When taking the Disengage Action in combat,&#10;the Explorer may make an Acrobatics Test to reduce it to a Half Action.&#10;&#10;-Special Use: An Acrobatics Test may substitute for an Agility Test when&#10;jumping or a Strength Test when leaping.&#10;&#10;-Category: Movement.">(Ag) &#128712;</span>
+                    <button name="roll_Acrobatics" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Acrobatics**}} {{dosdof=[[(((  ([[(@{Acrobatics}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Acrobatics</label>
+                        <b style="width:10%" title="Acrobatics training supplements the Explorer’s natural agility&#10;to perform feats the less athletic would not even consider.&#10;&#10;-Skill Use: Full Action unless otherwise noted.&#10;&#10;-Special Use: When taking the Disengage Action in combat,&#10;the Explorer may make an Acrobatics Test to reduce it to a Half Action.&#10;&#10;-Special Use: An Acrobatics Test may substitute for an Agility Test when&#10;jumping or a Strength Test when leaping.&#10;&#10;-Category: Movement.">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_Acrobatics1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Acrobatics2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Acrobatics3" type="checkbox" value="10"/></div>
@@ -531,8 +586,11 @@
                     <input id="subitem" name="attr_Acrobatics" type="text" disabled value="floor((@{Acrobatics1}+@{Acrobatics2})*@{agility})+@{Acrobatics3}+@{Acrobatics4}+@{AcrobaticsTalentBonus}+@{AcrobaticsOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Blather" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Blather**}} {{dosdof=[[(((  ([[(@{Blather}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Blather</label></button>
-                    <span id="gridspan" title="Blather allows the Explorer to stall for time with a confusing&#10;or distracting stream of conversation.&#10;&#10;Blather Tests are always Opposed by the target’s Willpower,&#10;or Scrutiny if the target actively suspects the tactic.&#10;&#10;Winning the Opposed Test results in the opponent’s bemused&#10;inaction for his entire round.&#10;For every degree of success, the Explorer has dumbfounded&#10;the target for an additional round.&#10;&#10;Loosing the Opposed Test means that&#10;everyone involved may act normally.&#10;&#10;Some Talents allow the Explorer to use Blather against&#10;many opponents. However, even without these Talents,&#10;he can affect a number of targets equal to his Fellowship Bonus&#10;if he is able to win the Opposed Test. &#10;&#10;-Skill Use: Full Action.&#10;-Category: Interaction.">(Fel) &#128712;</span>
+                    <button name="roll_Blather" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Blather**}} {{dosdof=[[(((  ([[(@{Blather}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Blather</label>
+                        <b style="width:10%" title="Blather allows the Explorer to stall for time with a confusing&#10;or distracting stream of conversation.&#10;&#10;Blather Tests are always Opposed by the target’s Willpower,&#10;or Scrutiny if the target actively suspects the tactic.&#10;&#10;Winning the Opposed Test results in the opponent’s bemused&#10;inaction for his entire round.&#10;For every degree of success, the Explorer has dumbfounded&#10;the target for an additional round.&#10;&#10;Loosing the Opposed Test means that&#10;everyone involved may act normally.&#10;&#10;Some Talents allow the Explorer to use Blather against&#10;many opponents. However, even without these Talents,&#10;he can affect a number of targets equal to his Fellowship Bonus&#10;if he is able to win the Opposed Test. &#10;&#10;-Skill Use: Full Action.&#10;-Category: Interaction.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Blather1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Blather2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Blather3" type="checkbox" value="10"/></div>
@@ -542,8 +600,11 @@
                     <input id="subitem" name="attr_Blather" type="text" disabled value="floor((@{Blather1}+@{Blather2})*@{fellowship})+@{Blather3}+@{Blather4}+@{BlatherTalentBonus}+@{BlatherOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Chem-Use" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Chem-Use**}} {{dosdof=[[(((  ([[(@{Chem-Use}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Chem-Use</label></button>
-                    <span id="gridspan" title="The Chem-Use skill allows the Explorer to safely identify, handle&#10;and prepare a variety of chemicals, toxins, poisons, and drugs.&#10;Success in a Chem-Use Test indicates it has been applied correctly&#10;for the desired results.&#10;&#10;Failure indicates the dose was wasted without effect.&#10;When using a medicae injector the Skill Test to administer a drug&#10;or antidote is reduced to a Half Action.&#10;&#10;Employing Chem-Use to apply particularly complex combinations&#10;of substances or toxins uses an Extended Test.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Crafting, Investigation.">(Int) &#128712;</span>
+                    <button name="roll_Chem-Use" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Chem-Use**}} {{dosdof=[[(((  ([[(@{Chem-Use}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Chem-Use</label>
+                        <b style="width:10%" title="The Chem-Use skill allows the Explorer to safely identify, handle&#10;and prepare a variety of chemicals, toxins, poisons, and drugs.&#10;Success in a Chem-Use Test indicates it has been applied correctly&#10;for the desired results.&#10;&#10;Failure indicates the dose was wasted without effect.&#10;When using a medicae injector the Skill Test to administer a drug&#10;or antidote is reduced to a Half Action.&#10;&#10;Employing Chem-Use to apply particularly complex combinations&#10;of substances or toxins uses an Extended Test.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Crafting, Investigation.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Chem-Use1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Chem-Use2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Chem-Use3" type="checkbox" value="10"/></div>
@@ -553,8 +614,11 @@
                     <input id="subitem" name="attr_Chem-Use" type="text" disabled value="floor((@{Chem-Use1}+@{Chem-Use2})*@{intelligence})+@{Chem-Use3}+@{Chem-Use4}+@{Chem-UseTalentBonus}+@{Chem-UseOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Commerce" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Commerce**}} {{dosdof=[[(((  ([[(@{Commerce}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Commerce</label></button>
-                    <span id="gridspan" title="An Explorer may use the Commerce Skill to improve his Profit Factor&#10;prior to making an Acquisition Test.&#10;This is a contest of the Explorer’s Commerce Skill versus the Commerce Skill&#10;or Scrutiny Skill of the person or organization he is trading with.&#10;&#10;For each degree the Explorer beats his opponent,&#10;he may increase his Profit Factor by 2 points.&#10;For each degree his opponent beats him, however,&#10;he must decrease his Profit Factor by 2.&#10;&#10;Both increases and decreases to Profit Factor only apply to a single&#10;Acquisition Test made immediately with that trader.&#10;This use of Skills works both ways, and when the Explorers deal with&#10;canny merchants, the GM may force them to make a contest&#10;of Commerce Skills even if they don’t want to.&#10;&#10;-Skill Use: Variable.">(Fel) &#128712;</span>
+                    <button name="roll_Commerce" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Commerce**}} {{dosdof=[[(((  ([[(@{Commerce}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Commerce</label>
+                        <b style="width:10%" title="An Explorer may use the Commerce Skill to improve his Profit Factor&#10;prior to making an Acquisition Test.&#10;This is a contest of the Explorer’s Commerce Skill versus the Commerce Skill&#10;or Scrutiny Skill of the person or organization he is trading with.&#10;&#10;For each degree the Explorer beats his opponent,&#10;he may increase his Profit Factor by 2 points.&#10;For each degree his opponent beats him, however,&#10;he must decrease his Profit Factor by 2.&#10;&#10;Both increases and decreases to Profit Factor only apply to a single&#10;Acquisition Test made immediately with that trader.&#10;This use of Skills works both ways, and when the Explorers deal with&#10;canny merchants, the GM may force them to make a contest&#10;of Commerce Skills even if they don’t want to.&#10;&#10;-Skill Use: Variable.">?</b>
+                    </button>
+                    <span id="gridspan">Fel</span>
                     <div id="cbitem"><input name="attr_Commerce1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Commerce2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Commerce3" type="checkbox" value="10"/></div>
@@ -564,8 +628,11 @@
                     <input id="subitem" name="attr_Commerce" type="text" disabled value="floor((@{Commerce1}+@{Commerce2})*@{fellowship})+@{Commerce3}+@{Commerce4}+@{CommerceTalentBonus}+@{CommerceOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Demolition" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Demolition**}} {{dosdof=[[(((  ([[(@{Demolition}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Demolition</label></button>
-                    <span id="gridspan" title="The Explorer can use the Demolition Skill for several effects:&#10;-Manufacture Explosives (Extended Test unless otherwise noted):&#10;The Demolition Skill allows the Explorer to make explosive materials from basic components.&#10;&#10;-Place Explosives (Full Action unless otherwise noted):&#10;Success indicates the Explorer has successfully planted the explosive charge.&#10;Failure indicates that the explosives will fail to go off when triggered,&#10;though the character will not know this till the time of activation.&#10;Four or more Degrees of Failure indicates the Explorer has detonated the device on himself!.&#10;&#10;-Defuse Explosives (Full Action unless otherwise noted):&#10;Make an Opposed Test against the Demolition Skill Test of the individual who set the explosives.&#10;Winning the Test indicates that the bomb has been defused.&#10;Simple failure means that the charge has not been disarmed.&#10;Four or more Degrees of Failure indicates the Explorer has set off the device!&#10;&#10;-Category: Crafting.">(Int) &#128712;</span>
+                    <button name="roll_Demolition" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Demolition**}} {{dosdof=[[(((  ([[(@{Demolition}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Demolition</label>
+                        <b style="width:10%" title="The Explorer can use the Demolition Skill for several effects:&#10;-Manufacture Explosives (Extended Test unless otherwise noted):&#10;The Demolition Skill allows the Explorer to make explosive materials from basic components.&#10;&#10;-Place Explosives (Full Action unless otherwise noted):&#10;Success indicates the Explorer has successfully planted the explosive charge.&#10;Failure indicates that the explosives will fail to go off when triggered,&#10;though the character will not know this till the time of activation.&#10;Four or more Degrees of Failure indicates the Explorer has detonated the device on himself!.&#10;&#10;-Defuse Explosives (Full Action unless otherwise noted):&#10;Make an Opposed Test against the Demolition Skill Test of the individual who set the explosives.&#10;Winning the Test indicates that the bomb has been defused.&#10;Simple failure means that the charge has not been disarmed.&#10;Four or more Degrees of Failure indicates the Explorer has set off the device!&#10;&#10;-Category: Crafting.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Demolition1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Demolition2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Demolition3" type="checkbox" value="10"/></div>
@@ -575,8 +642,11 @@
                     <input id="subitem" name="attr_Demolition" type="text" disabled value="floor((@{Demolition1}+@{Demolition2})*@{intelligence})+@{Demolition3}+@{Demolition4}+@{DemolitionTalentBonus}+@{DemolitionOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Interrogation" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Interrogation**}} {{dosdof=[[(((  ([[(@{Interrogation}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Interrogation</label></button>
-                    <span id="gridspan" title="Interrogation allows the Explorer to extract information from an unwilling subject.&#10;Make an Opposed Test, pitting the Explorer’s Interrogation Skill against an opponent’s Willpower.&#10;&#10;If he wins, the Explorer gets one answer, plus one answer for each Degree of Success.&#10;If the opponent wins, the Explorer gets nothing of worth.&#10;Two or more Degrees of Failure inflict 1d10 plus the character’s Willpower Bonus in Damage&#10;to the target, and prevents any further interrogation for 1d5 days.&#10;&#10;If the Explorer suffers four or more Degrees of Failure, he deals 1d10 Damage and his&#10;subject gains a +30 bonus to Willpower Tests made to resist Interrogation at the hands of the Explorer&#10;or his allies. Each Interrogation Test inflicts one level of Fatigue on the target.&#10;&#10;-Skill Use: 1d5 hours.&#10;-Category: Investigation.">(WP) &#128712;</span>
+                    <button name="roll_Interrogation" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Interrogation**}} {{dosdof=[[(((  ([[(@{Interrogation}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Interrogation</label>
+                        <b style="width:10%" title="Interrogation allows the Explorer to extract information from an unwilling subject.&#10;Make an Opposed Test, pitting the Explorer’s Interrogation Skill against an opponent’s Willpower.&#10;&#10;If he wins, the Explorer gets one answer, plus one answer for each Degree of Success.&#10;If the opponent wins, the Explorer gets nothing of worth.&#10;Two or more Degrees of Failure inflict 1d10 plus the character’s Willpower Bonus in Damage&#10;to the target, and prevents any further interrogation for 1d5 days.&#10;&#10;If the Explorer suffers four or more Degrees of Failure, he deals 1d10 Damage and his&#10;subject gains a +30 bonus to Willpower Tests made to resist Interrogation at the hands of the Explorer&#10;or his allies. Each Interrogation Test inflicts one level of Fatigue on the target.&#10;&#10;-Skill Use: 1d5 hours.&#10;-Category: Investigation.">?</b>
+                    </button>
+                    <span id="gridspan">WP</span>
                     <div id="cbitem"><input name="attr_Interrogation1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Interrogation2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Interrogation3" type="checkbox" value="10"/></div>
@@ -586,8 +656,11 @@
                     <input id="subitem" name="attr_Interrogation" type="text" disabled value="floor((@{Interrogation1}+@{Interrogation2})*@{willpower})+@{Interrogation3}+@{Interrogation4}+@{InterrogationTalentBonus}+@{InterrogationOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Invocation" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Invocation**}} {{dosdof=[[(((  ([[(@{Invocation}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Invocation</label></button>
-                    <span id="gridspan" title="For the duration of the round, the Explorer clears his mind of external influence&#10;and focuses his will more intently. A successful test indicates that his mind is ready&#10;to channel the warp more intensely.&#10;&#10;On the next round, the Explorer adds +1 to the final Psy Rating&#10;of any Fettered Power Test.&#10;&#10;Failure indicates that the Explorer’s attempts to focus have backfired,&#10;and he suffers a –1 penalty to the final Psy Rating of a Fettered Power Test.&#10;If this reduces the Psy Rating to zero, the power fails to activate.&#10;&#10;-Skill Use: Full Action.">(WP) &#128712;</span>
+                    <button name="roll_Invocation" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Invocation**}} {{dosdof=[[(((  ([[(@{Invocation}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Invocation</label>
+                        <b style="width:10%" title="For the duration of the round, the Explorer clears his mind of external influence&#10;and focuses his will more intently. A successful test indicates that his mind is ready&#10;to channel the warp more intensely.&#10;&#10;On the next round, the Explorer adds +1 to the final Psy Rating&#10;of any Fettered Power Test.&#10;&#10;Failure indicates that the Explorer’s attempts to focus have backfired,&#10;and he suffers a –1 penalty to the final Psy Rating of a Fettered Power Test.&#10;If this reduces the Psy Rating to zero, the power fails to activate.&#10;&#10;-Skill Use: Full Action.">?</b>
+                    </button>
+                    <span id="gridspan">WP</span>
                     <div id="cbitem"><input name="attr_Invocation1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Invocation2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Invocation3" type="checkbox" value="10"/></div>
@@ -597,8 +670,11 @@
                     <input id="subitem" name="attr_Invocation" type="text" disabled value="floor((@{Invocation1}+@{Invocation2})*@{willpower})+@{Invocation3}+@{Invocation4}+@{InvocationTalentBonus}+@{InvocationOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Literacy" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Literacy**}} {{dosdof=[[(((  ([[(@{Literacy}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Literacy</label></button>
-                    <span id="gridspan" title="Literacy allows the Explorer to read and write any language he speaks.&#10;Everyday activities do not require Literacy Tests, but&#10;situations involving regional variations, damaged manuscripts,&#10;archaic usage, or colloquial phrases necessitate a Test.&#10;&#10;-Skill Use: 1 minute for 1 page of text, roughly 750 words.">(Int) &#128712;</span>
+                    <button name="roll_Literacy" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Literacy**}} {{dosdof=[[(((  ([[(@{Literacy}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Literacy</label>
+                        <b style="width:10%" title="Literacy allows the Explorer to read and write any language he speaks.&#10;Everyday activities do not require Literacy Tests, but&#10;situations involving regional variations, damaged manuscripts,&#10;archaic usage, or colloquial phrases necessitate a Test.&#10;&#10;-Skill Use: 1 minute for 1 page of text, roughly 750 words.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Literacy1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Literacy2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Literacy3" type="checkbox" value="10"/></div>
@@ -608,8 +684,11 @@
                     <input id="subitem" name="attr_Literacy" type="text" disabled value="floor((@{Literacy1}+@{Literacy2})*@{intelligence})+@{Literacy3}+@{Literacy4}+@{LiteracyTalentBonus}+@{LiteracyOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Medicae" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Medicae**}} {{dosdof=[[(((  ([[(@{Medicae}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=?{Special Use|None,**No Special Action**|First Aid,**First Aid**: If successful it restores [[@{IB}]]&#10;(**Int** Bonus) for the lightly wounded.&#10;&#10;[[1]] for the heavily wounded or critical damage.|Extended Care,**Extended Care**: Heal at twice the Normal rate + Degrees of Success|Diagnosis,**Diagnosis**: Success yields the name of the ailment and basic treatments.&#10;Prevents Crew Pop. Damage due to disease or malnutrition on extended voyages.} }}"><label>Medicae</label></button>
-                    <span id="gridspan" title="The Medicae Skill helps diagnose and treat injuries by suturing wounds,&#10;applying counterseptic, and use of medical devices such as the Narthecium.&#10;&#10;On individual patients Medicae provides First Aid and Extended Care&#10;for short or long term treatment.&#10;&#10;This macro contains all available options.&#10;&#10;Additional rules can be found on page 83.">(Int) &#128712;</span>
+                    <button name="roll_Medicae" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Medicae**}} {{dosdof=[[(((  ([[(@{Medicae}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=?{Special Use|None,**No Special Action**|First Aid,**First Aid**: If successful it restores [[@{IB}]]&#10;(**Int** Bonus) for the lightly wounded.&#10;&#10;[[1]] for the heavily wounded or critical damage.|Extended Care,**Extended Care**: Heal at twice the Normal rate + Degrees of Success|Diagnosis,**Diagnosis**: Success yields the name of the ailment and basic treatments.&#10;Prevents Crew Pop. Damage due to disease or malnutrition on extended voyages.} }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Medicae</label>
+                        <b style="width:10%" title="The Medicae Skill helps diagnose and treat injuries by suturing wounds,&#10;applying counterseptic, and use of medical devices such as the Narthecium.&#10;&#10;On individual patients Medicae provides First Aid and Extended Care&#10;for short or long term treatment.&#10;&#10;This macro contains all available options.&#10;&#10;Additional rules can be found on page 83.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Medicae1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Medicae2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Medicae3" type="checkbox" value="10"/></div>
@@ -619,8 +698,11 @@
                     <input id="subitem" name="attr_Medicae" type="text" disabled value="floor((@{Medicae1}+@{Medicae2})*@{intelligence})+@{Medicae3}+@{Medicae4}+@{MedicaeTalentBonus}+@{MedicaeOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Psyniscience" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Psyniscience**}} {{dosdof=[[(((  ([[(@{Psyniscience}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Psyniscience</label></button>
-                    <span id="gridspan" title="The Explorer can use the Skill to detect the presence or absence of daemons&#10;and the use of psychic powers. The Skill also allows detection of psychic phenomena,&#10;disturbances, voids or other areas where the flow of the immaterium&#10;has been unsettled or disrupted.&#10;&#10;*Success: Awareness of immaterium disruption or number of entities present.&#10;*1 DoS: Approximate direction of the phenomena or creatures.&#10;*2 DoS: Rough location of the warp creatures or beings affecting the immaterium.&#10;*3+ DoS: Exact position of the creatures or psykers present.&#10;&#10;-Skill Use: Full Action.&#10;&#10;-Special Use: Astropaths can also use the Psyniscience skill to block the communications&#10;of other Astropaths. This is an Opposed Test, with the interfering Astropath suffering&#10;a –10 penalty for each Void Unit between himself and the target.&#10;If successful, the blocking Astropath stops the blocked Astropath’s ship from sending&#10;or receiving Astropathic transmissions.">(Per) &#128712;</span>
+                    <button name="roll_Psyniscience" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Psyniscience**}} {{dosdof=[[(((  ([[(@{Psyniscience}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Psyniscience</label>
+                        <b style="width:10%" title="The Explorer can use the Skill to detect the presence or absence of daemons&#10;and the use of psychic powers. The Skill also allows detection of psychic phenomena,&#10;disturbances, voids or other areas where the flow of the immaterium&#10;has been unsettled or disrupted.&#10;&#10;*Success: Awareness of immaterium disruption or number of entities present.&#10;*1 DoS: Approximate direction of the phenomena or creatures.&#10;*2 DoS: Rough location of the warp creatures or beings affecting the immaterium.&#10;*3+ DoS: Exact position of the creatures or psykers present.&#10;&#10;-Skill Use: Full Action.&#10;&#10;-Special Use: Astropaths can also use the Psyniscience skill to block the communications&#10;of other Astropaths. This is an Opposed Test, with the interfering Astropath suffering&#10;a –10 penalty for each Void Unit between himself and the target.&#10;If successful, the blocking Astropath stops the blocked Astropath’s ship from sending&#10;or receiving Astropathic transmissions.">?</b>
+                    </button>
+                    <span id="gridspan">Per</span>
                     <div id="cbitem"><input name="attr_Psyniscience1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Psyniscience2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Psyniscience3" type="checkbox" value="10"/></div>
@@ -630,8 +712,11 @@
                     <input id="subitem" name="attr_Psyniscience" type="text" disabled value="floor((@{Psyniscience1}+@{Psyniscience2})*@{perception})+@{Psyniscience3}+@{Psyniscience4}+@{PsyniscienceTalentBonus}+@{PsyniscienceOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Security" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Security**}} {{dosdof=[[(((  ([[(@{Security}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Security</label></button>
-                    <span id="gridspan" title="Security is used to bypass mechanical locks and other physical security systems.&#10;This differs from many systems that employ codes or cogitators&#10;that are more suited to the Tech-Use Skill.&#10;&#10;Using this Skill without proper tools or equipment is extremely challenging,&#10;and any attempt to bypass a lock or other security system without&#10;using a multikey or other set of appropriate tools suffers from a –20 penalty.&#10;&#10;-Skill Use: 1 minute, reduced by 10 seconds for each Degree of Success.&#10;-Category: Exploration">(Ag) &#128712;</span>
+                    <button name="roll_Security" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Security**}} {{dosdof=[[(((  ([[(@{Security}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Security</label>
+                        <b style="width:10%" title="Security is used to bypass mechanical locks and other physical security systems.&#10;This differs from many systems that employ codes or cogitators&#10;that are more suited to the Tech-Use Skill.&#10;&#10;Using this Skill without proper tools or equipment is extremely challenging,&#10;and any attempt to bypass a lock or other security system without&#10;using a multikey or other set of appropriate tools suffers from a –20 penalty.&#10;&#10;-Skill Use: 1 minute, reduced by 10 seconds for each Degree of Success.&#10;-Category: Exploration">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_Security1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Security2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Security3" type="checkbox" value="10"/></div>
@@ -641,8 +726,11 @@
                     <input id="subitem" name="attr_Security" type="text" disabled value="floor((@{Security1}+@{Security2})*@{agility})+@{Security3}+@{Security4}+@{SecurityTalentBonus}+@{SecurityOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Shadowing" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Shadowing**}} {{dosdof=[[(((  ([[(@{Shadowing}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Shadowing</label></button>
-                    <span id="gridspan" title="Shadowing allows the Explorer to follow others on foot&#10;or using vehicles or starships.&#10;&#10;It contrasts with Concealment because it involves movement&#10;and blending into one’s surroundings.&#10;&#10;Shadowing Tests are always Opposed Tests against the opponent’s&#10;Awareness or Scrutiny Skill.&#10;&#10;A single Shadowing Test is sufficient to follow an opponent unseen for a minute.&#10;&#10;-Skill Use: 1 minute.">(Ag) &#128712;</span>
+                    <button name="roll_Shadowing" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Shadowing**}} {{dosdof=[[(((  ([[(@{Shadowing}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Shadowing</label>
+                        <b style="width:10%" title="Shadowing allows the Explorer to follow others on foot&#10;or using vehicles or starships.&#10;&#10;It contrasts with Concealment because it involves movement&#10;and blending into one’s surroundings.&#10;&#10;Shadowing Tests are always Opposed Tests against the opponent’s&#10;Awareness or Scrutiny Skill.&#10;&#10;A single Shadowing Test is sufficient to follow an opponent unseen for a minute.&#10;&#10;-Skill Use: 1 minute.">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_Shadowing1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Shadowing2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Shadowing3" type="checkbox" value="10"/></div>
@@ -652,8 +740,11 @@
                     <input id="subitem" name="attr_Shadowing" type="text" disabled value="floor((@{Shadowing1}+@{Shadowing2})*@{agility})+@{Shadowing3}+@{Shadowing4}+@{ShadowingTalentBonus}+@{ShadowingOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_SleightofHand" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Sleight of Hand**}} {{dosdof=[[(((  ([[(@{SleightofHand}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Sleight of Hand</label></button>
-                    <span id="gridspan" title="Explorers use Sleight of Hand for any task requiring&#10;a combination of deception and dexterity.&#10;&#10;Examples include: palming small objects,&#10;picking pockets, or performing tricks.&#10;The GM sets the Difficulty for the Test according&#10;to the size of the object and the intensity of observation.&#10;&#10;Sleight of Hand is always an Opposed Test against&#10;the opponent’s Awareness or Scrutiny.&#10;The Explorer can use Sleight of Hand instead of Gamble to&#10;employ deception and alter the odds in games of chance.&#10;&#10;Though Sleight of Hand usually requires a Half Action,&#10;the Explorer may make a Test as a Free Action with a –10 penalty.&#10;&#10;-Skill Use: Half Action.">(Ag) &#128712;</span>
+                    <button name="roll_SleightofHand" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Sleight of Hand**}} {{dosdof=[[(((  ([[(@{SleightofHand}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Sleight of Hand</label>
+                        <b style="width:10%" title="Explorers use Sleight of Hand for any task requiring&#10;a combination of deception and dexterity.&#10;&#10;Examples include: palming small objects,&#10;picking pockets, or performing tricks.&#10;The GM sets the Difficulty for the Test according&#10;to the size of the object and the intensity of observation.&#10;&#10;Sleight of Hand is always an Opposed Test against&#10;the opponent’s Awareness or Scrutiny.&#10;The Explorer can use Sleight of Hand instead of Gamble to&#10;employ deception and alter the odds in games of chance.&#10;&#10;Though Sleight of Hand usually requires a Half Action,&#10;the Explorer may make a Test as a Free Action with a –10 penalty.&#10;&#10;-Skill Use: Half Action.">?</b>
+                    </button>
+                    <span id="gridspan">Ag</span>
                     <div id="cbitem"><input name="attr_SleightofHand1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_SleightofHand2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_SleightofHand3" type="checkbox" value="10"/></div>
@@ -663,8 +754,11 @@
                     <input id="subitem" name="attr_SleightofHand" type="text" disabled value="floor((@{SleightofHand1}+@{SleightofHand2})*@{agility})+@{SleightofHand3}+@{SleightofHand4}+@{SleightofHandTalentBonus}+@{SleightofHandOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Survival" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Survival**}} {{dosdof=[[(((  ([[(@{Survival}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Survival</label></button>
-                    <span id="gridspan" title="Survival allows the Explorer to endure for prolonged&#10;periods in unusual or alien environments.&#10;&#10;The Difficulty of these Tests depends on the location:&#10;barren deserts provide much greater challenge&#10;than verdant tropical forests.&#10;&#10;This Skill can also apply to man-made environments,&#10;such as artificial worlds, the depths of the Underhive,&#10;or the belly of massive starships.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Exploration">(Int) &#128712;</span>
+                    <button name="roll_Survival" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Survival**}} {{dosdof=[[(((  ([[(@{Survival}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Survival</label>
+                        <b style="width:10%" title="Survival allows the Explorer to endure for prolonged&#10;periods in unusual or alien environments.&#10;&#10;The Difficulty of these Tests depends on the location:&#10;barren deserts provide much greater challenge&#10;than verdant tropical forests.&#10;&#10;This Skill can also apply to man-made environments,&#10;such as artificial worlds, the depths of the Underhive,&#10;or the belly of massive starships.&#10;&#10;-Skill Use: Full Action.&#10;-Category: Exploration">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Survival1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Survival2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Survival3" type="checkbox" value="10"/></div>
@@ -674,8 +768,11 @@
                     <input id="subitem" name="attr_Survival" type="text" disabled value="floor((@{Survival1}+@{Survival2})*@{intelligence})+@{Survival3}+@{Survival4}+@{SurvivalTalentBonus}+@{SurvivalOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Tech-Use" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Tech-Use**}} {{dosdof=[[(((  ([[(@{Tech-Use}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Tech-Use</label></button>
-                    <span id="gridspan" title="Tech-Use allows the Explorer to use or repair complex mechanical items&#10;or fathom the workings of unknown technical artefacts.&#10;The Explorer can also use Tech-Use to repair damaged&#10;or defective items, using an Extended Test.&#10;Tech-Use can be used to direct the actions of Servitors.&#10;&#10;-Skill Use: 1 minute, or more for more complex systems.&#10;&#10;-Special Use: Security Systems&#10;Security covers mechanical security systems, but many systems&#10;may have both physical and electronic components, and certain&#10;examples may be entirely controlled by cogitators and machine spirits.&#10;&#10;-Category: Exploration.">(Int) &#128712;</span>
+                    <button name="roll_Tech-Use" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Tech-Use**}} {{dosdof=[[(((  ([[(@{Tech-Use}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Tech-Use</label>
+                        <b style="width:10%" title="Tech-Use allows the Explorer to use or repair complex mechanical items&#10;or fathom the workings of unknown technical artefacts.&#10;The Explorer can also use Tech-Use to repair damaged&#10;or defective items, using an Extended Test.&#10;Tech-Use can be used to direct the actions of Servitors.&#10;&#10;-Skill Use: 1 minute, or more for more complex systems.&#10;&#10;-Special Use: Security Systems&#10;Security covers mechanical security systems, but many systems&#10;may have both physical and electronic components, and certain&#10;examples may be entirely controlled by cogitators and machine spirits.&#10;&#10;-Category: Exploration.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Tech-Use1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Tech-Use2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Tech-Use3" type="checkbox" value="10"/></div>
@@ -685,8 +782,11 @@
                     <input id="subitem" name="attr_Tech-Use" type="text" disabled value="floor((@{Tech-Use1}+@{Tech-Use2})*@{intelligence})+@{Tech-Use3}+@{Tech-Use4}+@{Tech-UseTalentBonus}+@{Tech-UseOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Tracking" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Tracking**}} {{dosdof=[[(((  ([[(@{Tracking}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Tracking</label></button>
-                    <span id="gridspan" title="The Explorer can follow the signs left by his quarry.&#10;The Difficulty depends on the condition of the traces&#10;and the tracker’s surroundings.&#10;&#10;When following any tracks where the Difficulty&#10;of the Test is more than Challenging (+0)&#10;the tracker’s Movement rate drops to half.&#10;&#10;In the case where an opponent has attempted to Conceal&#10;or erase their tracks, make an Opposed Test&#10;made against the prey’s Concealment.&#10;&#10;The Explorer can use this Skill with the Investigation&#10;and Exploration rules on page 263 to determine&#10;information about the quarry, including&#10;time since they passed, numbers and their race.&#10;&#10;-Skill Use: Free Action made as part of Movement.&#10;-Category: Exploration.">(Int) &#128712;</span>
+                    <button name="roll_Tracking" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Tracking**}} {{dosdof=[[(((  ([[(@{Tracking}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Tracking</label>
+                        <b style="width:10%" title="The Explorer can follow the signs left by his quarry.&#10;The Difficulty depends on the condition of the traces&#10;and the tracker’s surroundings.&#10;&#10;When following any tracks where the Difficulty&#10;of the Test is more than Challenging (+0)&#10;the tracker’s Movement rate drops to half.&#10;&#10;In the case where an opponent has attempted to Conceal&#10;or erase their tracks, make an Opposed Test&#10;made against the prey’s Concealment.&#10;&#10;The Explorer can use this Skill with the Investigation&#10;and Exploration rules on page 263 to determine&#10;information about the quarry, including&#10;time since they passed, numbers and their race.&#10;&#10;-Skill Use: Free Action made as part of Movement.&#10;-Category: Exploration.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Tracking1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Tracking2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Tracking3" type="checkbox" value="10"/></div>
@@ -696,8 +796,11 @@
                     <input id="subitem" name="attr_Tracking" type="text" disabled value="floor((@{Tracking1}+@{Tracking2})*@{intelligence})+@{Tracking3}+@{Tracking4}+@{TrackingTalentBonus}+@{TrackingOtherBonus}"/>
                 </div>
                 <div class="grid9">
-                    <button name="roll_Wrangling" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Wrangling**}} {{dosdof=[[(((  ([[(@{Wrangling}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Wrangling</label></button>
-                    <span id="gridspan" title="The Explorer can tame, train, and potentially ride animals&#10;encountered in his travels, from spine-hounds to the noble&#10;warhorse breeds. Both taming and training beasts are&#10;Extended Tests, the Duration of which is determined by the&#10;nature and temper of the creature involved.&#10;&#10;Once an animal has been broken to its master’s will or&#10;at least formed a partnership for particularly strong-willed&#10;beasts—directing it or issuing commands is a Half Action.&#10;&#10;Wild animals, or those trained for hostility and aggression,&#10;can have their Disposition changed by one level for every&#10;2 Degrees of Success, up to a maximum of three levels by&#10;a Full Action use of this Skill.&#10;&#10;Wrangling is of no use against cyber-animals, psy-bonded&#10;animals, or against any creature with true sentience.&#10;&#10;-Skill Use: Variable depending on task and complexity.">(Int) &#128712;</span>
+                    <button name="roll_Wrangling" type="roll" id="subitem" value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Wrangling**}} {{dosdof=[[(((  ([[(@{Wrangling}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                        <div class="spacing" style="width:10%"></div><label style="width:80%">Wrangling</label>
+                        <b style="width:10%" title="The Explorer can tame, train, and potentially ride animals&#10;encountered in his travels, from spine-hounds to the noble&#10;warhorse breeds. Both taming and training beasts are&#10;Extended Tests, the Duration of which is determined by the&#10;nature and temper of the creature involved.&#10;&#10;Once an animal has been broken to its master’s will or&#10;at least formed a partnership for particularly strong-willed&#10;beasts—directing it or issuing commands is a Half Action.&#10;&#10;Wild animals, or those trained for hostility and aggression,&#10;can have their Disposition changed by one level for every&#10;2 Degrees of Success, up to a maximum of three levels by&#10;a Full Action use of this Skill.&#10;&#10;Wrangling is of no use against cyber-animals, psy-bonded&#10;animals, or against any creature with true sentience.&#10;&#10;-Skill Use: Variable depending on task and complexity.">?</b>
+                    </button>
+                    <span id="gridspan">Int</span>
                     <div id="cbitem"><input name="attr_Wrangling1" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Wrangling2" type="checkbox" value="0.5"/></div>
                     <div id="cbitem"><input name="attr_Wrangling3" type="checkbox" value="10"/></div>
@@ -706,41 +809,49 @@
                     <input id="subitem" name="attr_WranglingOtherBonus" type="number" value="0"/>
                     <input id="subitem" name="attr_Wrangling" type="text" disabled value="floor((@{Wrangling1}+@{Wrangling2})*@{intelligence})+@{Wrangling3}+@{Wrangling4}+@{WranglingTalentBonus}+@{WranglingOtherBonus}"/>
                 </div>
-            <div class="quickborder" style="padding: 23px 2px 20px 2px;">
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:29%; font-size:19px">Profit Factor:</label>
-                <input name="attr_profitfactor" style="width:12%; font-weight:bold" type="number" value="0"/>
-                <div class="spacing" style="width:4%"></div>
-                <button name="roll_acquisition" type="roll" style="width:25%" title="Rolls Profit Factor +/- Modifiers&#10;&#10;Modifiers apply to Items and Resources."
-                    value="@{gmroll}&{template:custom} {{name=**@{character_name} makes an Acquisition Test**}} {{dosdof=[[(((  ([[@{profitfactor} + (?{Availability|Ubiquitous +70 'Ration Pack',70|Abundant +50 'Knife',50|Plentiful +30 'Void Suit',30|Common +20 'Lasgun',20|Average +10 'Micro-bead',10|Scarce +0 'Demolition Charge',0|Rare -10 'Krak Grenade',-10|Very Rare -20 'Heavy Bolter',-20|Extremely Rare -30 'Digital Weapon',-30|Near Unique -50 'Tempest Bolt Shells',-50|Unique -70 'Archeotech Power Armour',-70}+?{Scale|Negligible +30 'Single Man',30|Trivial +20 'Squad 3–5',20
+            <div class="quickborder" style="padding-bottom: 13px;">
+                <h1>Profit Factor</h1>
+                <div class="spacing" style="width:1%"></div>
+                <button name="roll_acquisition" type="roll" style="width:41%"
+                    value="@{gmroll}&{template:custom} {{name=@{character_name} makes an Acquisition Test}} {{dosdof=[[(((  ([[@{profitfactor} + (?{Availability|Ubiquitous +70 'Ration Pack',70|Abundant +50 'Knife',50|Plentiful +30 'Void Suit',30|Common +20 'Lasgun',20|Average +10 'Micro-bead',10|Scarce +0 'Demolition Charge',0|Rare -10 'Krak Grenade',-10|Very Rare -20 'Heavy Bolter',-20|Extremely Rare -30 'Digital Weapon',-30|Near Unique -50 'Tempest Bolt Shells',-50|Unique -70 'Archeotech Power Armour',-70}+?{Scale|Negligible +30 'Single Man',30|Trivial +20 'Squad 3–5',20
                     |Minor +10 'Platoon(10–30)',10|Standard +0 'Company 50–100',0|Major -10 'Regiment 500–1000',-10|Significan -20 Division 2000–5000',-20|Vast -30 'Army 10000+',-30}+?{Craftmanship|Poor +10 'Corpse Starch Ration Pack',10|Common +0 'Typical Clothing',0|Good -10 'Finely Crafted Forge World Bolter',-10|Best -30 'Exquisite Power Sword with Noble Family Crest',-30}) + (?{Other Modifiers|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-                    <label style="font-size:14px">Acquisition Test</label></button>
-                    <div class="spacing" style="width:1%"></div>
-                <button name="roll_starshipacq" type="roll" style="width:25%" title="Rolls Profit Factor +/- Modifiers&#10;&#10;Modifiers set for Ship Components&#10;&#10;If attempting to acquire a Ship&#10;Select: Scarce + Structure + Common Craft&#10;and Other Modifiers to Ships Hull SP value."
-                    value="@{gmroll}&{template:custom} {{name=**@{character_name} makes a Ship Acquisition Test**}} {{dosdof=[[(((  ([[@{profitfactor} + (?{Availability|Ubiquitous +70,70|Abundant +50,50|Plentiful +30,30|Common +20,20|Average +10,10|Scarce +0 (Supplemental),0|Rare -10 (Essentials),-10|Very Rare -20 (SP Cost 2+),-20|Extremely Rare -30 (Archeotech),-30|Near Unique -50 (Xenotech),-50|Unique -70 (1 per Galaxy),-70}+?{Category|War -30 'Weapons',-30|Etheric -20 'Auspex',-20
-                    |Power -10 'Warp-Drive',-10|Structure +0 'Cargo Hold',0}+?{Craftmanship|Poor +10 'Ill Functioning',10|Common +0 'Functioning',0|Good -10 'Finely Crafted',-10|Best -30 'Exquisite creation worthy of a Noble',-30}) + (?{Other Modifiers|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-                    <label style="font-size:14px">Ship Acquisition</label></button>
+                    <div class="spacing" style="width:12%"></div>
+                    <label style="width:76%">Acquisition Test</label>
+                    <b style="width:12%" title="Rolls against Profit Factor +/- Modifiers&#10;&#10;Modifiers apply to Items and Resources.">?</b>
+                </button>
                 <div class="spacing" style="width:2%"></div>
+                <input name="attr_profitfactor" style="width:12%" type="number" value="0"/>
+                <div class="spacing" style="width:2%"></div>
+                <button name="roll_starshipacq" type="roll" style="width:41%"
+                    value="@{gmroll}&{template:custom} {{name=@{character_name} makes a Ship Acquisition Test}} {{dosdof=[[(((  ([[@{profitfactor} + (?{Availability|Ubiquitous +70,70|Abundant +50,50|Plentiful +30,30|Common +20,20|Average +10,10|Scarce +0 (Supplemental),0|Rare -10 (Essentials),-10|Very Rare -20 (SP Cost 2+),-20|Extremely Rare -30 (Archeotech),-30|Near Unique -50 (Xenotech),-50|Unique -70 (1 per Galaxy),-70}+?{Category|War -30 'Weapons',-30|Etheric -20 'Auspex',-20
+                    |Power -10 'Warp-Drive',-10|Structure +0 'Cargo Hold',0}+?{Craftmanship|Poor +10 'Ill Functioning',10|Common +0 'Functioning',0|Good -10 'Finely Crafted',-10|Best -30 'Exquisite creation worthy of a Noble',-30}) + (?{Other Modifiers|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                    <div class="spacing" style="width:12%"></div>
+                    <label style="width:76%">Ship Acquisition</label>
+                    <b style="width:12%" title="Rolls Profit Factor +/- Modifiers&#10;&#10;Modifiers set for Ship Components&#10;&#10;If attempting to acquire a Ship&#10;Select: Scarce + Structure + Common Craft&#10;and set Other Modifiers to Ships Hull SP value.">?</b>
+                </button>
+                <div class="spacing" style="width:1%"></div>
             </div><!-- quickborder -->
         </div>
     </div><!-- grid2 basic -->
     <div>
-        <div class="spacing" style="width:36%"></div>
-        <label style="width:25%">SKILL NOTES AND MODIFIERS</label>
-        <input type="checkbox" name="attr_hideskillmods" value="1" class="arrow icon" title="Hide this section" style="width:3%; margin-bottom:5px"/>
-        <div class="spacing" style="width:36%"></div>
+        <div class="spacing" style="width:35%"></div>
+        <label style="width:27%; text-align:right">SKILL NOTES AND MODIFIERS</label>
+        <input type="checkbox" name="attr_hideskillmods" value="1" class="arrow icon" style="width:3%; margin-bottom:5px"/>
+        <div class="spacing" style="width:35%"></div>
         <div class="hbody">
             <fieldset class="repeating_skillnotes">
                 <textarea style="width:100%; height:85px" name="attr_skillnotesdesc" placeholder="Skill Name and related Mods&#10;&#10;These notes do NOT affect the Tests"></textarea>
             </fieldset>
         </div>
     </div>
-    <h2>&#128924; Skill Groups &#128924;</h2>
+    <h2>Skill Groups</h2>
     <div class="grid2">
         <div class="leftbox">
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help" title="Speak Language is used to communicate with others using the same language.&#10;However, communication with those using obscure dialects or cryptic, &#10;complex concepts will require a Test at an appropriate Difficulty&#10;&#10;Skill Groups:&#10;-Eldar&#10;-Explorator Binary&#10;-High Gothic&#10;-Low Gothic&#10;-Ork&#10;-Techna-Lingua&#10;-Trader’s Cant.&#10;&#10;-Skill Use: Free Action.">Speak Language (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Speak Language (Int)</label>
+                    <b style="width:15%" title="Speak Language is used to communicate with others using the same language.&#10;However, communication with those using obscure dialects or cryptic, &#10;complex concepts will require a Test at an appropriate Difficulty&#10;&#10;Skill Groups:&#10;-Eldar&#10;-Explorator Binary&#10;-High Gothic&#10;-Low Gothic&#10;-Ork&#10;-Techna-Lingua&#10;-Trader’s Cant.&#10;&#10;-Skill Use: Free Action"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -751,7 +862,7 @@
                 </div>
                 <fieldset class="repeating_speaklanguage">
                     <div class="grid8">
-                        <input id="subitem" name="attr_languagename" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_languagename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_language1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_language2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_language3" type="checkbox" value="10"/></div>
@@ -766,8 +877,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Scholastic Lore grants the Explorer knowledge of particularly complex or esoteric subject.&#10;A successful Skill Test allows him to recall necessary information or research &#10;a particular subject should appropriate reference material be&#10;readily available. Scholastic Lore grants a depth of knowledge&#10;far beyond that of Common Lore, requiring both experience and study to obtain.&#10;&#10;Success Results:&#10;Success = Reveals basic information known to scholars on the topic.&#10;1 DoS = Reveals uncommon information, known to few dedicated academics.&#10;2 DoS = Reveals obscure information, known to only serious scholars.&#10;3+ DoS = Reveals extremely rare information, known only to true experts in the field.&#10;&#10;Skill Groups:&#10;-Archaic&#10;-Astromancy&#10;-Beasts&#10;-Bureaucracy&#10;-Chymistry&#10;-Cryptology&#10;-Heraldry&#10;-Imperial Warrants&#10;-Imperial Creed&#10;-Judgement&#10;-Legend&#10;-Navis Nobilite&#10;-Numerology&#10;-Occult&#10;-Philosophy&#10;-Tactica Imperialis&#10;&#10;-Skill Use: Free Action.&#10;&#10;-Category: Investigation.">Scholastic Lore (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Scholastic Lore (Int)</label>
+                    <b style="width:15%" title="Grants the Explorer knowledge of particularly complex or esoteric subject.&#10;A successful Skill Test allows him to recall necessary information&#10;or research a particular subject. Scholastic Lore grants a depth of knowledge&#10;far beyond that of Common Lore, requiring both experience and study to obtain.&#10;&#10;Success = Reveals basic information known to scholars on the topic.&#10;1 DoS = Reveals uncommon information, known to few dedicated academics.&#10;2 DoS = Reveals obscure information, known to only serious scholars.&#10;3+ DoS = Reveals extremely rare information, known only to true experts in the field.&#10;Skill Groups:&#10;-Archaic&#10;-Astromancy&#10;-Beasts&#10;-Bureaucracy&#10;-Chymistry&#10;-Cryptology&#10;-Heraldry&#10;-Imperial Warrants / Creed&#10;-Judgement&#10;-Legend&#10;-Navis Nobilite&#10;-Numerology&#10;-Occult&#10;-Philosophy&#10;-Tactica Imperialis&#10;&#10;-Skill Use: Free Action.&#10;&#10;-Category: Investigation"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -778,7 +890,7 @@
                 </div>
                 <fieldset class="repeating_scholasticlore">        
                     <div class="grid8">
-                        <input id="subitem" name="attr_Slorename" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Slorename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Slore1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Slore2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Slore3" type="checkbox" value="10"/></div>
@@ -793,8 +905,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="The Drive Skill allows the Explorer to control land-based vehicles.&#10;Normal driving does not require a Skill Test, but one is required&#10;for hazardous conditions, excessive speed, or dangerous manoeuvres.&#10;&#10;Skill Groups:&#10;-Ground Vehicle&#10;-Skimmer/Hover&#10;-Walker&#10;&#10;-Skill Use: Half Action.&#10;-Category: Operator.">Drive (Ag) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Drive (Ag)</label>
+                    <b style="width:15%" title="The Drive Skill allows the Explorer to control land-based vehicles.&#10;Normal driving does not require a Skill Test, but one is required&#10;for hazardous conditions, excessive speed, or dangerous manoeuvres.&#10;&#10;Skill Groups:&#10;-Ground Vehicle&#10;-Skimmer/Hover&#10;-Walker&#10;&#10;-Skill Use: Half Action.&#10;-Category: Operator"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -805,7 +918,7 @@
                 </div>
                 <fieldset class="repeating_drive">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Drivename" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Drivename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Drive1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Drive2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Drive3" type="checkbox" value="10"/></div>
@@ -820,8 +933,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="The Explorer uses the Performer Skill to entertain and enthrall groups of spectators.&#10;Performer Tests take an amount of time dependent on the art form involved.&#10;&#10;Skill Groups:&#10;-Dancer&#10;-Musician&#10;-Singer&#10;-Storyteller&#10;&#10;-Skill Use: Variable.&#10;&#10;-Special Use: Charming Performance&#10;The Explorer may make a Difficult (–10) Performer (Storyteller) or (Singer)&#10;Test instead of Charm, to win round the audience, causing their disposition&#10;to improve by one level, or to temporarily improve the Morale of the crew.&#10;When used to improve Morale, a successful Test adds +5 to the ship’s Morale,&#10;with an additional +10 for every two Degrees of Success.&#10;&#10;-Special Use: Enthralling Performance&#10;The Explorer may make a Difficult (–10) Performer (Musician) or (Singer)&#10;Test instead of a Blather Test, utterly enthralling and distracting&#10;the audience for a moment. When used in place of Blather, it is subject to&#10;the same rules and conditions.">Performer (Fel) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Performer (Fel)</label>
+                    <b style="width:15%" title="The Explorer uses the Performer Skill to entertain and enthrall groups of spectators.&#10;Performer Tests take an amount of time dependent on the art form involved.&#10;&#10;Skill Groups:&#10;-Dancer&#10;-Musician&#10;-Singer&#10;-Storyteller&#10;&#10;-Skill Use: Variable.&#10;&#10;-Special Use: Charming Performance&#10;The Explorer may make a Difficult (–10) Performer (Storyteller) or (Singer)&#10;Test instead of Charm, to win round the audience, causing their disposition&#10;to improve by one level, or to temporarily improve the Morale of the crew.&#10;When used to improve Morale, a successful Test adds +5 to the ship’s Morale,&#10;with an additional +10 for every two Degrees of Success.&#10;&#10;-Special Use: Enthralling Performance&#10;The Explorer may make a Difficult (–10) Performer (Musician) or (Singer)&#10;Test instead of a Blather Test, utterly enthralling and distracting&#10;the audience for a moment. When used in place of Blather, it is subject to&#10;the same rules and conditions."
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -832,7 +946,7 @@
                 </div>
                 <fieldset class="repeating_performer">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Performername" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Performername" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Performer1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Performer2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Performer3" type="checkbox" value="10"/></div>
@@ -847,8 +961,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Secret Tongue represents comprehension of a particularly&#10;obscure and arcane language known to only those of a specific&#10;class or organisation. Skill Tests are unnecessary so long as&#10;all speakers know the secret language. Situations involving&#10;adverse conditions, such as speaking over a poor vox link or&#10;communicating complex concepts, require a Skill Test.&#10;&#10;Skill Groups:&#10;-Administratum&#10;-Ecclesiarchy&#10;-Military&#10;-Navigator&#10;-Rogue Trader&#10;-Tech&#10;-Underdeck&#10;&#10;-Skill Use: Free Action.">Secret Tongue (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Secret Tongue (Int)</label>
+                    <b style="width:15%" title="Secret Tongue represents comprehension of a particularly&#10;obscure and arcane language known to only those of a specific&#10;class or organisation. Skill Tests are unnecessary so long as&#10;all speakers know the secret language. Situations involving&#10;adverse conditions, such as speaking over a poor vox link or&#10;communicating complex concepts, require a Skill Test.&#10;&#10;Skill Groups:&#10;-Administratum&#10;-Ecclesiarchy&#10;-Military&#10;-Navigator&#10;-Rogue Trader&#10;-Tech&#10;-Underdeck&#10;&#10;-Skill Use: Free Action"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -859,7 +974,7 @@
                 </div>
                 <fieldset class="repeating_secrettongue">
                     <div class="grid8">
-                        <input id="subitem" name="attr_STonguename" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_STonguename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_STongue1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_STongue2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_STongue3" type="checkbox" value="10"/></div>
@@ -874,8 +989,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Many groups and organizations employ ciphers as a secret,&#10;shorthand code to communicate basic ideas, warnings, or information&#10;rapidly. The Explorer can use and understand the hand signals,&#10;physical markings, or other subtle signs employed&#10;to express these concepts. Skill Tests are not required to either&#10;leave or read basic messages but are necessary to communicate or&#10;decipher complicated meanings or signs obscured by the passage of time.&#10;&#10;Skill Groups:&#10;-Rogue Trader&#10;-Mercenary Cant&#10;-Nobilite Family&#10;-Astropath Sign&#10;-Underworld&#10;&#10;-Skill Use: Full Action.">Ciphers (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Ciphers (Int)</label>
+                    <b style="width:15%" title="Many groups and organizations employ ciphers as a secret,&#10;shorthand code to communicate basic ideas, warnings, or information&#10;rapidly. The Explorer can use and understand the hand signals,&#10;physical markings, or other subtle signs employed&#10;to express these concepts. Skill Tests are not required to either&#10;leave or read basic messages but are necessary to communicate or&#10;decipher complicated meanings or signs obscured by the passage of time.&#10;&#10;Skill Groups:&#10;-Rogue Trader&#10;-Mercenary Cant&#10;-Nobilite Family&#10;-Astropath Sign&#10;-Underworld&#10;&#10;-Skill Use: Full Action"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -886,7 +1002,7 @@
                 </div>
                 <fieldset class="repeating_ciphers">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Ciphersname" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Ciphersname" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Ciphers1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Ciphers2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Ciphers3" type="checkbox" value="10"/></div>
@@ -900,11 +1016,12 @@
                 </fieldset>
             </div>
         </div>
-        <!-- Right Side -->
         <div class="rightbox">
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help" title="The Common Lore Skill allows the Explorer to recall general&#10;information, procedures, divisions, traditions, famed individuals,&#10;and superstitions of a particular world, group, organisation, or&#10;race. This Skill differs from Scholastic Lore, which represents&#10;scholarly learning, and Forbidden Lore, which involves hidden&#10;or proscribed knowledge, in that it deals with basic information&#10;learned from prolonged exposure to a culture or area.&#10;The GM will determine what extra information to provide&#10;for additional Degrees of Success.&#10;&#10;Skill Group:&#10;-Adeptus Arbites&#10;-Adeptus Astra Telepathica&#10;-Adeptus Mechanicus&#10;-Administratum&#10;-Ecclesiarchy&#10;-Imperial Creed&#10;-Imperial Guard&#10;-Imperial Navy&#10;-Imperium&#10;-Koronous Expanse&#10;-Navis Nobilite&#10;-Rogue Traders&#10;-Tech&#10;-War&#10;&#10;-Skill Use: Free Action.&#10;-Category: Investigation.">Common Lore (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Common Lore (Int)</label>
+                    <b style="width:15%" title="The Common Lore Skill allows the Explorer to recall general&#10;information, procedures, divisions, traditions, famed individuals,&#10;and superstitions of a particular world, group, organisation, or&#10;race. This Skill differs from Scholastic Lore, which represents&#10;scholarly learning, and Forbidden Lore, which involves hidden&#10;or proscribed knowledge, in that it deals with basic information&#10;learned from prolonged exposure to a culture or area.&#10;The GM will determine what extra information to provide&#10;for additional Degrees of Success.&#10;&#10;Skill Group:&#10;-Adeptus Arbites&#10;-Adeptus Astra Telepathica&#10;-Adeptus Mechanicus&#10;-Administratum&#10;-Ecclesiarchy&#10;-Imperial Creed&#10;-Imperial Guard&#10;-Imperial Navy&#10;-Imperium&#10;-Koronous Expanse&#10;-Navis Nobilite&#10;-Rogue Traders&#10;-Tech&#10;-War&#10;&#10;-Skill Use: Free Action.&#10;-Category: Investigation"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -915,7 +1032,7 @@
                 </div>
                 <fieldset class="repeating_commonlore">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Clorename" type="text"  placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Clorename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Clore1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Clore2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Clore3" type="checkbox" value="10"/></div>
@@ -930,8 +1047,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Forbidden Lore represent knowledge usually hidden, veiled,&#10;or proscribed by an organisation or society.&#10;Mere possession of this knowledge may cause difficulties for&#10;those not associated with the group in question.&#10;A successful Forbidden Lore Test indicates the Explorer can recall&#10;basic information about the subject. The GM will reveal additional&#10;information as appropriate to the Degree of Success on the roll.&#10;&#10;Skill Groups:&#10;-Adeptus Mechanicus&#10;-Archeotech&#10;-Daemonology&#10;-Heresy&#10;-The Inquisition&#10;-Mutants&#10;-Navigators&#10;-Pirates&#10;-Psykers&#10;-The Warp&#10;-Xenos&#10;&#10;-Skill Use: Free Action... although the consequences of&#10;knowing such things can last a lifetime.&#10;-Category: Investigation.">Forbidden Lore (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Forbidden Lore (Int)</label>
+                    <b style="width:15%" title="Forbidden Lore represent knowledge usually hidden, veiled,&#10;or proscribed by an organisation or society.&#10;Mere possession of this knowledge may cause difficulties for&#10;those not associated with the group in question.&#10;A successful Forbidden Lore Test indicates the Explorer can recall&#10;basic information about the subject. The GM will reveal additional&#10;information as appropriate to the Degree of Success on the roll.&#10;&#10;Skill Groups:&#10;-Adeptus Mechanicus&#10;-Archeotech&#10;-Daemonology&#10;-Heresy&#10;-The Inquisition&#10;-Mutants&#10;-Navigators&#10;-Pirates&#10;-Psykers&#10;-The Warp&#10;-Xenos&#10;&#10;-Skill Use: Free Action... although the consequences of&#10;knowing such things can last a lifetime.&#10;-Category: Investigation"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -942,7 +1060,7 @@
                 </div>
                 <fieldset class="repeating_forbiddenlore">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Florename" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Florename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Flore1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Flore2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Flore3" type="checkbox" value="10"/></div>
@@ -957,8 +1075,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="The Explorer uses the Navigation Skill to plot a course between two points.&#10;A successful Test also provides an estimated travel time based on geography,&#10;cosmography, prevailing conditions, weather, warp tides and the like.&#10;&#10;Surface Navigation is used to navigate across a planet’s surface, using&#10;logi-compasses,map readouts, and geographical knowledge.&#10;&#10;Stellar Navigation is used to navigate in space between planets,&#10;using star-charts, and carto-mantic rituals.&#10;&#10;Warp Navigation reflects the Navigator’s ability to steer&#10;a starship through the tides of the empyrean, using the&#10;beacon of the Astronomicon as a reference. It determines&#10;how quickly a ship reaches its destination. When conditions&#10;are particularly challenging, the Skill also determines if the ship&#10;reaches its destination at all.&#10;&#10;Skill Group:&#10;-Surface&#10;-Stellar&#10;-Warp&#10;&#10;-Skill Use: 1 minute for simple location; 1d5 hours for&#10;plotting courses or routes.&#10;-Category: Exploration.">Navigation (Int) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Navigation (Int)</label>
+                    <b style="width:15%" title="The Explorer uses the Navigation Skill to plot a course between two points.&#10;A successful Test also provides an estimated travel time based on geography,&#10;cosmography, prevailing conditions, weather, warp tides and the like.&#10;&#10;Surface Navigation is used to navigate across a planet’s surface, using&#10;logi-compasses,map readouts, and geographical knowledge.&#10;&#10;Stellar Navigation is used to navigate in space between planets,&#10;using star-charts, and carto-mantic rituals.&#10;&#10;Warp Navigation reflects the Navigator’s ability to steer a starship&#10;through the tides of the empyrean, using the Astronomicon as a reference.&#10;It determines how quickly a ship reaches its destination&#10;when conditions are challenging, and if the ship reaches its destination at all.&#10;&#10;Skill Group:&#10;-Surface&#10;-Stellar&#10;-Warp&#10;&#10;-Skill Use: 1 minute for simple location; 1d5 hours for&#10;plotting courses or routes.&#10;-Category: Exploration"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -969,7 +1088,7 @@
                 </div>
                 <fieldset class="repeating_navigation">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Navigationname" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Navigationname" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Navigation1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Navigation2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Navigation3" type="checkbox" value="10"/></div>
@@ -984,8 +1103,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Explorers use the Pilot Skill to fly anything from personal&#10;jump packs to small atmospheric craft—such as landers or&#10;gun-cutters—to void-faring fighter , bombers, and capital&#10;vessels. Under normal conditions, piloting does not require&#10;a Test, but unusual or difficult conditions such as storms,&#10;obstacles, or dangerous manoeuvres do require a Skill Test.&#10;When chasing another vehicle or ship or contesting for&#10;position, the Explorer make an Opposed Pilot Test against&#10;his opponent.&#10;&#10;Skill Groups:&#10;-Personal&#10;-Flyers&#10;-Space Craft&#10;&#10;-Skill Use: Half Action.&#10;-Category: Operator.">Pilot (Ag) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Pilot (Ag)</label>
+                    <b style="width:15%" title="Explorers use the Pilot Skill to fly anything from personal&#10;jump packs to small atmospheric craft—such as landers or&#10;gun-cutters—to void-faring fighter , bombers, and capital&#10;vessels. Under normal conditions, piloting does not require&#10;a Test, but unusual or difficult conditions such as storms,&#10;obstacles, or dangerous manoeuvres do require a Skill Test.&#10;&#10;When chasing another vehicle or ship or contesting for&#10;position, the Explorer make an Opposed Pilot Test against&#10;his opponent.&#10;&#10;Skill Groups:&#10;-Personal&#10;-Flyers&#10;-Space Craft&#10;&#10;-Skill Use: Half Action.&#10;-Category: Operator"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -996,7 +1116,7 @@
                 </div>
                 <fieldset class="repeating_pilot">
                     <div class="grid8">
-                        <input id="subitem" name="attr_Pilotname" type="text" placeholder="Skill Name"/>
+                        <input id="subitem" name="attr_Pilotname" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                         <div id="cbitem"><input name="attr_Pilot1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Pilot2" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Pilot3" type="checkbox" value="10"/></div>
@@ -1011,8 +1131,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Trade Skills allow the Explorer to create things, from contracts&#10;to starships. At the GM’s discretion, Explorers with this Skill&#10;can earn additional Profit Factor plying a trade.&#10;They can identify the work of particularly famous or infamous&#10;craftsmen, or recall information concerning items of their trade.&#10;Trade Tests can represent the work of hours, weeks, or months&#10;depending on the complexity of the task at hand. However,&#10;Tests that involve the examination of an item to recall&#10;information require a Full Action.&#10;&#10;Skill Groups:&#10;-Archaeologist (Int)&#10;-Armourer (Ag)&#10;-Astrographer (Ag)&#10;-Chymist (Int)&#10;-Cryptographer (Int)&#10;-Explorator (Int)&#10;-Linguist (Int)&#10;-Remembrancer (Ag or Int)&#10;-Shipwright (Int)&#10;-Soothsayer (Fel)&#10;-Technomat (Int)&#10;-Trader (Fel)&#10;-Voidfarer (Ag)&#10;&#10;-Skill Use: Variable depending on task and complexity.&#10;-Category: Crafting, Exploration.">Trade (Varies) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Trade (Varies)</label>
+                    <b style="width:15%" title="Trade Skills allow the Explorer to create things, from contracts&#10;to starships. At the GM’s discretion, Explorers with this Skill&#10;can earn additional Profit Factor plying a trade.&#10;They can identify the work of particularly famous or infamous&#10;craftsmen, or recall information concerning items of their trade.&#10;Trade Tests can represent the work of hours, weeks, or months&#10;depending on the complexity of the task at hand. However,&#10;Tests that involve the examination of an item to recall&#10;information require a Full Action.&#10;&#10;Skill Groups:&#10;-Archaeologist (Int)&#10;-Armourer (Ag)&#10;-Astrographer (Ag)&#10;-Chymist (Int)&#10;-Cryptographer (Int)&#10;-Explorator (Int)&#10;-Linguist (Int)&#10;-Remembrancer (Ag or Int)&#10;-Shipwright (Int)&#10;-Soothsayer (Fel)&#10;-Technomat (Int)&#10;-Trader (Fel)&#10;-Voidfarer (Ag)&#10;&#10;-Skill Use: Variable depending on task and complexity.&#10;-Category: Crafting, Exploration"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -1023,15 +1144,15 @@
                 </div>
                 <fieldset class="repeating_trade">
                     <div class="grid9">
-                        <input id="subitem" name="attr_Tradename" type="text" placeholder="Skill Name"/>
-                        <select name="attr_Tradecharacteristic" id="subitem" style="font-weight:bold">
-                            <option value="@{Strength}">(S)</option>
-                            <option value="@{Toughness}">(T)</option>
-                            <option value="@{Agility}">(Ag)</option>
-                            <option value="@{Intelligence}">(Int)</option>
-                            <option value="@{Perception}">(Per)</option>
-                            <option value="@{Willpower}">(WP)</option>
-                            <option value="@{Fellowship}">(Fel)</option>
+                        <input id="subitem" name="attr_Tradename" type="text" data-i18n-placeholder="name" placeholder="Name"/>
+                        <select name="attr_Tradecharacteristic" id="subitem">
+                            <option value="@{Strength}">S</option>
+                            <option value="@{Toughness}">T</option>
+                            <option value="@{Agility}">Ag</option>
+                            <option value="@{Intelligence}">Int</option>
+                            <option value="@{Perception}">Per</option>
+                            <option value="@{Willpower}">WP</option>
+                            <option value="@{Fellowship}">Fel</option>
                         </select>
                         <div id="cbitem"><input name="attr_Trade1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_Trade2" type="checkbox" value="0.5"/></div>
@@ -1047,8 +1168,9 @@
             </div>
             <div class="quickborder">
                 <div class="grid8">
-                    <label class="label1 help"
-                    title="Custom Skill Field:&#10;You can add here Customs Skills not present in the Rules.&#10;&#10;Remember to select the appropiate Characteristic to be used for these Skills&#10;&#10;-Skill Use: Variable.&#10;-Category: Custom.">Custom Skills (Varies) &#128712;</label>
+                    <div><label style="width:85%" class="label1">Custom Skills (Varies)</label>
+                    <b style="width:15%" title="Add here Customs Skills not present in the Rules.&#10;Select the appropiate Characteristic to be used&#10;&#10;The NPC option equals Characteristic Score (0)&#10;&#10;-Skill Use: Variable.&#10;-Category: Custom, NPC"
+                    >?</b></div>
                     <label class="label2">Basic</label>
                     <label class="label2">Trained</label>
                     <label class="label2">+10</label>
@@ -1059,17 +1181,18 @@
                 </div>
                 <fieldset class="repeating_customskill">
                     <div class="grid9">
-                        <input id="subitem" name="attr_CustomSkillname" type="text" placeholder="Skill Name"/>
-                        <select name="attr_CustomSkillcharacteristic" id="subitem" style="font-weight:bold">
-                            <option value="@{WeaponSkill}">(WS)</option>
-                            <option value="@{BallisticSkill}">(BS)</option>
-                            <option value="@{Strength}">(S)</option>
-                            <option value="@{Toughness}">(T)</option>
-                            <option value="@{Agility}">(Ag)</option>
-                            <option value="@{Intelligence}">(Int)</option>
-                            <option value="@{Perception}">(Per)</option>
-                            <option value="@{Willpower}">(WP)</option>
-                            <option value="@{Fellowship}">(Fel)</option>
+                        <input id="subitem" name="attr_CustomSkillname" type="text" data-i18n-placeholder="name" placeholder="Name"/>
+                        <select name="attr_CustomSkillcharacteristic" id="subitem">
+                            <option value="@{WeaponSkill}">WS</option>
+                            <option value="@{BallisticSkill}">BS</option>
+                            <option value="@{Strength}">S</option>
+                            <option value="@{Toughness}">T</option>
+                            <option value="@{Agility}">Ag</option>
+                            <option value="@{Intelligence}">Int</option>
+                            <option value="@{Perception}">Per</option>
+                            <option value="@{Willpower}">WP</option>
+                            <option value="@{Fellowship}">Fel</option>
+                            <option value="0">NPC</option>
                         </select>
                         <div id="cbitem"><input name="attr_CustomSkill1" type="checkbox" value="0.5"/></div>
                         <div id="cbitem"><input name="attr_CustomSkill2" type="checkbox" value="0.5"/></div>
@@ -1078,12 +1201,12 @@
                         <input id="subitem" name="attr_CustomSkillTalentBonus" type="number" value="0"/>
                         <input id="subitem" name="attr_CustomSkillOtherBonus" type="number" value="0"/>
                         <button name="roll_CustomSkill" type="roll" id="subitem"
-                            value="@{gmroll}&{template:custom} {{name=**@{character_name} Test Custom Skill: @{CustomSkillName}**}} {{dosdof=[[(((  ([[(@{CustomSkill}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+                            value="@{gmroll}&{template:custom} {{name=**@{character_name} Tests @{CustomSkillName}**}} {{dosdof=[[(((  ([[(@{CustomSkill}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                             <input name="attr_CustomSkill" type="text" disabled value="(floor((@{CustomSkill1}+@{CustomSkill2})*@{CustomSkillcharacteristic}))+@{CustomSkill3}+@{CustomSkill4}+@{CustomSkillTalentBonus}+@{CustomSkillOtherBonus}"></input></button>
                     </div>
                 </fieldset>
             </div>
-        </div><!-- adv kill rightbox -->
+        </div>
     </div><!-- grid2 groups -->
 </div>
 <!-- Combat Tab %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
@@ -1091,23 +1214,20 @@
 <div class="grid2">
     <!-- Left Side Weapons and Tools -->
     <div class="leftbox">
-        <h2>Ranged Weapons &#11216;</h2>
+        <h2>Ranged Weapons</h2>
         <fieldset class="repeating_rangedweapons">
             <div class="quickborder">
-                <input name="attr_Rangedweaponname" style="width:61.5%" type="text" placeholder="Weapon Name" title="Weapon Name"/>
+                <input name="attr_Rangedweaponname" style="width:61.5%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                 <div class="spacing" style="width:0.5%"></div>
-                <button name="roll_Rangedattack" type="roll" style="width:14%" title="Rolls Ballistic Skill + Modifiers"
+                <button name="roll_Rangedattack" type="roll" style="width:14%"
                 value="@{gmroll}&{template:custom} {{name=@{character_name} attacks with @{Rangedweaponname}}} {{dosdof=[[(((  ([[(@{BallisticSkill} + (@{gunaimbonus}) + (@{gunrangebonus}) + (@{rangedweaponmod}) + (@{gunactionbonus}) + (?{Modifier|0}))]] - [[@{gundice}]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100a= $[[1]] }} {{attack= }} {{hitloc= $[[1]] }}">
                     <label>Attack!</label></button>
-                <!-- CRP testing kept here for testing -->
-                <!--<button style="width:14%" type="action" name="act_guncrp" title="Rolls Ballistic Skill + Modifiers">Attack!</button>
-                <input type="hidden" name="attr_gunroll" value="@{gmroll}&{template:custom} {{name=@{character_name} attacks with @{repeating_rangedweapons_Rangedweaponname}}} {{dosdof=[[(((  ([[(@{BallisticSkill} + (@{repeating_rangedweapons_gunaimbonus}) + (@{repeating_rangedweapons_gunrangebonus}) + (@{repeating_rangedweapons_rangedweaponmod}) + (@{repeating_rangedweapons_gunactionbonus}) + (?{Modifier|0}))]] - [[@{repeating_rangedweapons_gundice}]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100a= $[[1]] }} {{attack= }} {{hitloc= $[[1]] }}"/>-->
                 <div class="spacing" style="width:0.5%"></div>
-                <button name="roll_RangedDamage" type="roll" style="width:14%" title="Rolls Weapon Damage"
+                <button name="roll_RangedDamage" type="roll" style="width:14%"
                 value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{Rangedweaponname} deals}} @{gunquality} {{t1=@{Rangedweapontype} Damage!}} {{p1=Pen @{Rangedweaponpen} vs AP}} {{xd10=[[1d10!]]}}">
                     <label>Damage</label></button>
                 <div class="spacing" style="width:0.5%"></div>
-                <button name="roll_rangedweaponspecial" type="roll" style="width:9%" title="Show Weapon Qualities in Chat"
+                <button name="roll_rangedweaponspecial" type="roll" style="width:9%"
                 value="@{gmroll}&{template:custom} {{name=**@{Rangedweaponname}**}} {{d1=Rng: **@{Rangedweaponrange}**&nbsp;&nbsp;RoF: **@{Rangedweaponsingle}/@{Rangedweaponsemi}/@{Rangedweaponfull}**&nbsp;&nbsp;Rld: **@{Rangedweaponreload}**}} {{desc=@{rangedweaponspecial} }}">
                     <label class="shct">R</label></button>
                 <!-- end of line -->
@@ -1140,7 +1260,7 @@
                     <option disabled style="background:gray;font-weight:bold;color:white">Run and Gun</option>
                     <option value="0" >Semi Auto (+0)</option>
                     <option value="-10" >Full Auto (-10)</option>
-                    <option disabled style="background:gray;font-weight:bold;color:white">Permits half-move after attack&nbsp;</option>
+                    <option disabled style="background:gray;font-weight:bold;color:white">Permits half-move after attack</option>
                 </select>
                 <div class="spacing" style="width:0.5%"></div>
                 <select name="attr_gundice" style="width:17%">
@@ -1150,14 +1270,14 @@
                     <option value="1d100cs1cf>91" >Overheats (91+)</option>
                     <option value="1d100cs1cf>91" >Unreliable (91+)</option>
                     <option value="1d100cs1cf101" >Best Craft (No Jam)</option>
-                    <option disabled style="background:gray;font-weight:bold;color:white">Reliable rolls 1d10 on jam&nbsp;</option>
+                    <option disabled style="background:gray;font-weight:bold;color:white">Reliable rolls 1d10 on jam</option>
                 </select>
-                <div class="spacing" style="width:4%"></div>
-                <label style="width:7%">Clip</label>
+                <div class="spacing" style="width:3%"></div>
+                <label style="width:8%">Clip</label>
                 <input name="attr_Rangedweaponclip" style="width:8%" type="number" value="0" title="Current"/>
                 <input name="attr_Rangedweaponclip_max" style="width:8%" type="number" value="0" title="Maximum"/>
                 <div class="spacing" style="width:0.5%"></div>
-                <input type="checkbox" style="width:3%" name="attr_hiderangedweaponspecial" value="1" class="arrow icon" title="Hide Special Qualities"></input>
+                <input type="checkbox" style="width:3%" name="attr_hiderangedweaponspecial" value="1" class="arrow icon"></input>
                 <!-- end of line -->
             <div class="hbody">
                 <input name="attr_Rangedweaponrange" style="width:16%" type="text" placeholder="Range" title="Range"/>
@@ -1169,7 +1289,7 @@
                 <div class="spacing" style="width:2%"></div>
                 <input name="attr_rangedweapondamage" style="width:25%" type="text" placeholder="Damage" title="Damage Dice"/>
                 <select name="attr_Rangedweapontype" style="width:11%">
-                    <option disabled style="background:gray;font-weight:bold;color:white">Damage Type&nbsp;</option>
+                    <option disabled style="background:gray;font-weight:bold;color:white">Damage Type</option>
                     <option value="Energy" selected>(E) Energy</option>
                     <option value="Explosive">(X) Explosive</option>
                     <option value="Impact">(I) Impact</option>
@@ -1188,14 +1308,15 @@
                     <option value="Undefined">Undefined</option>
                 </select>
                 <!-- end of line -->
-                <label style="width:7%">Pen</label>
+                <label style="width:8%">Pen</label>
                 <input name="attr_Rangedweaponpen" style="width:7%" type="number" value="0"/>
-                <div class="spacing" style="width:1.5%"></div>
-                <label style="width:11%" class="help" title="Fixed Test modifiers for Attack roll&#10;&#10;Example: Red-Dot Sight (+10)">Mod &#128712;</label>
+                <div class="spacing" style="width:2.5%"></div>
+                <b style="width:6%" title="Fixed Test modifiers for Attack roll&#10;Example: Red-Dot Sight (+10)">?</b>
+                <i style="width:3%">&#10095;</i>
                 <input name="attr_Rangedweaponmod" style="width:9%" type="number" value="0"/>
                 <div class="spacing" style="width:1.5%"></div>
                 <select name="attr_Rangedweaponcraft" style="width:20%">
-                    <option disabled style="background:gray;font-weight:bold;color:white;">Craftsmanship&nbsp;</option>
+                    <option disabled style="background:gray;font-weight:bold;color:white;">Craftsmanship</option>
                     <option value="Poor">Poor</option>
                     <option value="Common" selected>Common</option>
                     <option value="Good">Good</option>
@@ -1235,15 +1356,15 @@
                     <option disabled style="background:gray;font-weight:bold;color:white">See WIKI for Proven Quality</option>
                 </select>
                 <!-- end of line -->
-                <textarea style="height:65px" name="attr_rangedweaponspecial" placeholder="Special Qualities"></textarea>
+                <textarea style="height:65px" name="attr_rangedweaponspecial" data-i18n-placeholder="special" placeholder="Special"></textarea>
             </div><!--hbody closing-->
             </div>
         </fieldset>
         <div class="spacing" style="width:100%"></div>
-        <h2>Melee Weapons &#9876;</h2>
+        <h2>Melee Weapons</h2>
         <fieldset class="repeating_meleeweapons">
             <div class="quickborder">
-                <input name="attr_meleeweaponname" style="width:61.5%" type="text" placeholder="Weapon Name" title="Weapon Name"/>
+                <input name="attr_meleeweaponname" style="width:61.5%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                 <div class="spacing" style="width:0.5%"></div>
                 <button name="roll_meleeweaponattack" type="roll" style="width:14%" title="Rolls Weapon Skill + Modifiers"
                 value="@{gmroll}&{template:custom} {{name=@{character_name} attacks with @{meleeweaponname}}} {{dosdof=[[(((  ([[(@{WeaponSkill} + (@{meleeaimbonus}) + (@{meleeactionbonus}) + (@{meleeweaponmod}) + (?{Modifier|0}))]] - [[1d100cs1cf101]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100a= $[[1]] }} {{attack= }} {{hitloc= $[[1]] }}">
@@ -1273,33 +1394,35 @@
                     <option value="-10" >Guarded A. (-10)</option>
                     <option value="-20" >Called Shot (-20)</option>
                 </select>
-                <div class="spacing" style="width:1.5%"></div>
-                <label style="width:11%" class="help" title="Fixed Test modifiers for Attack roll&#10;&#10;Example: Best Craftsmanship (+10)">Mod &#128712;</label>
+                <div class="spacing" style="width:0.5%"></div>
+                <b style="width:4%" title="Fixed Test modifiers for Attack roll&#10;Example: Best Craftsmanship (+10)">?</b>
+                <i style="width:3%">&#10095;</i>
                 <input name="attr_meleeweaponmod" style="width:6%" type="number" value="0"/>
-                <div class="spacing" style="width:1%"></div>
-                <button name="roll_meleeweaponstun" type="roll" style="width:10%" title="Rolls Weapon Skill -20 (Stun) + Modifiers"
+                <div class="spacing" style="width:2%"></div>
+                <button name="roll_meleeweaponstun" type="roll" style="width:13%" title="Rolls Weapon Skill -20 (Stun) + Modifiers"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} Strikes to Stun with @{meleeweaponname}**}} {{dosdof=[[(((  ([[(@{WeaponSkill}+@{meleeaimbonus}+@{meleeactionbonus}+(@{meleeweaponmod}) - 20 + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{stun= }} {{hitloc= [[(1d10 + @{SB})]] Attacker Stun Damage vs Defender's Head&#10;1d10 + TB  + AP (Head)}}">
                     <label>Stun</label></button>
                 <div class="spacing" style="width:0.5%"></div>
-                <button name="roll_meleeweaponparry" type="roll" style="width:10%" title="Rolls Weapon Skill +/- Parry Modifiers"
+                <button name="roll_meleeweaponparry" type="roll" style="width:13%" title="Rolls Weapon Skill +/- Parry Modifiers"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} tries to Parry with @{meleeweaponname}**}} {{testtarget=[[(@{WeaponSkill}) + (@{meleeparrymod}) + (?{Other Modifiers|0}) ]] }} {{d100=[[1d100cs1cf100]] }} {{parry= }} {{d100h=@{meleeweaponpf}}}">
                     <label>Parry</label></button>
                 <div class="spacing" style="width:0.5%"></div>
-                <input style="width:3%" type="checkbox" name="attr_meleeweaponpf" value="[[1d100cf<25cs>26]]" title="Check if this weapon has an active Power Field (Quality)"></input>
-                <div class="spacing" style="width:1%"></div>
-                <label style="width:11%" class="help" title="Fixed Test modifiers for Parry roll&#10;&#10;Example: Balanced Quality (+10)">Mod &#128712;</label>
+                <input style="width:3%" type="checkbox" name="attr_meleeweaponpf" value="[[1d100cf<25cs>26]]"></input>
+                <i style="width:3%">&#10094;</i>
+                <b style="width:4%" title="Left Side: Check if this weapon has an active Power Field (Quality)&#10;&#10;Right Side: Fixed Test modifiers for Parry roll&#10;Example: Balanced Quality (+10)">?</b>
+                <i style="width:3%">&#10095;</i>
                 <input name="attr_meleeparrymod" style="width:6%" type="number" value="0"/>
                 <div class="spacing" style="width:1%"></div>
-                <input style="width:3%" type="checkbox" name="attr_hidemeleeweaponspecial" value="1" class="arrow icon" title="Hide Special Qualities"></input>
+                <input style="width:3%" type="checkbox" name="attr_hidemeleeweaponspecial" value="1" class="arrow icon"></input>
                 <!-- end of line-->
                 <div class="hbody">
                     <input name="attr_meleerangext" style="width:10%" type="text" placeholder="Range" title="Melee Extended Range&#10;&#10;Mostly used by Whips"/>
                     <div class="spacing" style="width:1%"></div>
                     <input name="attr_meleeweapondamage" style="width:18%" type="text" placeholder="Damage" title="Damage Dice"/>
                     <div class="spacing" style="width:0.5%"></div>
-                    <label style="width:7.5%" title="Strength Bonus is already added to this weapon's Damage Roll">+SB</label>
+                    <label style="width:7.5%" class="help" title="Strength Bonus is already added to this weapon's Damage Roll">+SB</label>
                     <select name="attr_meleeweapontype" style="width:10%">
-                        <option disabled style="background:gray;font-weight:bold;color:white">Damage Type&nbsp;</option>
+                        <option disabled style="background:gray;font-weight:bold;color:white">Damage Type</option>
                         <option value="Energy">(E) Energy</option>
                         <option value="Explosive">(X) Explosive</option>
                         <option value="Impact">(I) Impact</option>
@@ -1310,7 +1433,7 @@
                     <input name="attr_meleeweaponpen" style="width:6%" type="number" value="0" title="Penetration"/>
                     <div class="spacing" style="width:1%"></div>
                     <select name="attr_meleeweaponcraft" style="width:17%">
-                        <option disabled style="background:gray;font-weight:bold;color:white">Craftsmanship&nbsp;</option>
+                        <option disabled style="background:gray;font-weight:bold;color:white">Craftsmanship</option>
                         <option value="Poor">Poor</option>
                         <option value="Common" selected>Common</option>
                         <option value="Good">Good</option>
@@ -1324,78 +1447,75 @@
                         <option disabled style="background:gray;font-weight:bold;color:white">See WIKI for Proven Quality</option>
                     </select>
                     <!-- end of line-->
-                    <textarea style="height:65px" name="attr_meleeweaponspecial" placeholder="Special Qualities"></textarea>
+                    <textarea style="height:65px" name="attr_meleeweaponspecial" data-i18n-placeholder="special" placeholder="Special"></textarea>
                 </div><!--hbody closing div -->
             </div>
         </fieldset>
         <div>
-            <div class="spacing" style="width:28%"></div>
-            <label style="width:40%">IMPROVISED WEAPONS</label>
-            <input type="checkbox" name="attr_hideimprovised" value="1" class="arrow icon" title="Hide these weapons" style="margin-bottom:5px"/>
-            <div class="spacing" style="width:28%"></div>
+            <label style="width:68%; text-align:right">IMPROVISED WEAPONS</label>
+            <input type="checkbox" name="attr_hideimprovised" value="1" class="arrow icon" style="width:5%; margin-bottom:5px"/>
+            <div class="spacing" style="width:27%"></div>
             <div class="hbody">
-                <span style="width:5%" class="info" title="Unarmed attacks are Melee only, they are considered Primitive&#10;&#10;All Armour Points are doubled against hits from Primitive weapons,&#10;unless the armour also has the Primitive quality.">&#128712;</span>
-                <label style="width:28%">Unarmed:</label>
+                <b style="width:5%" title="Unarmed attacks are Melee only, they are considered Primitive&#10;&#10;All Armour Points are doubled against hits from Primitive weapons,&#10;unless the armour also has the Primitive quality.">?</b>
+                <label style="width:28%; text-align:center">Unarmed:</label>
                 <input name="attr_Unarmeddmg" style="width:13%" type="text" value="1d5-3"/>
                 <div class="spacing" style="width:1%"></div>
-                <label style="width:11%; cursor:help" title="Strength Bonus already added to Unarmed Damage roll&#10;&#10;Damage Type: Impact">+SB (I)</label>
-                <div class="spacing" style="width:3%"></div>
-                <button name="roll_unarmedattack" type="roll" style="width:12%"
+                <label style="width:11%; cursor:help" title="Strength Bonus added&#10;&#10;Damage Type: Impact">+SB (I)</label>
+                <div class="spacing" style="width:1%"></div>
+                <button name="roll_unarmedattack" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} attacks Unarmed!**}} {{dosdof=[[(((  ([[(@{WeaponSkill} + ?{is defender armed?|Yes (-20),-20|No (+0),0} + ?{Aim Bonus|No,0|Half,+10|Full,+20} + ?{Modifier|0})]] - [[1d100cs1]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100a= $[[1]] }} {{attack= }} {{hitloc= $[[1]] }}">
                     <label>Attack</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_unarmedgrapple" type="roll" style="width:12%"
+                <button name="roll_unarmedgrapple" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} tries to Grapple the opponent!**}} {{dosdof=[[(((  ([[(@{WeaponSkill}+?{Action|Standard(+0),0|Charge!(+10),+10}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                     <label>Grapple</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_unarmeddamage" type="roll" style="width:12%"
+                <button name="roll_unarmeddamage" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} Unarmed Attack deals**}} {{d1=[[@{Unarmeddmg}+@{SB}]] **Impact Damage**}} {{desc=**Primitive**}}">
                     <label>Damage</label></button>
                 <!-- end of line-->
-                <span style="width:5%" class="info" title="Improv. Melee weapons are considered Primitive and Unbalanced&#10;&#10;All Armour Points are doubled against hits from Primitive weapons,&#10;unless the armour also has the Primitive quality.&#10;&#10;Unbalanced(quality): -10 penalty to Parry">&#128712;</span>
-                <label style="width:28%">Improv.(melee):</label>
+                <b style="width:5%" title="Improv. Melee weapons are considered Primitive and Unbalanced&#10;&#10;All Armour Points are doubled against hits from Primitive weapons,&#10;unless the armour also has the Primitive quality.&#10;&#10;Unbalanced(quality): -10 penalty to Parry">?</b>
+                <label style="width:28%; text-align:center">Imp. Melee:</label>
                 <input name="attr_improvdmg" style="width:13%" type="text" value="1d10-2"></input>
                 <div class="spacing" style="width:1%"></div>
-                <label style="width:11%; cursor:help" title="Strength Bonus already added to Improv. Damage macro&#10;&#10;Damage Type: Impact">+SB (I)</label>
-                <div class="spacing" style="width:3%"></div>
-                <button name="roll_improvattack" type="roll" style="width:12%"
+                <label style="width:11%; cursor:help" title="Strength Bonus added&#10;&#10;Damage Type: Impact">+SB (I)</label>
+                <div class="spacing" style="width:1%"></div>
+                <button name="roll_improvattack" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} attacks with an Improvised Weapon!**}} {{dosdof=[[(((  ([[(@{WeaponSkill} + ?{Aim Bonus|No,0|Half,+10|Full,+20} + ?{Modifier|0})]] - [[1d100cs1]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100a= $[[1]] }} {{attack= }} {{hitloc= $[[1]] }}">
                     <label>Attack</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_meleeparry" type="roll" style="width: 12%" title="Rolls Weapon Skill -10 (Unbalanced) + Modifiers"
+                <button name="roll_meleeparry" type="roll" style="width: 13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} tries to Parry with Improvised Weapon**}} {{testtarget=[[(@{WeaponSkill}) + (-10) + (?{Other Modifiers|0}) ]] }} {{d100=[[1d100cs1]] }} {{parry= }}">
                     <label>Parry</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_improvdamage" type="roll" style="width:12%"
+                <button name="roll_improvdamage" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name}'s Improvised Weapon deals**}} {{d1=[[@{improvdmg}+@{SB}]] **Impact Damage**}} {{desc=**Primitive**}}">
                     <label>Damage</label></button>
                 <!-- end of line-->
-                <span style="width:5%" class="info"
-                title="Range equals Strenght Bonus&#10;&#10;For each degree of success,&#10;this distance increases by a factor of one,&#10;so one degree means that the character throws&#10;the object a number of metres equal to twice his SB,&#10;&#10;two degrees means that the object is thrown&#10;a number of metres equal to three times his SB,&#10;and so forth.&#10;&#10;On a failed test, the object flies a number of metres&#10;equal to half his Strength Bonus (round down)&#10;a result of 0 means it fell at his feet.">&#128712;</span>
-                <label style="width:28%">Improv.(thrown):</label>
+                <b style="width:5%" title="Range equals Strenght Bonus&#10;&#10;For each degree of success,&#10;this distance increases by a factor of one,&#10;so one degree means that the character throws&#10;the object a number of metres equal to twice his SB,&#10;&#10;two degrees means that the object is thrown&#10;a number of metres equal to three times his SB,&#10;and so forth.&#10;&#10;On a failed test, the object flies a number of metres&#10;equal to half his Strength Bonus (round down)&#10;a result of 0 means it fell at his feet.">?</b>
+                <label style="width:28%; text-align:center">Imp. Thrown:</label>
                 <input name="attr_improvdmgt" style="width:13%; text-align:center" type="text" value="1d10-2"></input>
                 <div class="spacing" style="width:1%"></div>
-                <label style="width:11%; cursor:help" title="Strength Bonus already added to Improv. Damage macro&#10;&#10;Damage Type: Impact">+SB (I)</label>
-                <div class="spacing" style="width:3%"></div>
-                <button name="roll_improvattackt" type="roll" style="width:12%"
+                <label style="width:11%; cursor:help" title="Strength Bonus added&#10;&#10;Damage Type: Impact">+SB (I)</label>
+                <div class="spacing" style="width:1%"></div>
+                <button name="roll_improvattackt" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} throws an Improvised Weapon!**}} {{dosdof=[[(((  ([[(@{BallisticSkill} + ?{Aim Bonus|No,0|Half,+10|Full,+20} + ?{Modifier|0})]] - [[1d100cs1]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100a= $[[1]] }} {{attack= }} {{hitloc= $[[1]] }}">
                     <label>Attack</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_improvdamaget" type="roll" style="width:12%"
+                <button name="roll_improvdamaget" type="roll" style="width:13%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name}'s Improvised Weapon deals**}} {{d1=[[@{improvdmgt}+@{SB}]] **Impact Damage**}} {{desc=**Primitive**}}">
                     <label>Damage</label></button>
                 <div class="spacing" style="width:4%"></div>
-                <span name="attr_SB" style="text-align:center;font-weight:bold" title="Range = SB"></span>
-                <span style="text-align:center;font-weight:bold" title="Range = SB">m</span>
+                <span name="attr_SB"></span>
+                <span>m</span>
             </div>
         </div>
         <div>
-            <div class="spacing" style="width:30%"></div>
-            <label style="width:36%">ARMOUR EQUIPPED</label>
-            <input type="checkbox" name="attr_hidearmour" value="1" class="arrow icon" title="Hide this section" style="margin-bottom:5px"/>
-            <div class="spacing" style="width:30%"></div>
+            <label style="width:66%; text-align:right">ARMOUR EQUIPPED</label>
+            <input type="checkbox" name="attr_hidearmour" value="1" class="arrow icon" style="width:5%; margin-bottom:5px"/>
+            <div class="spacing" style="width:29%"></div>
             <div class="hbody">
-                <input name="attr_armourname" style="width:69%" type="text" placeholder="Armour Name"/>
+                <input name="attr_armourname" style="width:69%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                 <div class="spacing" style="width:0.5%"></div>
                 <select name="attr_armourcraft" style="width:18%">
                     <option disabled style="background:gray;font-weight:bold;color:white;">Craftsmanship</option>
@@ -1407,34 +1527,36 @@
                 <div class="spacing" style="width:0.5%"></div>
                 <button name="roll_armourdesc" type="roll" style="width:12%" value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{armourname}}} {{desc=@{armournotes} }}"><label class="shct" title="Send to Chat">R</label></button>
                 <!-- end of line-->
-                <label style="width:11%" class="help" title="Armour based Characteristic Modifiers&#10;&#10;To apply Modifiers, check the box to the right&#10;&#10;These modifiers will change the Characteristics Scores above&#10;Mainly provided by Power Armour or Xenotech"
-                >Mod &#128712;</label>
-                <input style="margin-bottom:5px" name="attr_patoggle" type="checkbox" value="1" title="Toggle Characteristic Modifiers"/>
-                <div class="spacing" style="width:3%"></div>
-                <label style="width:7%">WS:</label>
+                <label class="fancyButton" style="width:13%"
+                     title="Armour based Characteristic Modifiers&#10;&#10;To apply Modifiers, click here.&#10;&#10;These modifiers will change the Characteristics Scores above&#10;Mainly provided by Power Armour or Xenotech">
+                    <input type="checkbox" name="attr_patoggle" value="1" hidden="true"/>
+                    <div><b>?</b></div>
+                </label>
+                <label style="width:10%; text-align:right">WS</label>
+                <div class="spacing" style="width:1%"></div>
                 <input style="width:7%" name="attr_pamws" type="number" value="0"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:7%">BS:</label>
+                <label style="width:8%; text-align:right">BS</label>
+                <div class="spacing" style="width:1%"></div>
                 <input style="width:7%" name="attr_pambs" type="number" value="0"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:5%">S:</label>
+                <label style="width:8%; text-align:right">S</label>
+                <div class="spacing" style="width:1%"></div>
                 <input style="width:7%" name="attr_pams" type="number" value="0"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:7%">Ag:</label>
+                <label style="width:8%; text-align:right">Ag</label>
+                <div class="spacing" style="width:1%"></div>
                 <input style="width:7%" name="attr_pamag" type="number" value="0"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:7%">Per:</label>
+                <label style="width:8%; text-align:right">Per</label>
+                <div class="spacing" style="width:1%"></div>
                 <input style="width:7%" name="attr_pamper" type="number" value="0"/>
-                <input type="checkbox" name="attr_hidearmourdesc" style="width:6%" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_armournotes" placeholder="Description"></textarea></div>
+                <input type="checkbox" name="attr_hidearmourdesc" style="width:5%" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_armournotes" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>
         </div>
-        <h2>Force Fields &#128498;</h2>
+        <h2>Force Fields</h2>
         <fieldset class="repeating_forcefields">
             <div class="quickborder">
-                <input name="attr_FieldName" style="width:50%" type="text" placeholder="Field Name"/>
+                <input name="attr_FieldName" style="width:50%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
                 <div class="spacing" style="width:0.5%"></div>
-                <input name="attr_fieldrating"  style="width:10%" type="number" placeholder="Rating" title="Field Rating"/>
+                <input name="attr_fieldrating"  style="width:10%" type="number" placeholder="Rating"/>
                 <div class="spacing" style="width:0.5%"></div>
                 <select name="attr_fieldcraft" style="width:18%">
                     <option disabled style="background:gray;font-weight:bold;color:white;">Craftsmanship</option>
@@ -1445,42 +1567,42 @@
                     <option disabled style="background:gray;font-weight:bold;color:white;">Overload Chance (%)&nbsp;</option>
                 </select>
                 <div class="spacing" style="width:0.5%"></div>
-                <button name="roll_forcefield" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{FieldName}...**}} {{testtarget=[[@{fieldrating}]] Rating}} {{d100=[[@{fieldcraft}]] }} {{field= }}">
-                    <span id="tinyroll" title="Rolls Force Field deflection chance">0</span></button>
+                <button name="roll_forcefield" type="roll" style="width:8%; font-size:20px" value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{FieldName}...}} {{testtarget=[[@{fieldrating}]] Rating}} {{d100=[[@{fieldcraft}]] }} {{field= }}"></button>
                 <div class="spacing" style="width:0.5%"></div>
-                <button name="roll_fielddesc" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{FieldName}**}} {{desc=@{FieldNotes} }}"><label class="shct" title="Send to Chat">R</label></button>
-                <input type="checkbox" name="attr_HideFieldNotes" style="width:4%" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_FieldNotes" placeholder="Field Description"></textarea></div>
+                <button name="roll_fielddesc" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{FieldName}**}} {{desc=@{FieldNotes} }}"><label class="shct">R</label></button>
+                <input type="checkbox" name="attr_HideFieldNotes" style="width:4%" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_FieldNotes" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>
         </fieldset>
     </div>
     <!-- Right Side Armour, Movement, initiative-->
     <div class="rightbox">
-        <div class="spacing" style="width:30%"></div>
-        <label class="fancyButton" style="width:40%">
-            <input type="checkbox" class="arrow arrow2" name="attr_vehtoggle" value="1" hidden="true" />
-            <div class="hbody" style="background-color: rgba(252, 0, 0, 0.64);">Switch to Vehicle</div>
-            <div class="hbody2" style="background-color: rgba(0, 181, 252, 0.64)">Switch to Character</div>
+        <div class="spacing" style="width:25%"></div>
+        <label class="fancyButton" style="width:50%">
+            <input type="checkbox" class="arrow arrow2" name="attr_vehtoggle" value="1" hidden="true"/>
+            <div class="hbody" style="background-color: rgba(252, 0, 0, 0.64); line-height: 22px;">Switch to Vehicle</div>
+            <div class="hbody2" style="background-color: rgba(0, 181, 252, 0.64); line-height: 22px;">Switch to Character</div>
         </label>
-        <input name="attr_vehtoggle" class="arrow arrow2 hidden" type="checkbox" value="1" hidden="true" />
-        <div class="spacing" style="width:30%"></div>
-        <div class="hbody"><!-- character info-->
+        <input name="attr_vehtoggle" class="arrow arrow2 hidden" type="checkbox" value="1" hidden="true"/>
+        <div class="spacing" style="width:25%"></div>
+        <div class="hbody">
+        <!-- character section-->
             <button name="roll_Initiative" type="roll" style="width:20%" title="Select your token first!&#10;Rolls 1d10 + Initiative Modifier&#10;&#10;Selector to the Right --->&#10;Contains available options."  
             value="@{gmroll}&{template:custom} {{name=**@{character_name} rolls Initiative**}} {{d1=**Initiative Modifier** [[@{inimod}]] }} {{Initiative Result= [[1d10+@{inimod}&{tracker&#125;]] }}">
                 <label>Roll Initiative</label></button>
             <div class="spacing" style="width:1%"></div>
             <select name="attr_inimod" style="width:21%">
                 <option disabled style="background:gray;font-weight:bold;color:white;">Select Initiative Modifier</option>
-                <option value="@{AB}[AB]" selected>Agility Bonus (Default)</option>
+                <option value="@{AB}[AB] - @{encumbered}[ENC]" selected>Agility Bonus (Default)</option>
                 <option value="@{IB}[IB]">Combat Formation (Int Bonus)</option>
                 <option value="@{PB}[PB]">Combat Sense (Per Bonus)</option>
-                <option value="(@{AB}*2)[ABx2]">Lightning Reflexes (Ag Bonus x2)</option>
-                <option value="(?{Custom Initiative Mod|0})">Custom</option>
+                <option value="(@{AB}*2)[ABx2] - @{encumbered}[ENC]">Lightning Reflexes (Ag Bonus x2)</option>
+                <option value="(?{Custom Initiative Mod|0} - @{encumbered}[ENC])">Custom</option>
                 <option disabled style="background:gray;font-weight:bold;color:white;">Paranoia Talent (+2)</option>
-                <option value="(@{AB}+2)[AB]">Agility Bonus (Default)</option>
+                <option value="(@{AB}+2)[AB] - @{encumbered}[ENC]">Agility Bonus (Default)</option>
                 <option value="(@{IB}+2)[IB]">Combat Formation (Int Bonus)</option>
                 <option value="(@{PB}+2)[PB]">Combat Sense (Per Bonus)</option>
-                <option value="((@{AB}*2)+2)[ABx2]">Lightning Reflexes (Ag Bonus x2)</option>
+                <option value="((@{AB}*2)+2)[ABx2] - @{encumbered}[ENC]">Lightning Reflexes (Ag Bonus x2)</option>
             </select>
             <div class="spacing" style="width:1%"></div>
             <button name="roll_FateInitiative" type="roll" style="width:20%" title="Select your token first!&#10;Use a Fate Point to get a 10&#10;on the initiative roll&#10;+ Initiative Modifier"  
@@ -1499,16 +1621,54 @@
             <div class="leftbox trask">
                 <br></br>
                 <div class="armourblock">&nbsp;</div>
-                <div class="quickborder armourblock"><label>Head</label><input name="attr_headAP" type="number" placeholder="AP" title="Armour Points (AP)" style="font-weight:bold"/><label>(1-10)</label><button name="roll_calchead" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Head!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + {@{headAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>&#128162;</label></button></div>
+                <div class="quickborder armourblock">
+                    <button name="roll_calchead" type="roll"
+                    value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Head!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + {@{headAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
+                        <label style="height:24px;" >Head</label><label style="height:24px; display:block;">&#128162;</label>
+                    </button>
+                    <label>(1-10)</label>
+                    <input name="attr_headAP" type="number" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                </div>
                 <br></br>
-                <div class="quickborder armourblock"><label>Arm R.</label><input name="attr_armrightAP" type="number" placeholder="AP" title="Armour Points (AP)" style="font-weight:bold; width:75%"/><input style="width:25%" type="checkbox" name="attr_BionicArmR" value="2" title="Bionic Limb? (+2 TB)"/><label>(11-20)</label><button name="roll_calcarmr" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Right Arm!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicArmR} + {@{armrightAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>&#128162;</label></button></div>
-                <div class="quickborder armourblock"><label>Body</label><input name="attr_bodyAP" type="number" placeholder="AP" title="Armour Points (AP)" style="font-weight:bold"/><label>(31-70)</label><button name="roll_calcbody" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Body!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + {@{bodyAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>&#128162;</label></button></div>
-                <div class="quickborder armourblock"><label>Arm L.</label><input style="width:25%" type="checkbox" name="attr_BionicArmL" value="2" title="Bionic Limb? (+2 TB)"/><input name="attr_armrleftAP" type="number" placeholder="AP" title="Armour Points (AP)" style="font-weight:bold; width:75%"/><label>(21-30)</label><button name="roll_calcarml" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Left Arm!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicArmL} + {@{armrleftAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>&#128162;</label></button></div>
-                <div class="quickborder armourblock" style="margin: auto auto auto 11%;"><label>Leg R.</label><input name="attr_legrightAP" type="number" placeholder="AP" title="Armour Points (AP)" style="font-weight:bold; width:75%"/><input style="width:25%" type="checkbox" name="attr_BionicLegR" value="2" title="Bionic Limb? (+2 TB)"/><label>(71-85)</label><button name="roll_calclegr" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Right Leg!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicLegR} + {@{legrightAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>&#128162;</label></button></div>
-                <div class="quickborder armourblock" style="margin: auto auto auto 11%;"><label>Leg L.</label><input style="width:25%" type="checkbox" name="attr_BionicLegL" value="2" title="Bionic Limb? (+2 TB)"/><input name="attr_legleftAP" type="number" placeholder="AP" title="Armour Points (AP)" style="font-weight:bold; width:75%"/><label>(86-100)</label><button name="roll_calclegl" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Left Leg!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicLegL} + {@{legleftAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>&#128162;</label></button></div>
+                <div class="quickborder armourblock">
+                    <button name="roll_calcarmr" type="roll" 
+                    value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Right Arm!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicArmR} + {@{armrightAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
+                        <label>Right Arm</label></button>
+                    <label>(11-20)</label>
+                    <input name="attr_armrightAP" type="number" style="width:75%" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                    <input style="width:25%" type="checkbox" name="attr_BionicArmR" value="2" title="Bionic Limb? (+2 TB)"/>
+                </div>
+                <div class="quickborder armourblock">
+                    <button name="roll_calcbody" type="roll" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Body!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + {@{bodyAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
+                        <label style="height:24px;" >Body</label><label style="height:24px; display:block;">&#128162;</label>    
+                    </button>
+                    <label>(31-70)</label>
+                    <input name="attr_bodyAP" type="number" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                </div>
+                <div class="quickborder armourblock">
+                    <button name="roll_calcarml" type="roll" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Left Arm!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicArmL} + {@{armrleftAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
+                        <label>Left Arm</label></button>
+                    <label>(21-30)</label>
+                    <input style="width:25%" type="checkbox" name="attr_BionicArmL" value="2" title="Bionic Limb? (+2 TB)"/>
+                    <input name="attr_armrleftAP" type="number" style="width:75%" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                </div>
+                <div class="quickborder armourblock" style="margin: auto auto auto 11%;">
+                    <button name="roll_calclegr" type="roll" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Right Leg!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicLegR} + {@{legrightAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
+                        <label>Right Leg</label></button>
+                    <label>(71-85)</label>
+                    <input name="attr_legrightAP" type="number" style="width:75%" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                    <input style="width:25%" type="checkbox" name="attr_BionicLegR" value="2" title="Bionic Limb? (+2 TB)"/>
+                </div>
+                <div class="quickborder armourblock" style="margin: auto auto auto 11%;">
+                    <button name="roll_calclegl" type="roll" value="@{gmroll}&{template:custom} {{name=@{character_name} was hit&#10;in the Left Leg!}} {{d10= [[((( ([[@{wounds}]] - [[{?{Damage Taken|0} - (@{TB} + @{BionicLegL} + {@{legleftAP} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
+                        <label>Left Leg</label></button>
+                    <label>(86-100)</label>
+                    <input style="width:25%" type="checkbox" name="attr_BionicLegL" value="2" title="Bionic Limb? (+2 TB)"/>
+                    <input name="attr_legleftAP" type="number" style="width:75%" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                </div>
             </div>
             <div class="rightbox">
-                <h2>Wounds &#128935;</h2>
+                <h2>Wounds</h2>
                 <label style="width:26%; font-size:13px">Starting:</label>
                 <button name="roll_startingwounds" type="roll" style="width:20%" value="@{gmroll}&{template:custom} {{name=@{character_name}}} {{d1=Starting Wounds [[1d5+?{Modifier|0}]]}}"><label>1d5+?</label></button>
                 <input name="attr_startingwoundsmod" type="number" style="width:13%" title="Type Roll result here."/>
@@ -1529,7 +1689,7 @@
                 <label style="width:75%">Critical Damage Level:</label>
                 <input name="attr_criticaldamage" type="number" style="width:25%"/>
                 <!--end of line-->
-                <h2>Critical Hits &#9888;</h2>
+                <h2>Critical Hits</h2>
                 <div>
                     <button name="roll_energycrit" type="roll" style="width:49.5%" value="@{gmroll}&{template:custom} {{name=**@{character_name} suffers an Energy Critical Hit!**}} {{desc=@{energycrit} }}">
                         <label>Energy (E)</label></button>
@@ -1731,7 +1891,7 @@
                             <option value="**Leg 10+**: With a meaty chop, the leg comes away at the hip. The target pitches to the ground **howling in agony, before dying moments later**.  The tide of blood is so intense that, for the remainder of the battle, anyone making a **Run or Charge Action within six metres** of the target's body must pass a **Challenging (+0) Agility Test or fall Prone**.">&#160;Leg 10+</option>
                     </select>
                     <!--end of line-->
-                    <button name="roll_bloodloss" type="roll" style="width:49.5%" value="@{othereffects}" title="Roll other detrimental effects"><label>Other Effects &#128712;</label></button>
+                    <button name="roll_bloodloss" type="roll" style="width:49.5%" value="@{othereffects}"><label>Conditions</label></button>
                     <div class="spacing" style="width:1%"></div>
                     <select name="attr_othereffects" style="width:49.5%">
                         <option value="@{gmroll}&{template:custom} {{name=@{character_name} is Bleeding Out!}} {{bloodloss=[[1d100cf>91cs<90]] }}">&#160;Blood-Loss</option>
@@ -1744,7 +1904,7 @@
                     </select>
                     <!--end of line-->
                     <button name="roll_scatter" type="roll" style="width:100%"
-                    value="@{gmroll}&{template:custom} {{name=**Scatter Diagram**}} {{scatter=[[1d8cf10cs9]]}} {{desc=[[1d5]] **1d5**}}"><label>Scatter Diagram &#10035;</label></button>
+                    value="@{gmroll}&{template:custom} {{name=**Scatter Diagram**}} {{scatter=[[1d8cf10cs9]]}} {{desc=[[1d5]] **1d5**}}"><label>Scatter Diagram</label></button>
                     <!--Size Select-->
                     <select name="attr_CharSize" style="width:100%">
                         <option disabled style="background:gray;font-weight:bold;color:white;">Size Modifier</option>
@@ -1761,200 +1921,170 @@
                     </select>
                 </div>
             </div>
-        </div>
+            </div>
             <!-- movement section-->
             <div>
-            <div class="spacing" style="width:10%"></div>
-            <label style="width:50%">MOVEMENT SCORE</label>
-            <label style="width:30%">movement halved?</label>
-            <select name="attr_movementhalved" style="width:10%">
-                <option value="1">No</option>
-                <option value="0.5">Yes</option>
-            </select>
-            <!-- end of line-->
-            <label style="width:23%">Normal Move</label>
-            <label style="width:8%">Half:</label>
-            <input name="attr_HalfMove" type="text" style="width:8%" title="Agility Bonus" value="ceil( (floor(@{Agility}/10) + (@{CharSize})) * @{movementhalved} )" disabled />
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Full:</label>
-            <input name="attr_FullMove" type="text" style="width:8%" title="Agility Bonus x2" value="ceil( ((floor(@{Agility}/10) + (@{CharSize}))*2) * @{movementhalved} )" disabled />
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:12%">Charge:</label>
-            <input name="attr_ChargeMove" type="text" style="width:8%" title="Agility Bonus x3" value="ceil( ((floor(@{Agility}/10) + (@{CharSize}))*3) * @{movementhalved} )" disabled />
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Run:</label>
-            <input name="attr_RunMove" type="text" style="width:8%" title="Agility Bonus x6" value="ceil( ((floor(@{Agility}/10) + (@{CharSize}))*6) * @{movementhalved} )" disabled />
-            <!-- end of line-->
-            <label style="width:23%">Custom Move</label>
-            <label style="width:8%">Half:</label>
-            <input name="attr_CustomHalfMove" type="number" style="width:8%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Full:</label>
-            <input name="attr_CustomFullMove" type="number" style="width:8%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:12%">Charge:</label>
-            <input name="attr_CustomChargeMove" type="number" style="width:8%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Run:</label>
-            <input name="attr_CustomRunMove" type="number" style="width:8%"/>
-            <!-- end of line-->
-            <label style="width:23%">Flyer Trait</label>
-            <label style="width:8%">Half:</label>
-            <input name="attr_FlyerHalfMove" type="number" style="width:8%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Full:</label>
-            <input name="attr_FlyerFullMove" type="number" style="width:8%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:12%">Charge:</label>
-            <input name="attr_FlyerChargeMove" type="number" style="width:8%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Run:</label>
-            <input name="attr_FlyerRunMove" type="number" style="width:8%"/>
-        </div>
-            <div>
-            <label style="width:14%" class="help" title="Base Leap distance equals SB x 1m">&#128712; Leap:</label>
-            <input name="attr_BaseLeap" type="text" style="width:8%" disabled value="@{SB}"/>
-            <div class="spacing" style="width:2%"></div>
-            <label style="width:14%" class="help" title="Base Jump height equals SB x 20cm">&#128712; Jump:</label>
-            <input name="attr_BaseJump" type="text" style="width:8%" disabled value="(@{SB}*20)"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:8%">Lift:</label>
-            <input name="attr_LiftCapacity" type="text" style="width:13%"  disabled value="(@{GearCarry}+@{LiftCapacityMod})&#42;2"/>
-            <div class="spacing" style="width:2%"></div>
-            <label style="width:9%">Push:</label>
-            <input  name="attr_PushCapacity" type="text" style="width:13%" disabled value="(@{GearCarry}+@{PushCapacityMod})&#42;4"/>
-            <input type="checkbox" name="attr_hidecustomjump" style="width:5.5%" value="1" checked="true" class="arrow icon" title="Show Custom Leap/Jump"></input>
-            <div class="hbody">
-                <label style="width:10%">Leap:</label>
-                <input name="attr_CustomLeap" type="number" style="width:8%" title="Base Leap distance equals SB x 1m"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:10%">Jump:</label>
-                <input name="attr_CustomJump" type="number" style="width:8%" title="Base Jump height equals SB x 20cm"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:15%">Lift Mod:</label>
-                <input name="attr_LiftCapacityMod" type="number" style="width:13%" value="0" title="Mod value is multiplied x2"/>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:17%">Push Mod:</label>
-                <input name="attr_PushCapacityMod" type="number" style="width:13%" value="0" title="Mod value is multiplied x4"/>
-            </div>
-        </div>
-            <!-- end of line-->
-            <input type="hidden" name="attr_GearCarry" value=""/><!-- hidden input needed for script -->
-            <label style="width:20%">Carry Max:</label>
-            <input name="attr_GearCarryMax" style="width:16%" type="text" disabled value="@{GearCarry}+@{GearCarryMod}"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:16%">Available:</label>
-            <input name="attr_GearCarryAvailable" style="width:16%" type="text" disabled value="(@{GearCarryMax}-(@{GearCarryCurrent}))"/>
-            <input type="hidden" name="attr_GearCarryCurrent" value="@{gearwt}"/><!-- hidden input needed for repeatingsum -->
-            <div class="spacing" style="width:4%"></div> 
-            <label style="width:9%">Mod:</label>
-            <input name="attr_GearCarryMod" style="width:16%" type="number" value="0" title="Mod value has No multiplier"/>
-            <!-- end of line-->
-            <div class="quickborder">
-			<div class="spacing" style="width:30%"></div>
-			<label style="width:37%; font-size: 16px;">GEAR AND TOOLS</label>
-            <input type="checkbox" name="attr_hidegearlist" value="1" class="arrow icon" title="Hide Gear List" style="width: 3%; margin-bottom:5px"/>
-            <div class="spacing" style="width:30%"></div>
-            <div class="hbody">
-                <fieldset class="repeating_gears">
-                    <input name="attr_GearName" style="width:63%" type="text" placeholder="Gear Name"/>
-                    <div class="spacing" style="width:0.5%"></div>
-                    <input name="attr_gearqty"  style="width:10%" type="number" placeholder="Qty." title="Quantity"/>
-                    <div class="spacing" style="width:0.5%"></div>
-                    <input name="attr_gearwt"  style="width:10%" type="number" placeholder="Wgt." title="Weight (Kg)"/>
-                    <div class="spacing" style="width:0.5%"></div>
-                    <button name="roll_geardesc" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{character_name} @{GearName}**}} {{d1= **Weight: @{gearwt} Kg**}} {{t1= **Quantity: @{gearqty}** }} {{desc= @{GearNotes} }}"><label class="shct" title="Send to Chat">R</label></button>
-                    <input type="checkbox" name="attr_HideGear" style="width:5.5%" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_GearNotes" placeholder="Gear Description"></textarea></div>
+                <label style="width:14%; text-align:right" class="help" title="Base Leap distance equals SB x 1m">Leap:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input name="attr_BaseLeap" type="text" style="width:8%" disabled value="@{SB}"/>
+                <label style="width:14%; text-align:right" class="help" title="Base Jump height equals SB x 20cm">Jump:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input name="attr_BaseJump" type="text" style="width:8%" disabled value="(@{SB}*20)"/>
+                <label style="width:33%; text-align:right">MOVEMENT</label>
+                <b style="width:6%" title="Unmodified Agility Bonus&#10;Normal = AB&#10;Halved = AB/2&#10;&#10;Combat Modifiers&#10;Half Move = AB&#10;Full Move = AB x2&#10;Charge = AB x3&#10;Run = AB x6">?</b>
+                <select name="attr_movementhalved" style="width:15%">
+                    <option value="1" >Normal</option>
+                    <option value="0.5" >Halved</option>
+                </select>
+                <!-- end of line-->
+                <label style="width:16%; text-align:right">Half:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:8%" name="attr_HalfMove" type="text" value="ceil( (floor(@{Agility}/10) + (@{CharSize}) - @{encumbered}) * @{movementhalved} )" disabled />
+                <label style="width:16%; text-align:right">Full:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:8%" name="attr_FullMove" type="text" value="ceil( ((floor(@{Agility}/10) + (@{CharSize}) - @{encumbered})*2) * @{movementhalved} )" disabled />
+                <label style="width:16%; text-align:right">Charge:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:8%" name="attr_ChargeMove" type="text" value="ceil( ((floor(@{Agility}/10) + (@{CharSize}) - @{encumbered})*3) * @{movementhalved} )" disabled />
+                <label style="width:16%; text-align:right">Run:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:8%" name="attr_RunMove" type="text" value="ceil( ((floor(@{Agility}/10) + (@{CharSize}) - @{encumbered})*6) * @{movementhalved} )" disabled />
+                <!-- end of line-->
+                <fieldset class="repeating_movementscore">
+                    <div class="spacing" style="width:25%"></div>
+                    <input name="attr_MoveName" style="width:50%" type="text" data-i18n-placeholder="traits" placeholder="Traits"/>
+                    <div class="spacing" style="width:25%"></div>
+                    <label style="width:16%; text-align:right">Half:</label>
+                    <div class="spacing" style="width:1%"></div>
+                    <input name="attr_CustomHalfMove" type="number" style="width:8%"/>
+                    <label style="width:16%; text-align:right">Full:</label>
+                    <div class="spacing" style="width:1%"></div>
+                    <input name="attr_CustomFullMove" type="number" style="width:8%"/>
+                    <label style="width:16%; text-align:right">Charge:</label>
+                    <div class="spacing" style="width:1%"></div>
+                    <input name="attr_CustomChargeMove" type="number" style="width:8%"/>
+                    <label style="width:16%; text-align:right">Run:</label>
+                    <div class="spacing" style="width:1%"></div>
+                    <input name="attr_CustomRunMove" type="number" style="width:8%"/>
                 </fieldset>
-            </div><!--hbody closing div-->
-        </div><!-- quickborder -->
-        </div><!--hbody-->
-        <div class="hbody2"><!-- vehicle info-->
-            <fieldset class="repeating_vehicles">
-            <div>
-                <input name="attr_Veh_name" type="text" style="width:100%; font-size:19px; font-weight:bold" placeholder="Vehicle Name"></input>
-                <label style="width:12%">Type:</label>
-                <select name="attr_VehType" style="width:23%">
-                    <option value="0">Ground</option>
-                    <option value="1">Walker</option>
-                    <option value="2">Skimmer</option>
-                    <option value="3">Flyer</option>
-                    <option value="4">Spacecraft</option>
-                </select>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:23%">Size Modifier:</label>
-                <select name="attr_VehSize" style="width:40%">
-                    <option value="10">Hulking (+10 to Hit)</option>
-                    <option value="20">Enormous (+20 to Hit)</option>
-                    <option value="30">Massive (+30 to Hit)</option>   
-                    <option value="40">Immense (+40) to Hit</option>
-                    <option value="50">Monumental (+50) to Hit</option>
-                    <option value="60">Titanic (+60) to Hit</option>
-                </select>
-                <label style="width:12%">Crew:</label>
-                <input name="attr_VehCrew" type="text" style="width:88%"></input>
-                <label style="width:30%">Carrying Capacity:</label>
-                <input name="attr_VehCapacity" type="text" style="width:70%"></input>
-                <h1>Defenses & Movement</h1>
-                <div class="spacing" style="width:1%"></div>
-                <button name="roll_calcfront" style ="width:18%" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{Veh_name} was hit&#10;on the Front!}} {{d10= [[((( ([[@{VehIntegrity}]] - [[{?{Damage Taken|0} - ({@{VehFront} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>Front &#128712;</label></button>
-                <div class="spacing" style="width:2%"></div>
-                <button name="roll_calcsides" style ="width:18%" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{Veh_name} was hit&#10;on the Side!}} {{d10= [[((( ([[@{VehIntegrity}]] - [[{?{Damage Taken|0} - ({@{VehSides} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>Sides &#128712;</label></button>
-                <div class="spacing" style="width:2%"></div>
-                <button name="roll_calcrear" style ="width:18%" type="roll" title="Calculate Damage to this Location" value="@{gmroll}&{template:custom} {{name=@{Veh_name} was hit&#10;on the Rear!}} {{d10= [[((( ([[@{VehIntegrity}]] - [[{?{Damage Taken|0} - ({@{VehRear} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>Rear &#128712;</label></button>
-                <div class="spacing" style="width:15%"></div>
-                <label style="width:13%">Integrity</label>
-                <div class="spacing" style="width:13%"></div>
-                <!-- input fields -->
-                <div class="spacing" style="width:1%"></div>
-                <input style="width:18%" name="attr_VehFront" type="number" placeholder="AP"></input>
-                <div class="spacing" style="width:2%"></div>
-                <input style="width:18%" name="attr_VehSides" type="number" placeholder="AP"></input>
-                <div class="spacing" style="width:2%"></div>
-                <input style="width:18%" name="attr_VehRear" type="number" placeholder="AP"></input>
-                <div class="spacing" style="width:2%"></div>
-                <input style="width:18%" name="attr_VehIntegrity" type="number" placeholder="Current"></input>
-                <div class="spacing" style="width:2%"></div>
-                <input style="width:18%" name="attr_VehIntegrity_max" type="number" placeholder="Total"></input>
-                <div class="spacing" style="width:1%"></div>
-                <!-- input fields -->
-                <label style="width:15%">Tactical:</label>
-                <input name="attr_VehTactical" type="text" style="width:38%"></input>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:19%">Availability:</label>
-                <select name="attr_VehAvailability" style="width:26%">
-                    <option value="Ubiquitous">Ubiquitous</option>
-                    <option value="Abundant">Abundant</option>
-                    <option value="Plentiful">Plentiful</option>                                
-                    <option value="Common">Common</option>
-                    <option value="Average" selected>Average</option>
-                    <option value="Scarce">Scarce</option>
-                    <option value="Rare">Rare</option>
-                    <option value="Very Rare">Very Rare</option>
-                    <option value="Extremely Rare">Extremely Rare</option>
-                    <option value="Near Unique">Near Unique</option>
-                    <option value="Unique">Unique</option>
-                </select>
-                <label style="width:15%">Cruising:</label>
-                <input name="attr_VehCruising" type="text" style="width:48%"></input>
-                <div class="spacing" style="width:2%"></div>
-                <label style="width:26%">Manoeuvrability:</label>
-                <input name="attr_VehManoeuvrability" type="number" style="width:9%"></input>
-                <label style="width:30%" class="help" title="If the Vehicle is driven/piloted by NPCs&#10;use the Skills tab to add NPC Pilot/Drive skill&#10;Use the skill Mod box to set the correct skill value&#10;&#10;For Vehicle weapons/gunners use the&#10;Weapon Mod box to set the correct BS value">NPC Crew Info &#128712;</label>
-                <button name="roll_VehCrit2" type="roll" style="width:70%" title="Shows Critical hit effects"
-                value="@{gmroll}&{template:custom} {{name=**@{Veh_name} suffers a Critical Hit!**}} {{desc= ?{Select|Critical 1 or 2, **Jarring Blow**&#10;The Impact tosses the vehicle around throwing anything inside about the interior compartments. Any Crew or passengers who are not strapped in or otherwise secured must make an **Ordinary (+10) Toughness Test or be Stunned for [[1d5]] Rounds**. All Shooting from the vehicle during the next Round suffers **-20 to hit**|
-                Critical 3,**Staggered**&#10;A direct hit on the armour surrounding the driver compartment leaves the pilot stunned and reeling. The Pilot or Driver must pass a **Challenging (+0) Toughness Test or be Stunned for [[1d5]] Rounds**. A ground vehicle comes to a screeching halt a skimmer will drift in the direction it last moved at its acceleration while a flyer will slowly tip over and begin a terminal dive unless the pilot comes to its senses and rights the aircraft|
-                Critical 4,**Weapon Destroyed**&#10;A randomly selected weapon on the vehicle is hit by the blast its twisted and melted beyond repair. The Weapon **no longer functions** and there is a 25% chance [[1d100cf>75]] of the weapon ammo cooking off. If it does so roll damage against the vehicle and any gunners manning the weapon as if the destroyed weapon had hit them **halving all damage rolled**|
-                Critical 5,**Drive Damaged**&#10;The hit tears off a tread or penetrates an air intake or tears into the grav generator housing doing severe damage. **Reduce the vehicle's tactical speed by [[2d10]] and Cruising Speed by half**. If this brings the tactical speed to **0** (or less) the vehicle is **immobilized**. Ground vehicles shudder to a halt while skimmers and flyers crash into the ground.|
-                Critical 6,**Penetrating Hit**&#10;The hit tears through the vehicle's armour leaving only useless shards of metal. **Reduce the vehicle's AP facing the hit by half**. If the hit was by a ranged weapon the shot rips through the interior of the vehicle as well. Each passenger and Crew has a **20% chance of being hit** [[1d100cf>80]] by the same shot and taking half the damage rolled. Also the vehicle is now open to the outside *which could be a problem if the vehicle is in a poisonous atmosphere or underwater or in a vacuum*|
-                Critical 7,**Fire**&#10;The vehicle catches fire as its fuel stores ignite or power reserves overload. Anyone inside must pass a **Difficult (-10) Agility Test or catch fire on every round they are inside the vehicle**. In addition each round there is a **20% chance** [[1d100cf>80]] the vehicle will **explode** (critical 11+)|
-                Critical 8 to 10,**Destroyed**&#10;The Hit wrecks the vehicle turning it into a shattered hulk. **Anyone inside** the vehicle takes [[2d10]] **Explosive Damage** and must pass a **Difficult (-10) Toughness Test or be Stunned for** [[1d10]] **Rounds**. Skimmers and Flyers crash to the ground.|
-                Critical 11+,**Explodes**&#10;A direct hit to ammo stores and or fuel tanks turns the vehicle into a raging fireball. **Anyone inside** takes [[5d10]] **Explosive Damage**. **Anyone within** [[2d10]] **meters** of the vehicle suffer [[2d10]] **Explosive Damage** as well. *If the vehicle has an open top or sides or hatches* then passengers and crew may take a **Challenging (+0) Dodge Test** to bail out at the last second. If they succeed they only take [[2d10]] **Explosive Damage**.} }}">
-                    <label>Critical Hit &#128712;</label></button>
-                <h1>Special Rules</h1>
-                <textarea style="height:200px" name="attr_VehSpecialRules"></textarea>
             </div>
+            <div class="spacing" style="width:100%; height:4px"></div>
+            <div class="quickborder">
+                <label style="width:18%; text-align:right">Lift:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:10%" name="attr_LiftCapacity" type="text" disabled value="(@{GearCarry}&#42;2)"/>
+                <label style="width:18%; text-align:right">Push:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:10%" name="attr_PushCapacity" type="text" disabled value="(@{GearCarry}&#42;4)"/>
+                <label style="width:18%; text-align:right">Carry:</label>
+                <div class="spacing" style="width:1%"></div>
+                <input style="width:10%" name="attr_GearCarryMax" type="text" disabled value="@{GearCarry}"/>
+                <i style="width:3%">&#10095;</i>
+                <input style="width:10%" name="attr_GearCarryAvailable" type="text" disabled value="(@{GearCarryMax}-(@{GearCarryCurrent}))"/>
+                <!-- hidden input needed for script -->
+                <input type="hidden" name="attr_GearCarry" value=""/>
+                <input type="hidden" name="attr_GearCarryCurrent" value="@{gearwt}"/>
+                <!-- end of line-->
+                <label style="width:60%; text-align:right" >GEAR AND TOOLS</label>
+                <input type="checkbox" name="attr_hidegearlist" value="1" class="arrow icon" style="width:5%; margin-bottom:5px"/>
+                <div class="spacing" style="width:5%"></div>
+                <label class="fancyButton" style="width:30%">
+                    <input type="checkbox" name="attr_encumbered" value="1" hidden="true"/>
+                    <div style="font-size:0px"><span style="width:80%;" data-i18n="encumbered">Encumbered</span>
+                    <b style="width:20%"  title="If a character attempts to Carry over his normal limits&#10;(but under his Lift limit), he is Encumbered.&#10;&#10;Encumbered character takes a –10 penalty to all movement&#10;related tests and reduces his Agility Bonus by 1 for the&#10;purposes of determining movement rates and Initiative.">?</b></div>
+                </label>
+                <div class="spacing" style="width:5%"></div>
+                <!-- end of line-->
+                <div class="hbody">
+                    <fieldset class="repeating_gears">
+                        <input name="attr_GearName" style="width:63%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
+                        <div class="spacing" style="width:0.5%"></div>
+                        <input name="attr_gearqty"  style="width:10%" type="number" placeholder="Qty." title="Quantity"/>
+                        <div class="spacing" style="width:0.5%"></div>
+                        <input name="attr_gearwt"  style="width:10%" type="number" placeholder="Wgt." title="Weight (Kg)"/>
+                        <div class="spacing" style="width:0.5%"></div>
+                        <button name="roll_geardesc" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{character_name} @{GearName}**}} {{d1= **Weight: @{gearwt} Kg**}} {{t1= **Quantity: @{gearqty}** }} {{desc= @{GearNotes} }}"><label class="shct">R</label></button>
+                        <input type="checkbox" name="attr_HideGear" style="width:5.5%" value="1" class="arrow icon"/>
+                        <div class="hbody"><textarea style="height:65px" name="attr_GearNotes" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
+                    </fieldset>
+                </div><!--hbody closing div-->
+            </div><!-- quickborder -->
+        </div><!--hbody character section-->
+        <div class="hbody2">
+        <!-- vehicle section-->
+            <fieldset class="repeating_vehicles">
+                <input name="attr_Veh_name" type="text" style="width:95%; font-size:19px; height:24px;" data-i18n-placeholder="name" placeholder="Name"/>
+                <input style="width:5%; font-size:20px" type="checkbox" name="attr_hidevehsheet" value="1" class="arrow icon"/>
+                <div class="hbody">
+                    <select name="attr_VehType" style="width:29%">
+                        <option disabled style="background:gray;font-weight:bold;color:white;">Vehicle Type</option>
+                        <option value="0" selected>Ground</option>
+                        <option value="1">Walker</option>
+                        <option value="2">Skimmer</option>
+                        <option value="3">Flyer</option>
+                        <option value="4">Spacecraft</option>
+                    </select>
+                    <div class="spacing" style="width:1%"></div>
+                    <select name="attr_VehSize" style="width:40%">
+                        <option disabled style="background:gray;font-weight:bold;color:white;">Size Modifier</option>
+                        <option value="10" selected>Hulking (+10 to Hit)</option>
+                        <option value="20">Enormous (+20 to Hit)</option>
+                        <option value="30">Massive (+30 to Hit)</option>   
+                        <option value="40">Immense (+40) to Hit</option>
+                        <option value="50">Monumental (+50) to Hit</option>
+                        <option value="60">Titanic (+60) to Hit</option>
+                    </select>
+                    <label style="width:24%; text-align:right">NPC Crew</label>
+                    <b style="width:6%" title="If the Vehicle is piloted by NPCs&#10;use Custom Skill NPC option (Skills tab)&#10;Use the skill Mod box to set the correct skill value&#10;&#10;For vehicle Gunners use the Fixed Modifiers&#10;box to set the correct BS/WS value">?</b>
+                    <!-- end of line -->
+                    <label style="width:32%; text-align:center">Tactical Speed:</label>
+                    <input style="width:68%" name="attr_VehTactical" type="text"/>
+                    <label style="width:32%; text-align:center">Cruising Speed:</label>
+                    <input style="width:68%" name="attr_VehCruising" type="text"/>
+                    <!-- end of line -->
+                    <label style="width:32%; text-align:center">Manoeuvrability:</label>
+                    <input style="width:10%" name="attr_VehManoeuvrability" type="text"/>
+                    <div class="spacing" style="width:2%"></div>
+                    <button name="roll_VehCrit2" type="roll" style="width:56%"
+                    value="@{gmroll}&{template:custom} {{name=**@{Veh_name} suffers a Critical Hit!**}} {{desc= ?{Select|Critical 1 or 2, **Jarring Blow**&#10;The Impact tosses the vehicle around throwing anything inside about the interior compartments. Any Crew or passengers who are not strapped in or otherwise secured must make an **Ordinary (+10) Toughness Test or be Stunned for [[1d5]] Rounds**. All Shooting from the vehicle during the next Round suffers **-20 to hit**|
+                    Critical 3,**Staggered**&#10;A direct hit on the armour surrounding the driver compartment leaves the pilot stunned and reeling. The Pilot or Driver must pass a **Challenging (+0) Toughness Test or be Stunned for [[1d5]] Rounds**. A ground vehicle comes to a screeching halt a skimmer will drift in the direction it last moved at its acceleration while a flyer will slowly tip over and begin a terminal dive unless the pilot comes to its senses and rights the aircraft|
+                    Critical 4,**Weapon Destroyed**&#10;A randomly selected weapon on the vehicle is hit by the blast its twisted and melted beyond repair. The Weapon **no longer functions** and there is a 25% chance [[1d100cf>75]] of the weapon ammo cooking off. If it does so roll damage against the vehicle and any gunners manning the weapon as if the destroyed weapon had hit them **halving all damage rolled**|
+                    Critical 5,**Drive Damaged**&#10;The hit tears off a tread or penetrates an air intake or tears into the grav generator housing doing severe damage. **Reduce the vehicle's tactical speed by [[2d10]] and Cruising Speed by half**. If this brings the tactical speed to **0** (or less) the vehicle is **immobilized**. Ground vehicles shudder to a halt while skimmers and flyers crash into the ground.|
+                    Critical 6,**Penetrating Hit**&#10;The hit tears through the vehicle's armour leaving only useless shards of metal. **Reduce the vehicle's AP facing the hit by half**. If the hit was by a ranged weapon the shot rips through the interior of the vehicle as well. Each passenger and Crew has a **20% chance of being hit** [[1d100cf>80]] by the same shot and taking half the damage rolled. Also the vehicle is now open to the outside *which could be a problem if the vehicle is in a poisonous atmosphere or underwater or in a vacuum*|
+                    Critical 7,**Fire**&#10;The vehicle catches fire as its fuel stores ignite or power reserves overload. Anyone inside must pass a **Difficult (-10) Agility Test or catch fire on every round they are inside the vehicle**. In addition each round there is a **20% chance** [[1d100cf>80]] the vehicle will **explode** (critical 11+)|
+                    Critical 8 to 10,**Destroyed**&#10;The Hit wrecks the vehicle turning it into a shattered hulk. **Anyone inside** the vehicle takes [[2d10]] **Explosive Damage** and must pass a **Difficult (-10) Toughness Test or be Stunned for** [[1d10]] **Rounds**. Skimmers and Flyers crash to the ground.|
+                    Critical 11+,**Explodes**&#10;A direct hit to ammo stores and or fuel tanks turns the vehicle into a raging fireball. **Anyone inside** takes [[5d10]] **Explosive Damage**. **Anyone within** [[2d10]] **meters** of the vehicle suffer [[2d10]] **Explosive Damage** as well. *If the vehicle has an open top or sides or hatches* then passengers and crew may take a **Challenging (+0) Dodge Test** to bail out at the last second. If they succeed they only take [[2d10]] **Explosive Damage**.} }}">
+                        <label data-i18n="crit-table">Critical Hit Table</label></button>
+                    <!-- end of line -->
+                    <div class="spacing" style="width:1%"></div>
+                    <button name="roll_calcfront" style ="width:18%" type="roll" value="@{gmroll}&{template:custom} {{name=@{Veh_name} was hit&#10;on the Front!}} {{d10= [[((( ([[@{VehIntegrity}]] - [[{?{Damage Taken|0} - ({@{VehFront} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>Front</label></button>
+                    <div class="spacing" style="width:2%"></div>
+                    <button name="roll_calcsides" style ="width:18%" type="roll" value="@{gmroll}&{template:custom} {{name=@{Veh_name} was hit&#10;on the Side!}} {{d10= [[((( ([[@{VehIntegrity}]] - [[{?{Damage Taken|0} - ({@{VehSides} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>Sides</label></button>
+                    <div class="spacing" style="width:2%"></div>
+                    <button name="roll_calcrear" style ="width:18%" type="roll" value="@{gmroll}&{template:custom} {{name=@{Veh_name} was hit&#10;on the Rear!}} {{d10= [[((( ([[@{VehIntegrity}]] - [[{?{Damage Taken|0} - ({@{VehRear} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}"><label>Rear</label></button>
+                    <div class="spacing" style="width:2%"></div>
+                    <label style="width:38%; text-align:center">Structural Integrity</label>
+                    <div class="spacing" style="width:1%"></div>
+                    <!-- input fields -->
+                    <div class="spacing" style="width:1%"></div>
+                    <input style="width:18%" name="attr_VehFront" type="number" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                    <div class="spacing" style="width:2%"></div>
+                    <input style="width:18%" name="attr_VehSides" type="number" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                    <div class="spacing" style="width:2%"></div>
+                    <input style="width:18%" name="attr_VehRear" type="number" data-i18n-placeholder="armour-points-acronim" placeholder="AP"/>
+                    <div class="spacing" style="width:2%"></div>
+                    <input style="width:17%" name="attr_VehIntegrity_max" type="number"/>
+                    <i style="width:4%">&#10095;</i>
+                    <input style="width:17%" class="cur" name="attr_VehIntegrity" type="number"/>
+                    <div class="spacing" style="width:1%"></div>
+                    <!-- end of line -->
+                    <label style="width:25%; text-align:center">Crew:</label>
+                    <input name="attr_VehCrew" type="text" style="width:75%"></input>
+                    <label style="width:34%; text-align:center">Carrying Capacity:</label>
+                    <input name="attr_VehCapacity" type="text" style="width:66%"></input>
+                    <!-- input fields -->
+                    <textarea style="height:200px" name="attr_VehSpecialRules" data-i18n-placeholder="special" placeholder="Special"></textarea>
+                </div>
             </fieldset>
         </div><!--hbody2-->
 	</div><!-- rightbox -->
@@ -1962,89 +2092,89 @@
 </div>
 <!-- Talents Tab %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <div class="talent">
-    <h3>Talents</h3>
+    <h1>Talents</h1>
     <div class="grid2">
         <div class="leftbox">
             <fieldset class="repeating_talents1">
                 <div class="quickborder">
-                    <input style="width:85%" name="attr_TalentName1" type="text" placeholder="Talent Name"></input>
+                    <input style="width:85%" name="attr_TalentName1" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Talent1" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{TalentName1} Talent**}} {{desc=@{TalentNotes1}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{TalentName1} Talent}} {{desc=@{TalentNotes1}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_Hidetalent1" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_TalentNotes1" placeholder="Talent Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_Hidetalent1" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height:65px" name="attr_TalentNotes1" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>    
             </fieldset>
         </div>
         <div class="rightbox">
             <fieldset class="repeating_talents2">
                 <div class="quickborder">
-                    <input style="width:85%" name="attr_TalentName2" type="text" placeholder="Talent Name"></input>
+                    <input style="width:85%" name="attr_TalentName2" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Talent2" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{TalentName2} Talent**}} {{desc=@{TalentNotes2}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{TalentName2} Talent}} {{desc=@{TalentNotes2}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_Hidetalent2" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_TalentNotes2" placeholder="Talent Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_Hidetalent2" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height:65px" name="attr_TalentNotes2" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
     </div>
-    <h3>Traits</h3>
+    <h1>Traits</h1>
     <div class="grid2">
         <div class="leftbox">
             <fieldset class="repeating_traits1">
                 <div class="quickborder">
-                    <input style="width:85%" name="attr_TraitName1" type="text" placeholder="Trait Name"></input>
+                    <input style="width:85%" name="attr_TraitName1" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Trait1" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{TraitName1} Trait**}} {{desc=@{TraitNotes1}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{TraitName1} Trait**}} {{desc=@{TraitNotes1}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_Hidetrait1" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height: 65px" name="attr_TraitNotes1" placeholder="Trait Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_Hidetrait1" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height: 65px" name="attr_TraitNotes1" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
         <div class="rightbox">
             <fieldset class="repeating_traits2">
                 <div class="quickborder">
-                    <input style="width:85%" name="attr_TraitName2" type="text" placeholder="Trait Name"></input>
+                    <input style="width:85%" name="attr_TraitName2" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Trait2" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{TraitName2} Trait**}} {{desc=@{TraitNotes2}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{TraitName2} Trait**}} {{desc=@{TraitNotes2}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_Hidetrait2" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height: 65px" name="attr_TraitNotes2" placeholder="Trait Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_Hidetrait2" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height: 65px" name="attr_TraitNotes2" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
     </div>
-    <h3>Cybernetics and Implants</h3>
+    <h1>Cybernetics and Implants</h1>
     <div class="grid2">
         <div class="lefttbox">
             <fieldset class="repeating_cybernetics1">
                 <div class="quickborder">
-                    <input style="width:85%" name="attr_CyberName1" type="text" placeholder="Implant Name"></input>
+                    <input style="width:85%" name="attr_CyberName1" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Cyber1" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{CyberName1} Implant**}} {{desc=@{CyberNotes1}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{CyberName1} Implant**}} {{desc=@{CyberNotes1}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_HideCyber1" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height: 65px" name="attr_CyberNotes1" placeholder="Implant Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_HideCyber1" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height: 65px" name="attr_CyberNotes1" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
         <div class="rightbox">
             <fieldset class="repeating_cybernetics2">
                 <div class="quickborder">
-                    <input style="width:85%" name="attr_CyberName2" type="text" placeholder="Implant Name"></input>
+                    <input style="width:85%" name="attr_CyberName2" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Cyber2" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{CyberName2} Implant**}} {{desc=@{CyberNotes2}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{CyberName2} Implant**}} {{desc=@{CyberNotes2}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_HideCyber2" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height: 65px" name="attr_CyberNotes2" placeholder="Implant Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_HideCyber2" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height: 65px" name="attr_CyberNotes2" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
@@ -2052,40 +2182,36 @@
     <!--Insanity and Corruption-->
     <div class="grid2">
         <div class="leftbox">
-            <h3>Insanity Points (IP)</h3>
-            <div class="spacing" style="width:1%"></div>
-            <button type="roll" name="roll_feartest" style="width:20%" title="Tests Willpower minus Fear Rating&#10;&#10;If failed, roll the Shock Table" 
-            value="@{gmroll}&{template:custom} {{name=@{character_name} tries to resist Fear}} {{dosdof=[[(((  ([[(@{Willpower} + (?{Fear Rating|Fear 1 Disturbing (-0),+0|Fear 2 Frightening (-10),-10|Fear 3 Horrifying (-20),-20|Fear 4 Terrifying (-30),-30}) + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-                <label>Fear Test</label></button>
+            <h1>Insanity Points (IP)</h1>
+            <button type="roll" name="roll_feartest" style="width:42%"
+            value="@{gmroll}&{template:custom} {{name=@{character_name} tries to resist Fear}} {{shocktable=[[(((  (((( [[( @{Willpower} + (?{Fear Rating|Fear 1 Disturbing (-0),+0|Fear 2 Frightening (-10),-10|Fear 3 Horrifying (-20),-20|Fear 4 Terrifying (-30),-30}) + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100)*10) - [[1d100]])*-1  )))]]}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{d10=[[1d10]]}} {{xd10=[[2d10]]}} {{d5=[[1d5]]}} {{xd5=[[1d5+1]]}}">
+                <div class="spacing" style="width:10%"></div>
+                <label style="width:78%">Fear and Shock Test</label>
+                <b style="width:12%" title="Creatures with the Fear Trait or Horrible situations&#10;forces the character to take a Fear Test.&#10;(Willpower minus Fear Rating)&#10;&#10;If failed, the character suffers an effect&#10;from the Shock table 10-4: 1d100 + (DoF x 10)">?</b>
+            </button>
             <div class="spacing" style="width:2%"></div>
-            <button type="roll" name="roll_shocktable" style="width:20%" title="Rolls the Shock Table" 
-            value="@{gmroll}&{template:custom} {{name=@{character_name} rolls on&#10;The Shock Table}} {{shocktable=[[1d100cs1cf100 + (?{Degrees of Failure?|0}*10) ]]}} {{d10=[[1d10]]}} {{xd10=[[2d10]]}} {{d5=[[1d5]]}} {{xd5=[[1d5+1]]}}">
-                <label>Shock Table</label></button>
+            <input name="attr_insanity" type="number" value="0" min="0" max="100" style="width:11%"/>
             <div class="spacing" style="width:2%"></div>
-            <input name="attr_insanity" type="number" value="0" min="0" max="100" style="width:10%; font-weight:bold" title="Total Insanity Points"></input>
-            <div class="spacing" style="width:2%"></div>
-            <button type="roll" name="roll_traumatest" style="width:20%" title="Tests Willpower +/- Trauma Modifier" 
-            value="@{gmroll}&{template:custom} {{name=@{character_name} tries to resist Mental Trauma}} {{dosdof=[[(((  ([[(@{Willpower} + (@{traumamod}) + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-                <label>Trauma Test</label></button>
-            <div class="spacing" style="width:2%"></div>
-            <button type="roll" name="roll_traumatable" style="width:20%" title="Rolls the Trauma Table" 
-            value="@{gmroll}&{template:custom} {{name=@{character_name} rolls on&#10;The Trauma Table}} {{traumatable=[[1d100cs1cf100 + (?{Degrees of Failure?|0}*10) ]]}} {{d10=[[1d10]]}} {{xd10=[[3d10]]}} {{d5=[[1d5]]}}">
-                <label>Trauma Table</label></button>
+            <button type="roll" name="roll_traumatest" style="width:42%"
+            value="@{gmroll}&{template:custom} {{name=@{character_name} tries to resist Mental Trauma}} {{traumatable=[[(((  (((( [[( @{Willpower} + (@{traumamod}) )]] - [[1d100cs1cf100]] ) * 100 % 999 % 100)*10) - [[1d100]])*-1  )))]] }} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{d10=[[1d10]]}} {{xd10=[[3d10]]}} {{d5=[[1d5]]}}">
+                <div class="spacing" style="width:10%"></div>
+                <label style="width:78%">Mental Trauma Test</label>
+                <b style="width:12%" title="When the character gains increments of 10 IP&#10;(10,20,30...) he must take a Mental Trauma Test.&#10;(Willpower +/- Trauma Modifier)&#10;&#10;If failed, the character gains a Mental Trauma&#10;from table 10-6: 1d100 + (DoF x 10)">?</b>
+            </button>
             <div class="spacing" style="width:1%"></div>
             <!--end of line-->
-            <div class="spacing" style="width:1%"></div>
-            <label style="width:32%" class="help" title="Each time the character gains&#10;10 Insanity Points he must make a Trauma Test.&#10;&#10;The Trauma modifier is automatically applied to the test.&#10;&#10;If failed, roll the Trauma Table."
-            >Degree of Madness &#128712;</label>
-            <input style="width:66%" name="attr_madnessdegree" type="text" value="" readonly/>
+            <input style="width:99%" name="attr_madnessdegree" type="text" value="" readonly/>
             <input name="attr_traumamod" type="hidden" value="0"/>
             <div class="spacing" style="width:1%"></div>
-            <!--end of line-->        
-            <h1 class="help" title="A character automatically gains a new disorder&#10;each time he gets a number of IP.&#10;&#10;40 Insanity Points = Minor Disorder&#10;60 Insanity Points = Severe Disorder&#10;80 Insanity Points = Acute Disorder"
-            >Mental Disorders &#128712;</h1>
+            <!--end of line-->
+            <label style="width:66%; text-align:right;">MENTAL DISORDERS</label>
+            <b style="width:6%" title="A character automatically gains a new disorder&#10;or a more severe version of an existing disorder&#10;when his total IP reaches:&#10;&#10;40 Insanity Points = Minor Disorder&#10;60 Insanity Points = Severe Disorder&#10;80 Insanity Points = Acute Disorder">?</b>
+            <div class="spacing" style="width:27%"></div>
+            <!--end of line-->
             <fieldset class="repeating_disorders">
-                <input name="attr_DisorderName" type="text" style="width:70%" placeholder="Disorder Name"></input>
+                <input name="attr_DisorderName" type="text" style="width:66%" data-i18n-placeholder="name" placeholder="Name"></input>
                 <div class="spacing" style="width:1%"></div>
-                <select name="attr_disorderseverity" style="width:14%">
+                <select name="attr_disorderseverity" style="width:18%">
                     <option disabled style="background:gray;font-weight:bold;color:white;">Severity</option>
                     <option value="Minor" selected>Minor</option>
                     <option value="Severe">Severe</option>
@@ -2093,34 +2219,39 @@
                 </select>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_Disorder" type="roll" style="width:10%"
-                value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{disordername}**}} {{Severity=**@{disorderseverity}**}} {{desc=@{disorderdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
+                value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{disordername}}} {{Severity=@{disorderseverity}}} {{desc=@{disorderdesc}}}"><label class="shct">R</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <input type="checkbox" style="width:3%" name="attr_HideDisorder" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea name="attr_disorderdesc" style="height:65px" placeholder="Description"></textarea></div>
+                <input type="checkbox" style="width:3%" name="attr_HideDisorder" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea name="attr_disorderdesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </fieldset>
         </div>
         <div class="rightbox">
-            <h3>Corruption Points (CP)</h3>
-            <div class="spacing" style="width:2%"></div>
-            <button name="roll_Malignancy" type="roll" style="width:40%" title="Tests Willpower minus Malignancy Modifier"
+            <h1>Corruption Points (CP)</h1>
+            <div class="spacing" style="width:1%"></div>
+            <button name="roll_Malignancy" type="roll" style="width:42%"
             value="@{gmroll}&{template:custom} {{name=@{character_name} tries to resist a Malignancy}} {{dosdof=[[(((  ([[(@{Willpower} + (@{MaligMod}) + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-                <label>Malignancy Test</label></button>
+                <div class="spacing" style="width:10%"></div>
+                <label style="width:78%">Malignancy Test</label>
+                <b style="width:12%" title="When the character's CP reaches 30, 60 or 90&#10;he must take a Malignancy Test.&#10;(Willpower minus Malignancy Modifier)&#10;&#10;If failed, roll the Malignancy Table">?</b>
+            </button>
             <div class="spacing" style="width:2%"></div>
-            <input name="attr_Corruption" type="number" value="0" min="0" max="100" style="width:12%; font-weight:bold" title="Total Corruption Points"></input>
-            <div class="spacing" style="width:2%"></div>
-            <button name="roll_MaligTable" type="roll" style="width:40%"
-            value="@{gmroll}&{template:custom} {{name=@{character_name} rolls on&#10;The Malignancy Table}} {{maligtable=[[1d100]]}} {{d10=[[1d10]]}}"><label>Malignancy Table</label></button>
+            <input name="attr_Corruption" type="number" value="0" min="0" max="100" style="width:11%"/>
             <div class="spacing" style="width:2%"></div>
+            <button name="roll_MaligTable" type="roll" style="width:42%"
+            value="@{gmroll}&{template:custom} {{name=@{character_name} rolls on&#10;The Malignancy Table}} {{maligtable=[[1d100]]}} {{d10=[[1d10]]}}">
+                <div class="spacing" style="width:10%"></div>
+                <label style="width:78%">Malignancy Table</label>
+                <b style="width:12%" title="Rolls a 1d100 on table 10-8 with No modifiers&#10;&#10;If a character gets a result that he has previously suffered&#10;for failing a previous Malignancy Test, he must roll again.">?</b>
+            </button>
             <!--end of line-->
             <div class="spacing" style="width:1%"></div>
-            <label style="width:35%" class="help" title="Each time the character gains&#10;30 Corruption Points he must make a Malignancy Test.&#10;&#10;The Malignancy modifier is automatically applied to the test.&#10;&#10;If failed, roll the Malignancy Table."
-            >Degree of Corruption &#128712;</label>
-            <input style="width:63%" name="attr_corruptiondegree" type="text" value="" readonly/>
+            <input style="width:99%" name="attr_corruptiondegree" type="text" value="" readonly/>
             <input name="attr_MaligMod" type="hidden" value="0"/>
-            <div class="spacing" style="width:1%"></div>
             <!--end of line-->
-            <h1 class="help" title="Each time the character gains&#10;30 Corruption Points he must also make a Mutation Test.&#10;&#10;The Character must successfully test against two characteristics&#10;If either test fails, roll on the Mutation Table&#10;&#10;NOTE: The character may not Test against the same Characteristics twice&#10;Use the checkboxes to note which characteristics have been used&#10;&#10;Navigators roll on the Navigator Mutation Table."
-            >Mutation Tests &#128712;</h1>
+            <label style="width:64%; text-align:right;">MUTATION TESTS</label>
+            <b style="width:6%" title="When the character's CP reaches 30, 60 or 90&#10;he must also make a Mutation Test.&#10;&#10;The Character must successfully test against two characteristics&#10;If either test fails, roll on the Mutation Table&#10;&#10;NOTE: The character may not Test against the same Characteristics twice&#10;Use the checkboxes to note which characteristics have been used&#10;&#10;Navigators roll on the Navigator Mutation Table.">?</b>
+            <div class="spacing" style="width:29%"></div>
+            <!--end of line-->
             <button name="roll_MutationS" type="roll" style="width:10%"
             value="@{gmroll}&{template:custom} {{name=**@{character_name} tries to resist Mutation using Strength**}} {{dosdof=[[(((  ([[(@{Strength}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                 <label>S</label></button>
@@ -2168,30 +2299,30 @@
             <input type="checkbox" style="width:3%" name="attr_MutCBF" value="1"/>
             <div class="spacing" style="width:27%"></div>
             <!--end of line-->
-            <h1>Malignancies</h1>
+            <h2>Malignancies</h2>
             <fieldset class="repeating_malignancies">
-                <input style="width:85%" name="attr_MaligName" type="text" placeholder="Malignancy Name"></input>
+                <input style="width:85%" name="attr_MaligName" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_malignancydesc" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{maligname}**}} {{desc=@{maligdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
+                <button name="roll_malignancydesc" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{maligname}**}} {{desc=@{maligdesc}}}"><label class="shct">R</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <input style="width:3%" type="checkbox" name="attr_HideMalig" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea name="attr_Maligdesc" style="height:65px" placeholder="Malignancy Description"></textarea></div>
+                <input style="width:3%" type="checkbox" name="attr_HideMalig" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea name="attr_Maligdesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </fieldset>
-            <h1>Mutations</h1>
+            <h2>Mutations</h2>
             <fieldset class="repeating_mutations">
-                <input style="width:85%" name="attr_MutationName" type="text" placeholder="Mutation Name"></input>
+                <input style="width:85%" name="attr_MutationName" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                 <div class="spacing" style="width:1%"></div>
-                <button name="roll_mutationdesc" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{MutationName}**}} {{desc=@{mutationdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
+                <button name="roll_mutationdesc" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{MutationName}**}} {{desc=@{mutationdesc}}}"><label class="shct">R</label></button>
                 <div class="spacing" style="width:1%"></div>
-                <input style="width:3%" type="checkbox" name="attr_hidemutationdesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea name="attr_mutationdesc" style="height:65px" placeholder="Description"></textarea></div>
+                <input style="width:3%" type="checkbox" name="attr_hidemutationdesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea name="attr_mutationdesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </fieldset>
 		</div>
 	</div>
 </div>
 <!-- Npcs and Companions Tab %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <div class="npcs">
-<h1>Add NPC</h1>
+<h2>Add NPC</h2>
     <fieldset class="repeating_npc">
         <div class="quickborder" style="width:96%; display:inline-block">
         <!-- NPC info lines -->
@@ -2216,7 +2347,7 @@
                 <input name="attr_NPCAvailabililty" type="text" style="width:20%"></input>
             </div>
         </div>
-        <input name="attr_NPChidedetails" type="checkbox" class="arrow icon" style="width:4%; top:-32px; font-size:40px" value="1" title="Hide NPC details"/>
+        <input name="attr_NPChidedetails" type="checkbox" class="arrow icon" style="width:4%; top:-32px; font-size:40px" value="1"/>
         <!-- hiddable section containing everything -->
         <div class="hbody">
             <div class="grid2">
@@ -2234,45 +2365,45 @@
                         <button name="roll_NPCFeR" style=" width: 11%" type="roll" value="@{gmroll}&{template:custom} {{name=**@{NPC_Name} Test Fellowship**}} {{dosdof=[[(((  ([[(@{NPCFel}-@{NPCfat}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"><label>Fel</label></button>
                     </div>
                     <div>
-                        <input name="attr_NPCWS" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCBS" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCS" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCT" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCAg" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCInt" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCPer" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCWP" type="number" value="0" style="width:11%; font-weight:bold"/>
-                        <input name="attr_NPCFel" type="number" value="0" style="width:11%; font-weight:bold"/>
+                        <input name="attr_NPCWS" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCBS" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCS" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCT" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCAg" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCInt" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCPer" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCWP" type="number" value="0" style="width:11%"/>
+                        <input name="attr_NPCFel" type="number" value="0" style="width:11%"/>
                     </div>
                     <div>
                         <div class="spacing" style="width:24.5%"></div>
-                        <input name="attr_NPCSB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCSB" type="number" style="width:6%" value="0"/>
                         <div class="spacing" style="width:5%"></div>
-                        <input name="attr_NPCTB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCTB" type="number" style="width:6%" value="0"/>
                         <div class="spacing" style="width:5%"></div>
-                        <input name="attr_NPCAB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCAB" type="number" style="width:6%" value="0"/>
                         <div class="spacing" style="width:5%"></div>
-                        <input name="attr_NPCIB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCIB" type="number" style="width:6%" value="0"/>
                         <div class="spacing" style="width:5%"></div>
-                        <input name="attr_NPCPB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCPB" type="number" style="width:6%" value="0"/>
                         <div class="spacing" style="width:5%"></div>
-                        <input name="attr_NPCWPB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCWPB" type="number" style="width:6%" value="0"/>
                         <div class="spacing" style="width:5%"></div>
-                        <input name="attr_NPCFB" type="number" style="width:6%; font-weight:bold" value="0"/>
+                        <input name="attr_NPCFB" type="number" style="width:6%" value="0"/>
                     </div>
                     <!--movement-->
                     <div style="margin-top:3px">
                         <label style="width:17%">Half Move:</label>
-                        <input name="attr_NPCHalfMove" type="number" placeholder="AB" style="width:9%"/>
+                        <input name="attr_NPCHalfMove" type="number" style="width:9%"/>
                         <div class="spacing" style="width:3%"></div>
                         <label style="width:17%">Full Move:</label>
-                        <input name="attr_NPCFullMove" type="number" placeholder="ABx2" style="width:9%"/>
+                        <input name="attr_NPCFullMove" type="number" style="width:9%"/>
                         <div class="spacing" style="width:3%"></div>
                         <label style="width:13%">Charge:</label>
-                        <input name="attr_NPCchargeMove" type="number" placeholder="ABx3" style="width:9%"/>
+                        <input name="attr_NPCchargeMove" type="number" style="width:9%"/>
                         <div class="spacing" style="width:3%"></div>
                         <label style="width:8%">Run:</label>
-                        <input name="attr_NPCRunMove" type="number" placeholder="ABx6" style="width:9%"/>
+                        <input name="attr_NPCRunMove" type="number" style="width:9%"/>
                     </div>
                     <div>
                         <div class="spacing" style="width:5%"></div>
@@ -2287,35 +2418,32 @@
                     </div>
                     <!--fatigue and initiative-->
                     <div>
-                        <label class="fancyButton" style="width:20%"
-                            title="Any level of Fatigue adds a -10 Penalty to all Tests.&#10;&#10;Click here to apply this Penalty&#10;This will affect skill tests and Weapon attack rolls&#10;Uncheck to remove Penalty.&#10;&#10;Fatigue Limit equals Toughness Bonus.&#10;If the Character excedes its Fatigue Limit&#10;it falls Unconcious for 10 min -TB.">
-                            <input type="checkbox" name="attr_NPCfat" value="10" hidden="true" />
-                            <div>Fatigue &#128712;</div>
+                        <label class="fancyButton" style="width:24%">
+                            <input type="checkbox" name="attr_NPCfat" value="10" hidden="true"/>
+                            <div style="font-size:0px"><span style="width:80%" data-i18n="fatigue">Fatigue</span>
+                            <b style="width:20%" title="Any level of Fatigue adds a -10 Penalty to all Tests.&#10;&#10;Click here to apply this Penalty&#10;This will affect skill tests and Weapon attack rolls&#10;Uncheck to remove Penalty.&#10;&#10;Fatigue Limit equals Toughness Bonus.&#10;If the Character excedes its Fatigue Limit&#10;it falls Unconcious for 10 min -TB.">?</b>
+                            </div>    
                         </label>
-                        <div class="spacing" style="width:1%"></div>
-                        <label style="width:10%">Level:</label>
-                        <input name="attr_NPCFatigue" type="number" style="width:5%"/>
+                        <i style="width:4%">&#10095;</i>
+                        <input name="attr_NPCFatigue" type="number" style="width:7%"/>
                         <div class="spacing" style="width:2%"></div>
-                        <button name="roll_calcnpc" style="width:20%" type="roll" title="Calculate Damage to NPC&#10;Most NPCs have a single AP value&#10;This macro uses the BODY AP and TB&#10;&#10;If AP value is different&#10;Adjust BODY AP value before rolling" 
+                        <button name="roll_calcnpc" style="width:24%" type="roll"
                         value="@{gmroll}&{template:custom} {{d10= [[((( ([[@{NPCWounds}]] - [[{?{Damage Taken|0} - (@{NPCTB} + {@{NPCBArmour} - ?{Penetration?|0},0}kh1),0d0}kh1]]) )))]] }} {{calc= $[[1]] }}">
-                            <label>Calculator &#128712;</label></button>
+                            <label style="width:80%">Calculator</label>
+                            <b style="width:20%" title="Calculate Damage to NPC&#10;Most NPCs have a single AP value&#10;This macro uses the BODY AP and TB&#10;&#10;If AP value is different&#10;Adjust BODY AP value before rolling">?</b>
+                        </button>
                         <div class="spacing" style="width:1%"></div>
-                        <button name="roll_NPCInitiative" type="roll" style="width:20%" title="Select NPC token first!&#10;Rolls 1d10 + Initiative Modifier" 
+                        <button name="roll_NPCInitiative" type="roll" style="width:20%"
                         value="@{gmroll}&{template:custom} {{name=**@{NPC_Name} rolls Initiative**}} {{d1=**Initiative Modifier** [[@{NPCinimod}]] }} {{t1=**Agility Bonus** [[@{NPCAB}]] }} {{Initiative Result=[[1d10+@{NPCinimod}&{tracker&#125;]] }}">
-                            <label>Initiative &#128712;</label></button>
+                            <label>Initiative</label></button>
                         <div class="spacing" style="width:1%"></div>
-                        <select name="attr_NPCinimod" style="width:20%">
+                        <select name="attr_NPCinimod" style="width:17%">
                             <option disabled style="background:gray;font-weight:bold;color:white;">Select Initiative Modifier</option>
                             <option value="@{NPCAB}[AB]" selected>Agility Bonus (Default)</option>
                             <option value="@{NPCIB}[IB]">Combat Formation (Int Bonus)</option>
                             <option value="@{NPCPB}[PB]">Combat Sense (Per Bonus)</option>
                             <option value="(@{NPCAB}*2)[ABx2]">Lightning Reflexes (Ag Bonus x2)</option>
                             <option value="@{NPCCusIni}">Custom Initiative</option>
-                            <option disabled style="background:gray;font-weight:bold;color:white;">Paranoia Talent (+2)</option>
-                            <option value="(@{NPCAB}+2)[AB]">Agility Bonus (Default)</option>
-                            <option value="(@{NPCIB}+2)[IB]">Combat Formation (Int Bonus)</option>
-                            <option value="(@{NPCPB}+2)[PB]">Combat Sense (Per Bonus)</option>
-                            <option value="((@{NPCAB}*2)+2)[ABx2]">Lightning Reflexes (Ag Bonus x2)</option>
                         </select>
                     </div>
                     <div class="grid2" style="margin-top:2px">
@@ -2347,7 +2475,7 @@
                             <input name="attr_NPC5thCondition" type="text" style="width:100%"/>
                             <input name="attr_NPC6thCondition" type="text" style="width:100%"/>
                             <select name="attr_NPCSize" style="width:100%">
-                                <option disabled style="background:gray;font-weight:bold;color:white">Size Modifier&nbsp;&nbsp;</option>
+                                <option disabled style="background:gray;font-weight:bold;color:white">Size Modifier</option>
                                 <option value="-3">Miniscule (-30) to Hit</option>
                                 <option value="-2">Puny (-20) to Hit</option>
                                 <option value="-1">Scrawny (-10) to Hit</option>
@@ -2363,30 +2491,30 @@
                     </div>
                     <!--misc and gear--->
                     <div style="margin-top:3px">
-                        <input name="attr_NPCMiscNotes" type="text" style="width:85%" placeholder="NPC Notes List"></input>
+                        <input name="attr_NPCMiscNotes" type="text" style="width:85%" placeholder="Special Notes"></input>
                         <button name="roll_NPCnotes" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=**@{NPC_Name} Details**}} {{desc=@{NPCNotesDesc} }}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input type="checkbox" name="attr_NPCHideNotes" style="width:5%" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
+                        <input type="checkbox" name="attr_NPCHideNotes" style="width:5%" value="1" class="arrow icon" checked="true"/>
                         <div class="hbody"><textarea name="attr_NPCNotesDesc" style="height:74px" placeholder="Notes Description"></textarea></div>
                     </div>
                     <div>
                         <input name="attr_NPCGearName" type="text" style="width:75%" placeholder="Gear Item 1"></input>
                         <input name="attr_NPCgearwt" type="number" style="width:10%" title="Quantity" placeholder="Qty."></input>
                         <button name="roll_NPCgear" type="roll" style="width:10%"value="@{gmroll}&{template:custom} {{name=**@{NPC_Name} @{NPCGearName}**}} {{desc=@{NPCGearNotes} }} {{Quantity=[[@{NPCgearwt}]]}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input type="checkbox" style="width:5%" name="attr_NPCHideGear" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
+                        <input type="checkbox" style="width:5%" name="attr_NPCHideGear" value="1" class="arrow icon" checked="true"/>
                         <div class="hbody"><textarea style="height:73px" name="attr_NPCGearNotes" placeholder="Gear Description"></textarea></div>
                     </div>
                     <div>
                         <input name="attr_NPCGearName2" type="text" style="width:75%" placeholder="Gear Item 2"></input>
                         <input name="attr_NPCgearwt2" type="number" style="width:10%" title="Quantity" placeholder="Qty."></input>
                         <button name="roll_NPCgear2" type="roll" style="width:10%"value="@{gmroll}&{template:custom} {{name=**@{NPC_Name} @{NPCGearName2}**}} {{desc=@{NPCGearNotes2} }} {{Quantity=[[@{NPCgearwt2}]]}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input type="checkbox" style="width:5%" name="attr_NPCHideGear2" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
+                        <input type="checkbox" style="width:5%" name="attr_NPCHideGear2" value="1" class="arrow icon" checked="true"/>
                         <div class="hbody"><textarea style="height:73px" name="attr_NPCGearNotes2" placeholder="Gear Description"></textarea></div>
                     </div>
                 </div><!--leftbox -->
                 <!--Skills ,talents, traits-->
                 <div class="rightbox">
                     <div class="grid9">
-						<label class="label1">Skill Name</label>
+						<label class="label1">Skills</label>
 						<div class="spacing"></div>
 						<label class="label2">Basic</label>
 						<label class="label2">Trained</label>
@@ -2636,64 +2764,64 @@
 						value="@{gmroll}&{template:custom} {{name=**@{NPC_Name} uses @{NPCSkillName9}**}} {{dosdof=[[(((  ([[(@{NPCSkill9}-@{NPCfat}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
 						<input disabled name="attr_NPCSkill9" type="text" value="floor((@{NPCSkillboxBa9}+@{NPCSkillboxTr9})*@{NPCSkillcharacteristic9})+@{NPCSkillbox+109}+@{NPCSkillbox+209}+@{NPCSkillTalent9}+@{NPCSkillMod9}"></input></button>
 					</div>
-                    <h2>Talents &amp; Traits</h2>
+                    <h2>Talents and Traits</h2>
                     <div>
-                        <input name="attr_NPCTalentName" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName}**}} {{desc=@{NPCTalentNotes}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName}**}} {{desc=@{NPCTalentNotes}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName1" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName1" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent1" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName1}**}} {{desc=@{NPCTalentNotes1}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent1" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes1" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName1}**}} {{desc=@{NPCTalentNotes1}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent1" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes1"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName2" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName2" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent2" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName2}**}} {{desc=@{NPCTalentNotes2}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent2" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes2" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName2}**}} {{desc=@{NPCTalentNotes2}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent2" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes2"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName3" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName3" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent3" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName3}**}} {{desc=@{NPCTalentNotes3}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent3" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes3" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName3}**}} {{desc=@{NPCTalentNotes3}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent3" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes3"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName4" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName4" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent4" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName4}**}} {{desc=@{NPCTalentNotes4}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent4" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes4" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName4}**}} {{desc=@{NPCTalentNotes4}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent4" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes4"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName5" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName5" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent5" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName5}**}} {{desc=@{NPCTalentNotes5}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent5" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes5" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName5}**}} {{desc=@{NPCTalentNotes5}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent5" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes5"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName6" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName6" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent6" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName6}**}} {{desc=@{NPCTalentNotes6}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent6" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes6" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName6}**}} {{desc=@{NPCTalentNotes6}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent6" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes6"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
                     <div>
-                        <input name="attr_NPCTalentName7" style="width:85%" type="text" placeholder="Name"></input>
+                        <input name="attr_NPCTalentName7" style="width:85%" type="text"  data-i18n-placeholder="name" placeholder="Name"/>
                         <button name="roll_NPCTalent7" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName7}**}} {{desc=@{NPCTalentNotes7}}}"><label class="shct" title="Send to Chat">R</label></button>
-                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent7" value="1" class="arrow icon" checked="true" title="Hide Description"></input>
-                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes7" placeholder="Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=**@{NPC_Name}'s @{NPCTalentName7}**}} {{desc=@{NPCTalentNotes7}}}"><label class="shct">R</label></button>
+                        <input style="width:5%" type="checkbox" name="attr_NPCHidetalent7" value="1" class="arrow icon" checked="true"/>
+                        <div class="hbody"><textarea style="height: 53px;" name="attr_NPCTalentNotes7"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                     </div>
-                </div>
+                </div><!--rightbox -->
             </div>
             <!--NPC Weapons-->
             <div class="grid2">
@@ -3167,60 +3295,85 @@
     <div class="spacing" style="width:35%"></div>
     <label class="fancyButton" style="width:30%">
         <input type="checkbox" class="arrow arrow2" name="attr_pysswitch" value="1" hidden="true" />
-        <div class="hbody" style="background-color: rgba(252, 0, 0, 0.64)">Switch to Navigator</div>
-        <div class="hbody2" style="background-color: rgba(111, 30, 209, 0.68)">Switch to Psyker</div>
+        <div class="hbody" style="background-color: rgba(255, 0, 0, 0.5); line-height: 22px;">Switch to Navigator</div>
+        <div class="hbody2" style="background-color: rgba(111, 30, 209, 0.68); line-height: 22px;">Switch to Psyker</div>
     </label>
     <input name="attr_pysswitch" class="arrow arrow2 hidden" type="checkbox" value="1" hidden="true" />
     <div class="spacing" style="width:35%"></div>
     <div class="hbody">
-        <h3>Psychic Powers &#936;</h3>
         <div>
-            <div class="spacing" style="width:2%"></div>
-            <input type="checkbox" style="width:2%" name="attr_Mastery1" value="1"></input>
-            <input name="attr_Discipline1" type="text" style="width:14%; font-weight:bold" placeholder="1st Discipline" title="1st Discipline&#10;&#10;Check this if you have Mastered this Discipline&#10;&#10;Discipline Mastery Grants +1 PR to Fettered Powers"/>
-            <div class="spacing" style="width:3%"></div>
-            <input type="checkbox" style="width:2%" name="attr_Mastery2" value="1"></input>
-            <input name="attr_Discipline2" type="text" style="width:14%; font-weight:bold" placeholder="2nd Discipline" title="2nd Discipline&#10;&#10;Check this if you have Mastered this Discipline&#10;&#10;Discipline Mastery Grants +1 PR to Fettered Powers"/>
-            <div class="spacing" style="width:3%"></div>
-            <input type="checkbox" style="width:2%" name="attr_Mastery3" value="1"></input>
-            <input name="attr_Discipline3" type="text" style="width:14%; font-weight:bold" placeholder="3rd Discipline" title="3rd Discipline&#10;&#10;Check this if you have Mastered this Discipline&#10;&#10;Discipline Mastery Grants +1 PR to Fettered Powers"/>
-            <div class="spacing" style="width:3%"></div>
-            <input type="checkbox" style="width:2%" name="attr_Mastery4" value="1"></input>
-            <input name="attr_Discipline4" type="text" style="width:14%; font-weight:bold" placeholder="4th Discipline" title="4th Discipline&#10;&#10;Check this if you have Mastered this Discipline&#10;&#10;Discipline Mastery Grants +1 PR to Fettered Powers"/>
-            <div class="spacing" style="width:3%"></div>
-            <input type="checkbox" style="width:2%" name="attr_Mastery5" value="1"></input>
-            <input name="attr_Discipline5" type="text" style="width:14%; font-weight:bold" placeholder="5th Discipline" title="5th Discipline&#10;&#10;Check this if you have Mastered this Discipline&#10;&#10;Discipline Mastery Grants +1 PR to Fettered Powers"/>
-            <div class="spacing" style="width:2%"></div>
-        </div>
-        <div>
-            <div class="spacing" style="width:2%"></div>
-            <button name="roll_PsyPhe" type="roll" style="width:19%" title="Rolls 1d100 + Powers Sustained&#10;Remember to add Modifier based on Push Level (if pushing)"
+            <label style="width:10%; text-align:right">Focus Mod</label>
+            <b style="width:3%" title="Fixed Modifier for the Focus Power Test&#10;Example: Psy-Focus (+10)">?</b>
+            <input style="width:3%" name="attr_focusmod" type="number" value="0"/>
+            <label style="width:11%; text-align:right">Psy Rating:</label>
+            <div class="spacing" style="width:1%"></div>
+            <input style="width:3%" name="attr_PsyRating" type="number" value="0" min="0"/>
+            <label style="width:15%; text-align:right">Powers Sustained</label>
+            <b style="width:3%" title="For every power sustained:&#10;+10 to all rolls on the Psychic Phenomena Table&#10;-1 Psy Rating per Sustained power">?</b>
+            <input style="width:3%" name="attr_Sustaining" type="text" disabled value="(@{sustainingpowertotal}) + (@{sustainingpowertotal1})"/>
+            <input type="hidden" name="attr_sustainingpowertotal" type="number" value="0"/>
+            <input type="hidden" name="attr_sustainingpowertotal1" type="number" value="0"/>
+            <div class="spacing" style="width:1%"></div>
+            <button name="roll_PsyPhe" type="roll" style="width:18%"
             value="@{gmroll}&{template:custom} {{name=Psychic Phenomena}} {{psytable= [[{1d100cs1cf100 + ?{Modifier|0} + (@{Sustaining}*10),1d1}dl1]] }} {{d10=[[1d10]]}} {{xd10=[[3d10]]}} {{d5=[[1d5]]}} {{xd5=[[5d10]]}} {{d100h=[[1d100]]}} {{psydmg=[[2d10]]}}">
-                <label>Roll Psychic Phenomena</label></button>
-            <div class="spacing" style="width:10.5%"></div>
-            <label style="width:9%">Psy Rating:</label>
-            <input style="width:5%; font-weight:bold" name="attr_PsyRating" type="number" title="Base Psy Rating Only" value="0"/>
-            <div class="spacing" style="width:2%"></div>
-            <label style="width:14%">Powers Sustained:</label>
-            <input style="width:5%; font-weight:bold" name="attr_Sustaining" type="text" disabled value="(@{sustainingpowertotal}) + (@{sustainingpowertotal1})" title="For every power sustained:&#10;+10 to all rolls on the Psychic Phenomena Table&#10;-1 Psy Rating per Sustained power"></input>
-            <div class="spacing" style="width:6%"></div>
-            <button name="roll_PotW" type="roll" style="width:16%"
-            value="@{gmroll}&{template:custom} {{name=Perils of the Warp}} {{d1=Roll Result ?{Soul Bound?|Yes, [[1d10cf10cs1]] [[1d10cf10cs1]] [[1d10cf10cs1]]&#10;Select desired number combination and type result in the Perils Table Button|No, [[1d100cs1cf100]]&#10;Type result in the Perils Table Button&#125;}}">
-                <label>Roll Perils of the Warp</label></button>
-            <div class="spacing" style="width:0.5%"></div>
-            <button name="roll_PotWT" type="roll" style="width:9%" value="@{gmroll}&{template:custom} {{name=**Perils of the Warp**}} {{perilstable= [[?{Roll Result|1}]] }} {{xd5=[[5d10]]}} {{d5=[[1d5]]}} {{d10=[[1d10]]}} {{xd10=[[3d10]]}} {{d100h=[[1d100]]}} {{psydmg=[[1d10+5]]}} {{psypen=[[2d10]]}} {{hitloc=[[4d10]]}}">
-                <label>Perils Table</label></button>
-            <div class="spacing" style="width:2%"></div>
+                <div class="spacing" style="width:8%"></div>
+                <label style="width:80%">Psychic Phenomena</label>
+                <b style="width:12%" title="Rolls 1d100 + (Powers Sustained x10)&#10;Remember to add Modifier based on Push Level (if pushing)">?</b>
+            </button>
+            <div class="spacing" style="width:1%"></div>
+            <button name="roll_PotW" type="roll" style="width:18%"
+            value="@{gmroll}&{template:custom} {{name=Perils of the Warp}} {{d1=Roll Result ?{Soul Bound?|Yes, [[1d10-1]] [[1d10-1]] [[1d10-1]]&#10;Select desired number combination and type result in the Perils Table Button|No, [[1d100cs1cf100]]&#10;Type result in the Perils Table Button&#125;}}">
+                <div class="spacing" style="width:8%"></div>
+                <label style="width:80%">Perils of the Warp</label>
+                <b style="width:12%" title="Rolls a 1d100 or 3d10s for Soul-Bound psykers&#10;Input the result on the Perils table&#10;button to see the result.">?</b>
+            </button>
+            <button name="roll_PotWT" type="roll" style="width:10%" value="@{gmroll}&{template:custom} {{name=Perils of the Warp}} {{perilstable= [[?{Roll Result|1}]] }} {{xd5=[[5d10]]}} {{d5=[[1d5]]}} {{d10=[[1d10]]}} {{xd10=[[3d10]]}} {{d100h=[[1d100]]}} {{psydmg=[[1d10+5]]}} {{psypen=[[2d10]]}} {{hitloc=[[4d10]]}}">
+                <label>Perils Table</label>
+            </button>
         </div>
-        <input type="hidden" name="attr_sustainingpowertotal" type="number" value="0"></input>
-        <input type="hidden" name="attr_sustainingpowertotal1" type="number" value="0"></input>
+        <div style="margin: 6px 0">
+            <div class="spacing" style="width:0.5%"></div>
+            <input name="attr_Discipline1" type="text" style="width:19%" placeholder="1st Discipline"/>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_Discipline2" type="text" style="width:19%" placeholder="2nd Discipline"/>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_Discipline3" type="text" style="width:19%" placeholder="3rd Discipline"/>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_Discipline4" type="text" style="width:19%" placeholder="4th Discipline"/>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_Discipline5" type="text" style="width:19%" placeholder="5th Discipline"/>
+            <div class="spacing" style="width:0.5%"></div>
+            <!-- end of line -->
+            <div class="spacing" style="width:5.5%"></div>
+            <label class="fancyButton" style="width:9%"><input type="checkbox" name="attr_Mastery1" value="1" hidden="true"/>
+                <div><span style="line-height:22px" data-i18n="mastery">Mastery</span></div>
+            </label>
+            <div class="spacing" style="width:11%"></div>
+            <label class="fancyButton" style="width:9%"><input type="checkbox" name="attr_Mastery2" value="1" hidden="true"/>
+                <div><span style="line-height:22px" data-i18n="mastery">Mastery</span></div>
+            </label>
+            <div class="spacing" style="width:11%"></div>
+            <label class="fancyButton" style="width:9%"><input type="checkbox" name="attr_Mastery3" value="1" hidden="true"/>
+                <div><span style="line-height:22px" data-i18n="mastery">Mastery</span></div>
+            </label>
+            <div class="spacing" style="width:11%"></div>
+            <label class="fancyButton" style="width:9%"><input type="checkbox" name="attr_Mastery4" value="1" hidden="true"/>
+                <div><span style="line-height:22px" data-i18n="mastery">Mastery</span></div>
+            </label>
+            <div class="spacing" style="width:11%"></div>
+            <label class="fancyButton" style="width:9%"><input type="checkbox" name="attr_Mastery5" value="1" hidden="true"/>
+                <div><span style="line-height:22px" data-i18n="mastery">Mastery</span></div>
+            </label>
+            <div class="spacing" style="width:5.5%"></div>
+        </div>
+        <h1>Psychic Powers</h1>
         <div class="grid2">
             <div class="leftbox"> 
                 <fieldset class="repeating_psypowers1" name="attr_psypowers1">
                     <div class="quickborder">
-                        <input name="attr_PsyName" type="text" style="width:50%" placeholder="Technique Name" title="Technique Name"/>
+                        <input name="attr_PsyName" type="text" style="width:52%" data-i18n-placeholder="name" placeholder="Name"/>
                         <div class="spacing" style="width:0.5%"></div>
-                        <select name="attr_PsyStrength" style="width:22%">
+                        <select name="attr_PsyStrength" style="width:20%">
                             <option disabled style="background:gray;font-weight:bold;color:white;">Psy Strength</option>
                             <option disabled style="background:gray;font-weight:bold;color:white;">Sanctioned</option>
                                 <option value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to manifest&#10;@{PsyName}}} {{dosdof=[[((( ([[@{PsyFocusPower} + (?{Modifier|0}) + (5 * ( (ceil(@{PsyRating}/2)) + @{PsyRatingModifier} + @{PsyMastery} - (@{Sustaining}) ) )]] - [[1d100cs101]] ) * 100 % 999 % 100 )))]] Degrees}} {{testtarget=$[[0]]}} {{d100p=$[[1]]}} {{Fettered=EPR [[(ceil(@{PsyRating}/2)) + @{PsyRatingModifier} + @{PsyMastery} - (@{Sustaining}) ]]}} {{Range=[[@{PsyRange} * ( (ceil(@{PsyRating}/2)) + @{PsyRatingModifier} + @{PsyMastery} - (@{Sustaining}) ) ]]}}  {{psydmg= [[ @{PsyDamage} + (@{PsyDmgB} * ( (ceil(@{PsyRating}/2)) + @{PsyRatingModifier} + @{PsyMastery} - (@{Sustaining}) ))]] @{PsyDamageType}}} {{psypen= [[@{PsyPen}]] }}">Fettered</option>
@@ -3234,12 +3387,12 @@
                         <div class="spacing" style="width:0.5%"></div>
                         <button name="roll_PsyHit" type="roll" style="width:15%" value="@{PsyStrength}"><label>Manifest</label></button>
                         <div class="spacing" style="width:0.5%"></div>
-                        <button name="roll_PsyInfo" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=**@{PsyName}**}} {{d1=**Cast Time: @{PsyAction}**}} {{t1=**Range @{PsyRange}m x EPR**}} {{p1=**Sustainable? @{PsySustained}**}} {{desc=@{PsyPowersEffect} }}"><label class="shct" title="Send to Chat">R</label></button>
+                        <button name="roll_PsyInfo" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=@{PsyName}}} {{d1=Activation Time: @{PsyAction}}} {{t1=Range @{PsyRange}m x EPR}} {{p1=Sustainable? @{PsySustained}}} {{desc=@{PsyPowersEffect} }}"><label class="shct">R</label></button>
                         <div class="spacing" style="width:0.5%"></div>
-                        <input class="arrow icon" style="width:3%" name="attr_hidepsypower1" type="checkbox" value="1"  title="Show/Hide Details"></input>
+                        <input class="arrow icon" style="width:3%" name="attr_hidepsypower1" type="checkbox" value="1"/>
                         <!-- end of line -->
                         <div class="hbody">
-                            <input name="attr_PsyAction" type="text" style="width:33%" placeholder="Activation Time" title="Activation Time / Focus Power Time"/>
+                            <input name="attr_PsyAction" type="text" style="width:33%" placeholder="Activation Time"/>
                             <div class="spacing" style="width:0.5%"></div>
                             <select name="attr_PsyMastery" style="width:33%">
                                 <option value="@{Mastery1}">1st Discipline</option>
@@ -3251,9 +3404,9 @@
                             <div class="spacing" style="width:0.5%"></div>
                             <select name="attr_PsyFocusPower" style="width:33%">
                                 <option disabled style="background:gray;font-weight:bold;color:white;">Focus Power Test</option>
-                                <option value="@{Willpower}" selected>Willpower</option>
-                                <option value="@{Psyniscience}">Psyniscience</option>
-                                <option value="@{Intelligence}">Intelligence</option>
+                                <option value="(@{Willpower}+(@{focusmod}))" selected>Willpower</option>
+                                <option value="(@{Psyniscience}+(@{focusmod}))">Psyniscience</option>
+                                <option value="(@{Intelligence}+(@{focusmod}))">Intelligence</option>
                             </select>
                             <!-- end of line -->
                             <label style="width:25%">Psy Rating Mod:</label>
@@ -3262,7 +3415,7 @@
                             <label style="width:11%">Range:</label>
                             <input name="attr_PsyRange" type="number" value="0" style="width:15%"/>
                             <div class="spacing" style="width:4%"></div>
-                            <label style="width:16%">Sustained:</label>
+                            <label style="width:16%">Sustain:</label>
                             <select name="attr_PsySustained" style="width:12%">
                                 <option value="No">No</option>
                                 <option value="Yes">Yes</option>
@@ -3270,13 +3423,14 @@
                             <div class="spacing" style="width:1%"></div>
                             <input style="width:3%" type="checkbox" name="attr_sustainingpower" value="1" title="Check this if you are Sustaining this Technique"></input>
                             <!-- end of line -->
-                            <label style="width:14%">Damage:</label>
-                            <input name="attr_PsyDamage" type="text" value="0" style="width:16%" title="Type here unmodified Damage die (if any)&#10;&#10;If the Technique does No Damage&#10;Leave value at 0"/>
+                            <label style="width:15%; text-align:center">Damage</label>
+                            <b style="width:5%" title="Input unmodified Damage Die&#10;&#10;If the Technique does No Damage&#10;Leave value at 0 and set PR damage modifier&#10;To -No Damage-&#10;&#10;If the Technique has No Penetration&#10;Leave Pen value at 0">?</b>
+                            <input name="attr_PsyDamage" type="text" value="0" style="width:11%"/>
                             <div class="spacing" style="width:0.5%"></div>
-                            <label style="width:3%; font-weight:bold; font-size:22px">+</label>
+                            <label style="width:3%; font-size:22px">+</label>
                             <div class="spacing" style="width:0.5%"></div>
-                            <select name="attr_PsyDmgB" style="width:21%" title="Damage modifier based on Psy Rating&#10;Value may vary based on Technique Description&#10;&#10;Set -No Dmg- if Technique does No Damage">
-                                <option value="0" selected>No Dmg</option>
+                            <select name="attr_PsyDmgB" style="width:23%">
+                                <option value="0" selected>No Damage</option>
                                 <option value="1">1 x EPR</option>
                                 <option value="2">2 x EPR</option>
                                 <option value="3">3 x EPR</option>
@@ -3284,17 +3438,17 @@
                                 <option value="5">5 x EPR</option>
                             </select>
                             <div class="spacing" style="width:1%"></div>
-                            <select name="attr_PsyDamageType" style="width:23%">
-                                <option disabled style="background:gray;font-weight:bold;color:white">Damage Type&nbsp;</option>
-                                <option value="Energy Damage!" selected>Energy (E)</option>
-                                <option value="Explosive Damage!">Explosive (X)</option>
-                                <option value="Impact Damage!">Impact (I)</option>
-                                <option value="Rending Damage!">Rending (R)</option>
+                            <select name="attr_PsyDamageType" style="width:20%">
+                                <option disabled style="background:gray;font-weight:bold;color:white">Damage Type</option>
+                                <option value="Energy Damage!" selected>(E) Energy</option>
+                                <option value="Explosive Damage!">(X) Explosive</option>
+                                <option value="Impact Damage!">(I) Impact</option>
+                                <option value="Rending Damage!">(R) Rending</option>
                             </select>
                             <div class="spacing" style="width:3%"></div>
                             <label style="width:8%">Pen:</label>
-                            <input name="attr_PsyPen" type="number" value="0" min="0" style="width:10%" title="If the Technique has No Penetration&#10;Leave value at 0"/>
-                            <textarea name="attr_PsyPowersEffect" style="height:55px" placeholder="Technique Information"></textarea>
+                            <input name="attr_PsyPen" type="number" value="0" min="0" style="width:10%"/>
+                            <textarea name="attr_PsyPowersEffect" style="height:55px" data-i18n-placeholder="description" placeholder="Description"></textarea>
                         </div>		
                     </div>
                 </fieldset>
@@ -3302,9 +3456,9 @@
             <div class="rightbox"> 
                 <fieldset class="repeating_psypowers2" name="attr_psypowers2">
                     <div class="quickborder">
-                        <input name="attr_PsyName1" type="text" style="width:50%" placeholder="Technique Name" title="Technique Name"/>
+                        <input name="attr_PsyName1" type="text" style="width:52%" data-i18n-placeholder="name" placeholder="Name"/>
                         <div class="spacing" style="width:0.5%"></div>
-                        <select name="attr_PsyStrength1" style="width:22%">
+                        <select name="attr_PsyStrength1" style="width:20%">
                             <option disabled style="background:gray;font-weight:bold;color:white;">Psy Strength</option>
                             <option disabled style="background:gray;font-weight:bold;color:white;">Sanctioned</option>
                                 <option value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to manifest&#10;@{PsyName1}}} {{dosdof=[[((( ([[@{PsyFocusPower1} + (?{Modifier|0}) + (5 * ( (ceil(@{PsyRating}/2)) + @{PsyRatingModifier1} + @{PsyMastery1} - (@{Sustaining}) ) )]] - [[1d100cs101]] ) * 100 % 999 % 100 )))]] Degrees}} {{testtarget=$[[0]]}} {{d100p=$[[1]]}} {{Fettered=EPR [[(ceil(@{PsyRating}/2)) + @{PsyRatingModifier1} + @{PsyMastery1} - (@{Sustaining}) ]]}} {{Range=[[ @{PsyRange1} * ( (ceil(@{PsyRating}/2)) + @{PsyRatingModifier1} + @{PsyMastery1} - (@{Sustaining}) ) ]]}}  {{psydmg= [[ @{PsyDamage1} + (@{PsyDmgB1} * ( (ceil(@{PsyRating}/2)) + @{PsyRatingModifier1} + @{PsyMastery1} - (@{Sustaining}) ))]] @{PsyDamageType1}}} {{psypen= [[@{PsyPen1}]] }}">Fettered</option>
@@ -3318,12 +3472,12 @@
                         <div class="spacing" style="width:0.5%"></div>
                         <button name="roll_PsyHit1" type="roll" style="width:15%" value="@{PsyStrength1}"><label>Manifest</label></button>
                         <div class="spacing" style="width:0.5%"></div>
-                        <button name="roll_PsyInfo1" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=**@{PsyName1}**}} {{d1=**Cast Time: @{PsyAction1}**}} {{t1=**Range @{PsyRange1}m x EPR**}} {{p1=**Sustainable? @{PsySustained1}**}} {{desc=@{PsyPowersEffect1} }}"><label class="shct" title="Send to Chat">R</label></button>
+                        <button name="roll_PsyInfo1" type="roll" style="width:8%" value="@{gmroll}&{template:custom} {{name=@{PsyName1}}} {{d1=Activation Time: @{PsyAction1}}} {{t1=Range @{PsyRange1}m x EPR}} {{p1=Sustainable? @{PsySustained1}}} {{desc=@{PsyPowersEffect1} }}"><label class="shct">R</label></button>
                         <div class="spacing" style="width:0.5%"></div>
-                        <input class="arrow icon" style="width:3%" name="attr_hidepsypower2" type="checkbox" value="1"  title="Show/Hide Details"></input>
+                        <input class="arrow icon" style="width:3%" name="attr_hidepsypower2" type="checkbox" value="1"></input>
                         <!-- end of line -->
                         <div class="hbody">
-                            <input name="attr_PsyAction1" type="text" style="width:33%" placeholder="Activation Time" title="Activation Time / Focus Power Time" />
+                            <input name="attr_PsyAction1" type="text" style="width:33%" placeholder="Activation Time"/>
                             <div class="spacing" style="width:0.5%"></div>
                             <select name="attr_PsyMastery1" style="width:33%">
                                 <option value="@{Mastery1}">1st Discipline</option>
@@ -3335,9 +3489,9 @@
                             <div class="spacing" style="width:0.5%"></div>
                             <select name="attr_PsyFocusPower1" style="width:33%">
                                 <option disabled style="background:gray;font-weight:bold;color:white;">Focus Power Test</option>
-                                <option value="@{Willpower}" selected>Willpower</option>
-                                <option value="@{Psyniscience}">Psyniscience</option>
-                                <option value="@{Intelligence}">Intelligence</option>
+                                <option value="(@{Willpower}+(@{focusmod}))" selected>Willpower</option>
+                                <option value="(@{Psyniscience}+(@{focusmod}))">Psyniscience</option>
+                                <option value="(@{Intelligence}+(@{focusmod}))">Intelligence</option>
                             </select>
                             <!-- end of line -->
                             <label style="width:25%">Psy Rating Mod:</label>
@@ -3346,7 +3500,7 @@
                             <label style="width:11%">Range:</label>
                             <input name="attr_PsyRange1" type="number" value="0" style="width:15%"/>
                             <div class="spacing" style="width:4%"></div>
-                            <label style="width:16%">Sustained:</label>
+                            <label style="width:16%">Sustain:</label>
                             <select name="attr_PsySustained1" style="width:12%">
                                 <option value="No">No</option>
                                 <option value="Yes">Yes</option>
@@ -3354,13 +3508,14 @@
                             <div class="spacing" style="width:1%"></div>
                             <input style="width:3%" type="checkbox" name="attr_sustainingpower1" value="1" title="Check this if you are Sustaining this Technique"></input>
                             <!-- end of line -->
-                            <label style="width:14%">Damage:</label>
-                            <input name="attr_PsyDamage1" type="text" value="0" style="width:16%" title="Type here unmodified Damage die (if any)&#10;&#10;If the Technique does No Damage&#10;Leave value at 0"/>
+                            <label style="width:15%; text-align:center">Damage</label>
+                            <b style="width:5%" title="Input unmodified Damage Die&#10;&#10;If the Technique does No Damage&#10;Leave value at 0 and set PR damage modifier&#10;To -No Damage-&#10;&#10;If the Technique has No Penetration&#10;Leave Pen value at 0">?</b>
+                            <input name="attr_PsyDamage1" type="text" value="0" style="width:11%"/>
                             <div class="spacing" style="width:0.5%"></div>
                             <label style="width:3%; font-weight:bold; font-size:22px">+</label>
                             <div class="spacing" style="width:0.5%"></div>
-                            <select name="attr_PsyDmgB1" style="width:21%" title="Damage modifier based on Psy Rating&#10;Value may vary based on Technique Description&#10;&#10;Set -No Dmg- if Technique does No Damage">
-                                <option value="0" selected>No Dmg</option>
+                            <select name="attr_PsyDmgB1" style="width:23%">
+                                <option value="0" selected>No Damage</option>
                                 <option value="1">1 x EPR</option>
                                 <option value="2">2 x EPR</option>
                                 <option value="3">3 x EPR</option>
@@ -3368,17 +3523,17 @@
                                 <option value="5">5 x EPR</option>
                             </select>
                             <div class="spacing" style="width:1%"></div>
-                            <select name="attr_PsyDamageType1" style="width:23%">
-                                <option disabled style="background:gray;font-weight:bold;color:white">Damage Type&nbsp;</option>
-                                <option value="Energy" selected>Energy</option>
-                                <option value="Explosive">Explosive</option>
-                                <option value="Impact">Impact</option>
-                                <option value="Rending">Rending</option>
+                            <select name="attr_PsyDamageType1" style="width:20%">
+                                <option disabled style="background:gray;font-weight:bold;color:white">Damage Type</option>
+                                <option value="Energy Damage!" selected>(E) Energy</option>
+                                <option value="Explosive Damage!">(X) Explosive</option>
+                                <option value="Impact Damage!">(I) Impact</option>
+                                <option value="Rending Damage!">(R) Rending</option>
                             </select>
                             <div class="spacing" style="width:3%"></div>
                             <label style="width:8%">Pen:</label>
-                            <input name="attr_PsyPen1" type="number" value="0" min="0" style="width: 10%" title="If the Technique has No Penetration&#10;Leave value at 0"/>
-                            <textarea name="attr_PsyPowersEffect1" style="height:55px" placeholder="Technique Information"></textarea>
+                            <input name="attr_PsyPen1" type="number" value="0" min="0" style="width: 10%"/>
+                            <textarea name="attr_PsyPowersEffect1" style="height:55px" data-i18n-placeholder="description" placeholder="Description"></textarea>
                         </div>		
                     </div>
                 </fieldset>
@@ -3386,51 +3541,50 @@
         </div>
     </div><!--hbody-->
     <div class="hbody2">
-        <h3>Navigator Powers &#128065;</h3>
-        <!--Navigator Powers Section -->
         <div class="grid2">
             <!--Lineage and Mutations-->
             <div class="leftbox">
-                <input name="attr_NavLineage" style="height:30px; font-size:20px; font-weight:bold; width:100%" type="text" placeholder="Navigator Lineage"/>
+                <input name="attr_NavLineage" style="height:30px; font-size:20px; width:100%" type="text" placeholder="Navigator Lineage"/>
                 <input style="width:85%" name="attr_NavLinBenefit" type="text" placeholder="Lineage Benefit"/>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_NavLinDesc" type="roll" style="width:10%"
-				value="@{gmroll}&{template:custom} {{name=**@{character_name}'s Lineage**}} {{Title=**@{NavLineage}**}} {{Benefit=**@{NavLinBenefit}**}} {{desc=@{NavLinDescription}}}"><label class="shct" title="Send to Chat">R</label></button>
+				value="@{gmroll}&{template:custom} {{name=@{character_name}'s Lineage}} {{Title=@{NavLineage}}} {{Benefit=**@{NavLinBenefit}**}} {{desc=@{NavLinDescription}}}"><label class="shct">R</label></button>
 				<div class="spacing" style="width:1%"></div>
-				<input name="attr_HideNavLinDescription" style="width:3%" type="checkbox" class="arrow icon" value="1" title="Hide Description"></input>
+				<input name="attr_HideNavLinDescription" style="width:3%" type="checkbox" class="arrow icon" value="1"/>
 				<div class="hbody"><textarea name="attr_NavLinDescription" style="height: 65px" placeholder="Description"></textarea></div>
                 <fieldset class="repeating_navlinbenefits">
                     <input style="width:85%" name="attr_NavLinBenefit1" type="text" placeholder="Lineage Benefit"/>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_NavLinDesc1" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=**@{character_name}'s Lineage**}} {{Title=**@{NavLineage}**}} {{Benefit=**@{NavLinBenefit1}**}} {{desc=@{NavLinDescription1}}}"><label class="shct" title="Send to Chat">R</label></button>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Lineage}} {{Title=**@{NavLineage}**}} {{Benefit=**@{NavLinBenefit1}**}} {{desc=@{NavLinDescription1}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input name="attr_HideNavLinDescription1" style="width:3%" type="checkbox" class="arrow icon" value="1" title="Hide Description"></input>
-                    <div class="hbody"><textarea name="attr_NavLinDescription1" style="height: 65px" placeholder="Description"></textarea></div>
+                    <input name="attr_HideNavLinDescription1" style="width:3%" type="checkbox" class="arrow icon" value="1"/>
+                    <div class="hbody"><textarea name="attr_NavLinDescription1" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </fieldset>
-                <h3>Navigator Mutations &#9832;</h3>
-                <button name="roll_NavMutationTest" type="roll" style="width:44%" title="Rolls Toughness.&#10;Remember to add modifier based on Lineage."
+                <div class="spacing" style="height:40px"></div>
+                <button name="roll_NavMutationTest" type="roll" style="width:44%"
                 value="@{gmroll}&{template:custom} {{name=**@{character_name} tries to resist Mutation**}} {{dosdof=[[(((  ([[(@{Toughness}+(@{navmutmod}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                     <label>Navigator Mutation Test</label></button>
                 <div class="spacing" style="width:1%"></div>
                 <input name="attr_navmutmod" style="width:10%" type="number" value="0" title="Mod applied to Mutation Test based on Lineage Benefit"/>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_NavMutationTable" type="roll" style="width:44%"
-                value="@{gmroll}&{template:custom} {{name=**@{character_name} rolls on**&#10;**The Navigator Mutation Table**}} {{navmutable= [[1d100]]}} {{d5=[[1d5]]}}">
+                value="@{gmroll}&{template:custom} {{name=@{character_name} rolls on&#10;The Navigator Mutation Table}} {{navmutable= [[1d100]]}} {{d5=[[1d5]]}}">
                     <label>Navigator Mutation Table</label></button>
-                <h1>Mutations Gained</h1>
+                <h2>Mutations Gained</h2>
                 <fieldset class="repeating_navmutations">
-                    <input name="attr_NavMutationName" type="text" style="width:85%" placeholder="Mutation Name"/>
+                    <input name="attr_NavMutationName" type="text" style="width:85%" data-i18n-placeholder="name" placeholder="Name"/>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_NavMutDesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=**@{character_name}'s Mutation**}} {{Title=**@{NavMutationName}**}} {{desc=@{NavMutationDesc}}}"><label class="shct" title="Send to Chat">R</label></button>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Mutation}} {{Title=**@{NavMutationName}**}} {{desc=@{NavMutationDesc}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input name="attr_HideNavMutation" style="width:3%" type="checkbox" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea name="attr_NavMutationDesc" style="height: 65px" placeholder="Description"></textarea></div>
+                    <input name="attr_HideNavMutation" style="width:3%" type="checkbox" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea name="attr_NavMutationDesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </fieldset>
             </div>
             <!--Nav Powers column-->
             <div class="rightbox">
+                <h1>Navigator Powers</h1>
                 <fieldset class="repeating_navpower">
                     <div class="quickborder">
                         <div class="gridnav">
@@ -3472,9 +3626,9 @@
                             <option value="Undefined">Undefined</option>
                         </select>
                         <div class="spacing" style="width:0.5%"></div>
-                        <input name="attr_NavPowerRange" type="text" placeholder="Range" style="width:18%" title="Range"></input>
+                        <input name="attr_NavPowerRange" type="text" placeholder="Range" style="width:18%"></input>
                         <div class="spacing" style="width:0.5%"></div>
-                        <input name="attr_NavPowerDamage" type="text" placeholder="Damage" style="width:18%" title="Damage Dice"></input>
+                        <input name="attr_NavPowerDamage" type="text" placeholder="Damage" style="width:18%"></input>
                         <div class="spacing" style="width:0.5%"></div>
                         <select name="attr_NavPowerDamageType" style="width:11%">
                             <option disabled style="background:gray;font-weight:bold;color:white">Damage Type</option>
@@ -3484,15 +3638,15 @@
                             <option value="Rending">(R) Rending</option>
                         </select>
                         <div class="spacing" style="width:0.5%"></div>
-                        <button name="roll_NavPowerDamage" type="roll" title="Rolls Power Damage" style="width:15%"
+                        <button name="roll_NavPowerDamage" type="roll" style="width:15%"
                         value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{NavPowerName} deals**}} {{d1=[[@{NavPowerDamage}]] **@{NavPowerDamageType} Damage!**}}">
                             <label>Damage</label></button>
                         <div class="spacing" style="width:0.5%"></div>
                         <button name="roll_NavPowDesc" type="roll" title="Show Description in Chat" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=**@{character_name}'s @{NavPowerName}**}} {{Novice=@{NavPowerNovice} }} {{Adept=@{NavPowerAdept} }} {{Master=@{NavPowerMaster} }}">
+                        value="@{gmroll}&{template:custom} {{name=@{character_name}'s @{NavPowerName}}} {{Novice=@{NavPowerNovice} }} {{Adept=@{NavPowerAdept} }} {{Master=@{NavPowerMaster} }}">
                             <label class="shct" title="Send to Chat">R</label></button>
                         <div class="spacing" style="width:0.5%"></div>
-                        <input name="attr_HideNavPowDesc" style="width:3%" type="checkbox" value="1" class="arrow icon" title="Hide Level Description"></input>
+                        <input name="attr_HideNavPowDesc" style="width:3%" type="checkbox" value="1" class="arrow icon"></input>
                         <div class="hbody">
                             <textarea name="attr_NavPowerNovice" style="height:65px" placeholder="Novice Level Description"></textarea>
                             <textarea name="attr_NavPowerAdept" style="height:65px" placeholder="Adept Level Description"></textarea>
@@ -3506,80 +3660,109 @@
 </div>
 <!-- Ship Tab %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <div class="ship">
-    <input name="attr_ShipName" type="text" style="height:45px; font-size:30px; font-weight:bold; width:100%" placeholder="Ship Name"/>
+    <input name="attr_ShipName" type="text" style="height:45px; font-size:30px; width:100%" data-i18n-placeholder="name" placeholder="Name"/>
     <!--Base Ship Stats -->
     <div class="grid4">
         <div class="gridbox1">
-            <input name="attr_ShipClass" style="width:100%" type="text" placeholder="Class and Hull Type" title="Class and Hull Type"/>
+            <input name="attr_ShipClass" style="width:100%" type="text" placeholder="Class and Hull Type"/>
             <!-- end of line -->
-            <label style="width:22%">Speed:</label>
-            <input name="attr_ShipSpeed" style="width:21%" type="text"/>
+            <label style="width:42%; text-align:center">Speed:</label>
+            <input name="attr_ShipSpeed" style="width:21%" type="text" value="0"/>
             <div class="spacing" style="width:4%"></div>
-            <label style="width:32%" class="help" title="Frigate Size and smaller ships turn 90°&#10;Light Cruiser Size and larger ships turn 45°">Turn Arc:</label>
+            <b style="width:12%; font-size:26px" class="help" title="Turn Angle&#10;Frigate Size and smaller ships turn 90°&#10;Light Cruiser Size and larger ships turn 45°">&#8894;</b>
             <select name="attr_ShipTurnArc" style="width:21%">
                 <option>90°</option>
                 <option>45°</option>
             </select>
             <!-- end of line -->
-            <label style="width:25%" class="help" title="Void Shields or equivalent">Shields:</label>
-            <input name="attr_ShipShields" style="width:13%" type="number" min="0"/>
-            <div class="spacing" style="width:5%"></div>
-            <label style="width:28%" class="help" title="Ships Armour value&#10;&#10;The smaller field is for&#10;Armored Prows or similar.">Armour:</label>
-            <input name="attr_ShipArmour" style="width:13%" type="number"/>
-            <label style="width:6%; font-size:20px; text-align:center">+</label>
-            <input name="attr_ShipArmourProw" style="width:10%" type="number" value="0"/>
-            <!-- end of line -->
-            <label style="width:32%">Detection:</label>
-            <input name="attr_ShipDetection" style="width:23%" type="text" value="0"/>
-            <div class="spacing" style="width:5%"></div>
-            <label style="width:23%" class="help" title="Ship Detection Bonus&#10;&#10;The tens digit in the Ship's&#10;Detection Characteristic&#10;&#10;Value used in Ship's Initiative Roll">Bonus:</label>
+            <label style="width:42%; text-align:center">Detection:</label>
+            <input name="attr_ShipDetection" style="width:40%" type="text" value="0"/>
+            <div class="spacing" style="width:1%"></div>
             <input name="attr_ShipDetectionBonus" style="width:17%" type="text" value="floor(@{ShipDetection}/10)" disabled/>
             <!-- end of line -->
-            <label style="width:37%" class="help" title="Input here the Plasma Drive component, power generation value">Power Max:</label>
-            <input name="attr_ShipPowerMax" type="number" style="width:17%"/>
-            <div class="spacing" style="width:10%"></div>
-            <label style="width:19%" class="help" title="Total Power used by all components">Used:</label>
+            <label style="width:42%; text-align:center">Armour:</label>
+            <input name="attr_ShipArmour" style="width:17%" type="number" min="0" value="0"/>
+            <label style="width:7%; font-size:20px; text-align:center">+</label>
+            <input name="attr_ShipArmourProw" style="width:16%" type="number" min="0" value="0"/>
+            <b style="width:13%" title="Armour value for&#10;Armored Prows or similar.">?</b>
+            <div class="spacing" style="width:5%"></div>
+            <!-- end of line -->
+            <label style="width:63%; text-align:center">Power Generated:</label>
+            <input style="width:17%" name="attr_ShipPowerMax" type="number"/>
+            <div class="spacing" style="width:1%"></div>
             <input style="width:17%" name="attr_ShipPowerUsed" type="text" disabled value="@{ShipSupplementalComponentsPowerTotal} + @{ShipEssentialComponentsPowerTotal}"/>
         </div>
         <div class="gridbox2">
-            <input name="attr_Hullintegrity" type="number" min="0" class="cur" style="width:18%"/>
-            <label style="width:64%; text-align:center" class="help" title="(Left: Current value - Right: Maximun Value)">&#9204; Hull Integrity &#128712; &#9205;</label>
-            <input name="attr_Hullintegrity_max" type="number" min="0" style="width:18%"/>
-            <!-- end of line --> 
-            <button name="roll_ShipMa" type="roll" style="width:75%" title="Ship Manoeuvrability&#10;This Button performs the Ship's Default Manoeuvre&#10;&#10;If the ship is Crippled, Speed will be halved."
-            value="@{gmroll}&{template:custom} {{name=**@{ShipName} performs Default Manoeuvre**}} {{d1=**Ship's** ?{Select Speed|Full Speed,**Full Speed** [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,**Half Speed** [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] } }} {{t1=**Turn Arc: @{ShipTurnArc} **}}">
-                <label>Manoeuvrability &#128712;</label></button>
-            <input name="attr_ShipManoeuvrability" style="width:25%" type="text" value="0"/>
-            <!-- end of line -->
-            <button style="width:75%" name="roll_ShipTurret" type="roll" title="Ship Turret Rating&#10;This button Rolls Shooting Action Score + Turret Rating x5&#10;&#10;Use Before attacker rolls Torpedoes or Attack Craft&#10;If the Ship does not have Turret Rating then&#10;this action is not possible."
-            value="@{gmroll}&{template:custom} {{name=**@{ShipName} uses defensive Turrets**}} {{dosdof=[[(((  ([[(@{ShipBallistic} + (@{ShipTurretRating}*5) + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=Success equals [[1]]&#10;Torpedo or Squadron destroyed&#10;**+1** for every two Degrees of Success}}">
-                <label>Turret Rating &#128712;</label></button>
-            <input name="attr_ShipTurretRating" style="width:25%" type="number"/>
-            <!-- end of line -->
-            <label style="width:55%">Ship Points (SP):</label>
-            <input name="attr_ShipSP" style="width:20%" type="number"/>
+            <button style="width:58%" name="roll_calcship" type="roll" 
+                value="@{gmroll}&{template:custom} {{name=@{ShipName} - Damage Taken}} {{d1= [[ {?{Damage|1} - (@{ShipArmour}),0}kh1 ]] }}">
+                <label style="width:85%">Hull Integrity</label>
+                <b style="width:15%" title="Ship Hull Integrity&#10;This Button is a Damage Calculator.&#10;(Damage minus Armour)">?</b>
+            </button>
             <div class="spacing" style="width:1%"></div>
-            <input name="attr_ShipTotalSP" style="width:24%" type="text" title="Ship SP + Components SP" disabled value="@{ShipSupplementalComponentsSPTotal} + @{ShipEssentialComponentsSPTotal} + @{ShipSP}"/>
+            <input name="attr_Hullintegrity_max" type="number" min="0" style="width:17%"/>
+            <i style="width:7%">&#10095;</i>
+            <input name="attr_Hullintegrity" type="number" min="0" class="cur" style="width:17%"/>
+            <!-- end of line --> 
+            <button name="roll_ShipMa" type="roll" style="width:80%"
+            value="@{gmroll}&{template:custom} {{name=**@{ShipName} performs Default Manoeuvre**}} {{d1=**Ship's** ?{Select Speed|Full Speed,**Full Speed** [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,**Half Speed** [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] } }} {{t1=**Turn Arc: @{ShipTurnArc} **}}">
+                <label style="width:85%">Manoeuvrability</label>
+                <b style="width:15%" title="Ship Manoeuvrability&#10;This Button performs the Ship's Default Manoeuvre&#10;&#10;If the ship is Crippled, Speed will be halved.">?</b>
+            </button>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_ShipManoeuvrability" style="width:19%" type="text" value="0"/>
             <!-- end of line -->
-            <label style="width:37%" class="help" title="Input here Space value provided by Hull Type">Space Max:</label>
-            <input name="attr_ShipSpaceMax" type="number" style="width:17%"/>
-            <div class="spacing" style="width:10%"></div>
-            <label style="width:19%" class="help" title="Total Space used by all components">Used:</label>
-            <input disabled name="attr_ShipSpaceUsed" type="text" style="width:17%" value="@{ShipSupplementalComponentsSpaceTotal} + @{ShipEssentialComponentsSpaceTotal}"/>
+            <button style="width:80%" name="roll_ShipTurret" type="roll"
+            value="@{gmroll}&{template:custom} {{name=@{ShipName} uses defensive Turrets}} {{dosdof=[[(((  ([[(@{ShipBallistic} + (@{ShipTurretRating}*5) + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=Success equals [[1]]&#10;Torpedo or Squadron destroyed&#10;**+1** for every two Degrees of Success}}">
+                <label style="width:85%">Turret Rating</label>
+                <b style="width:15%" title="Ship Turret Rating&#10;This button Rolls Shooting Action Score + Turret Rating x5&#10;&#10;Use Before attacker rolls Torpedoes or Attack Craft&#10;If the Ship does not have Turret Rating then&#10;this action is not possible.">?</b>
+            </button>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_ShipTurretRating" style="width:19%" type="number"/>
+            <!-- end of line -->
+            <label style="width:61%; text-align:center">Ship Points (SP):</label>
+            <input style="width:19%" name="attr_ShipSP" type="number"/>
+            <div class="spacing" style="width:1%"></div>
+            <input style="width:19%" name="attr_ShipTotalSP" type="text" disabled value="@{ShipSupplementalComponentsSPTotal} + @{ShipEssentialComponentsSPTotal} + @{ShipSP}"/>
+            <!-- end of line -->
+            <label style="width:27%; text-align:right">Shields:</label>
+            <div class="spacing" style="width:1%"></div>
+            <input name="attr_ShipShields" style="width:13%" type="number" min="0"/>
+            <label style="width:27%; text-align:right">Space:</label>
+            <div class="spacing" style="width:1%"></div>
+            <input style="width:15%" name="attr_ShipSpaceMax" type="number"/>
+            <div class="spacing" style="width:1%"></div>
+            <input style="width:15%" disabled name="attr_ShipSpaceUsed" type="text" value="@{ShipSupplementalComponentsSpaceTotal} + @{ShipEssentialComponentsSpaceTotal}"/>
         </div>
         <div class="gridbox3">
-            <button name="roll_CrewTest" type="roll" style="width:32%" value="@{gmroll}&{template:custom} {{name=@{ShipName}'s Crew Test}} {{dosdof=[[(((  ([[(@{ShipCrewRating}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+            <button style="width:43%" name="roll_CrewTest" type="roll" value="@{gmroll}&{template:custom} {{name=@{ShipName} - ^{CrewTest}}} {{dosdof=[[(((  ([[(@{ShipCrewRating}+?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
                 <label>Crew Test</label></button>
-            <div class="spacing" style="width:2%"></div>
-            <label style="width:17%; text-align:center" class="help" title="Crew Rating&#10;&#10;Incompetent(20)&#10;Competent(30)&#10;Crack(40)&#10;Veteran(50)&#10;Elite(60)&#10;&#10;Score required for Crew Test rolls."
-            >&#128712;&#9205;</label>
-            <input name="attr_ShipCrewRating" type="number" style="width:15%" min="0"/>
-            <div class="spacing" style="width:2%"></div>
-            <label style="width:17%; text-align:center" class="help" title="Crew Ballistic Skill&#10;&#10;Used by Ship Weapons Shooting Action rolls&#10;when Crew Ballistic is selected&#10;&#10;Tipically the Crew BS score is equal to Crew Rating&#10;However some ship upgrades and actions&#10;may modify the Crew Ballistic Skill score."
-            >&#128712;&#9205;</label>
-            <input name="attr_CrewBallistic" type="number" style="width:15%" min="0"/>
+            <label style="width:28%; text-align:right" >Rating</label>
+            <b style="width:12%" title="Incompetent(20)&#10;Competent(30)&#10;Crack(40)&#10;Veteran(50)&#10;Elite(60)">?</b>
+            <div class="spacing" style="width:1%"></div>
+            <input style="width:16%" name="attr_ShipCrewRating" type="number" min="0"/>
             <!-- end of line -->
-            <button style="width:49%" name="roll_ShipCritHit" type="roll" title="Shows in chat the selected Critical Hit >>>" value="@{gmroll}&{template:custom} {{name=**Critical Hit!**}} {{desc=@{ShipCritSelect} }}"><label>Critical Hit &#128712;</label></button>
+            <select name="attr_ShipBallistic" style="width:64%">
+                <option disabled style="background:gray;font-weight:bold;color:white;">Shooting Action Score</option>
+                <option value="(@{BallisticSkill}-@{bsmoralmod})">Character Ballistic Skill</option>
+                <option value="(@{CrewBallistic}-@{bsmoralmod})" selected>Crew Ballistic Skill</option>
+            </select>
+            <i style="width:6%">&#10094;</i>
+            <b style="width:8%" title="Crew Ballistic Skill&#10;&#10;Score used by Ship Weapons Shooting Action tests&#10;&#10;Tipically Crew Ballistic Skill is equal to Crew Rating&#10;However some ship upgrades and actions may modify it.&#10;&#10;Select Character Ballistic Skill to&#10;use Ballistic Skill Characteristic instead.">?</b>
+            <i style="width:6%">&#10095;</i>
+            <input name="attr_CrewBallistic" type="number" style="width:16%" min="0"/>
+            <!-- end of line -->
+            <label style="width:52%; text-align:center">Crew Population</label>
+            <b style="width:10%" title="Crew Population % penalties.&#10;As the Population % decreases, the penalties below&#10;are automatically applied, these penalties stack.&#10;The field below shows the lowest penalty only.&#10;Click on the field to Expand.">?</b>
+            <input name="attr_CrewPop_max" type="number" min="0" style="width:16%"/>
+            <i style="width:6%">&#10095;</i>
+            <input name="attr_CrewPop" type="number" min="0" class="cur" style="width:16%"/>
+            <!-- end of line -->
+            <textarea name="attr_crewpopeffect" class="crewef" value="" readonly="true"></textarea>
+            <input name="attr_crewmod" type="hidden" value="0"/><!--hidden attr for script-->
+            <input name="attr_crewmanu" type="hidden" value="0"/><!--hidden attr for script-->
+        </div>
+        <div class="gridbox4">
+            <button style="width:49%" name="roll_ShipCritHit" type="roll" title="Shows in chat the selected Critical Hit >>>" value="@{gmroll}&{template:custom} {{name=**Critical Hit!**}} {{desc=@{ShipCritSelect} }}"><label data-i18n="crit-table">Critical Hit Table</label></button>
             <div class="spacing" style="width:2%"></div>
             <select name="attr_ShipCritSelect" style="width:49%">
                 <option disabled style="background:gray;font-weight:bold;color:white;">Critical Hits</option>
@@ -3602,39 +3785,25 @@
                     <option value="**Shipboard Fire**&#10;If a Component catches fire, it immediately deals [[1d5]] **Damage to Crew Population** and [[1d10]] **Damage to Crew Morale**, and spreads through the entire Component. If the fire is not brought under control in one Strategic Turn, it consumes the Component (it now counts as **Damaged**), and moves on. *The GM selects a new Component, and treats it as catching fire* (including the Crew Population and Morale damage) see pag. 223 for details.">Shipboard Fire</option>
             </select>
             <!-- end of line -->
-            <input name="attr_CrewPop" type="number" min="0" class="cur" style="width:17%"/>
-            <label style="width:66%; text-align:center" class="help" title="Crew Population % penalties.&#10;(Left: Current value - Right: Maximun Value)&#10;&#10;As the Population % decreases, the penalties below&#10;are automatically applied, these penalties stack.&#10;The field below shows the lowest penalty only.&#10;Click on the field to Expand."
-            >&#9204; Crew Pop. &#128712; &#9205;</label>
-            <input name="attr_CrewPop_max" type="number" min="0" style="width:17%"/>
-            <textarea name="attr_crewpopeffect" class="crewef" value="" readonly="true"></textarea>
-            <input name="attr_crewmod" type="hidden" value="0"/><!--hidden attr for script-->
-            <input name="attr_crewmanu" type="hidden" value="0"/><!--hidden attr for script-->
-        </div>
-        <div class="gridbox4">
-            <select name="attr_ShipBallistic" style="width:49%" title="The selected score is used by the Ship Weapons Shooting Action roll.&#10;&#10;Explorer BS Score is the Ballistic Skill Characteristic&#10;Crew BS is the field to the left&#10;&#10;Characters performing the Shooting Action&#10;Cannot perform Extended Actions.">
-                <option disabled style="background:gray;font-weight:bold;color:white;">Shooting Action Score&nbsp;</option>
-                    <option value="(@{BallisticSkill}-@{bsmoralmod})">Explorer Ballistic Skill</option>
-                    <option value="(@{CrewBallistic}-@{bsmoralmod})" selected>Crew Ballistic Skill</option>
-            </select>
-            <div class="spacing" style="width:2%"></div>
-            <button name="roll_ejump" type="roll" style="width:49%" title="Emergency Warp Jump - Very Hard (–30) Navigation (Warp) Test -&#10;In hopeless situations, the Navigator can try to quickly plot an escape route into the Warp&#10;&#10;During the ship's strategic turn, If the test Succeeds, the ship escapes into the Warp.&#10;It can also be used to escape during Narrative Time.&#10;&#10;However most crew members are horrified of what could happen and as such&#10;after the action is taken the Crew suffers 1d10 to Morale (regardless of the result)&#10;&#10;This Action is not possible if the Warp or Plasma Drive is Damaged&#10;Unpowered or Destroyed.&#10;&#10;What happens after, is up to the GM (but it should be suitably horrible)&#10;&#10;WARNING: For this macro to work properly, the skill -Navigation (Warp)-&#10;Must be the FIRST (top of the list) skill in the NAVIGATION SKILL GROUP (Skills Tab)"
-            value="@{gmroll}&{template:custom} {{name=@{ShipName}&#10;Emergency Warp Jump Engaged!}} {{dosdof=[[(((  ([[(@{repeating_navigation_$0_navigation} -30 + (?{Other Modifiers|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=**Crew Morale Damage** [[1d10]]}}">
-                <label>Warp E-Jump &#128712;</label></button>
-            <!-- end of line -->
-            <label class="fancyButton" style="width:49%; font-size:13px"
-                title="Check Here if the Ship is Crippled&#10;&#10;Crippled ships suffer –10 penalty to its&#10;Manoeuvrability and Detection&#10;This penalty affects Extended Actions that&#10;require Detection or Manoeuvrability.&#10;&#10;Also Reduces the Ships Speed and&#10;the Strength of all Weapons by half.&#10;(rounding up)">
+            <label class="fancyButton" style="width:49%">
                 <input type="checkbox" name="attr_ShipCrippled" value="10" hidden="true" />
-                <div>Crippled &#128712;</div>
+                <div style="font-size:0px"><span style="width:80%" data-i18n="crippled">Crippled</span>
+                <b style="width:20%" title="Click Here if the Ship is Crippled&#10;&#10;Crippled ships suffer –10 penalty to its&#10;Manoeuvrability and Detection&#10;This penalty affects Extended Actions.&#10;&#10;Also Reduces the Ships Speed and&#10;the Strength of all Weapons by half.&#10;(rounding up)">?</b>
+                </div>
             </label>
             <input name="attr_ShipCrippled2" type="hidden" value="0"/><!--hidden attr for script-->
             <div class="spacing" style="width:2%"></div>
-            <button name="roll_ShipIni" style="width:49%" title="Select Ship Token First!&#10;Rolls Ship Initiative&#10;&#10;1d10 + Detection Bonus" type="roll" value="@{gmroll}&{template:custom} {{name=**@{ShipName}'s Initiative**}} {{t1=**Ship's Detection** [[@{ShipDetection}]] }} {{d1=**Initiative Result** [[(floor(@{ShipDetection}/10))+1d10&{tracker&#125;]] }}">
-                <label>Initiative &#128712;</label></button>
+            <button name="roll_ShipIni" style="width:49%"type="roll" value="@{gmroll}&{template:custom} {{name=**@{ShipName}'s Initiative**}} {{t1=**Ship's Detection** [[@{ShipDetection}]] }} {{d1=**Initiative Result** [[(floor(@{ShipDetection}/10))+1d10&{tracker&#125;]] }}">
+                <label style="width:80%">Initiative</label>
+                <b style="width:20%" title="Select Ship Token First!&#10;Rolls Ship Initiative (1d10 + Detection Bonus)">?</b>
+            </button>
+            <!-- end of line -->
+            <label style="width:52%; text-align:center">Crew Morale</label>
+            <b style="width:10%" title="Crew Morale % penalties.&#10;As Morale % decreases, the penalties below&#10;are automatically applied, these penalties stack.&#10;The field below shows the lowest penalty only.&#10;Click on the field to Expand.">?</b>
+            <input name="attr_CrewMorale_max" type="number" min="0" style="width:16%"/>
+            <i style="width:6%">&#10095;</i>
+            <input name="attr_CrewMorale" type="number" min="0" class="cur" style="width:16%"/>
             <!-- end of line -->
-            <input name="attr_CrewMorale" type="number" min="0" class="cur" style="width:17%"/>
-            <label style="width:66%; text-align:center" class="help" title="Crew Morale % penalties.&#10;(Left: Current value - Right: Maximun Value)&#10;&#10;As Morale % decreases, the penalties below&#10;are automatically applied, these penalties stack.&#10;The field below shows the lowest penalty only.&#10;Click on the field to Expand."
-            >&#9204; Crew Morale &#128712; &#9205;</label>
-            <input name="attr_CrewMorale_max" type="number" min="0" style="width:17%"/>
             <textarea name="attr_crewmoreffect" class="crewef" value="" readonly="true"></textarea>
             <input name="attr_moralemod" type="hidden" value="0"/><!--hidden attr for script-->
             <input name="attr_bsmoralmod" type="hidden" value="0"/><!--hidden attr for script-->
@@ -3642,229 +3811,354 @@
             <input name="attr_detmoralmod" type="hidden" value="0"/><!--hidden attr for script-->
         </div>
     </div>
-    <label style="width:24%" class="help" title="Explorers can attempt to perform an Advanced Manoeuvre.&#10;&#10;If the test fails, the Ship performs its Default Manoeuvre.&#10;If Successful, the test modifies the Ships movement (but does not replace it)&#10;&#10;WARNING: For these macros to work properly, the skill -Pilot (Space Craft)-&#10;Must be the FIRST (top of the list) skill in the PILOT SKILL GROUP (Skills Tab)"
-    >ADVANCED MANOEUVRES &#128712;</label>
-    <input type="radio" name="attr_shipradio" value="3" style="margin:0; width:2%" class="torpedo"/>
-    <div class="spacing" style="width:13%"></div>
-    <label style="width:19%" class="help" title="Extended Shipboard actions use&#10;Skill scores taken from the Skills Tab&#10;&#10;Intended to be used by players from&#10;their own Character Sheets.&#10;&#10;Extented Actions listed difficulty is&#10;already added to the rolls.&#10;&#10;Some actions do require Detection&#10;and Manoeuvrability scores."
-    >EXTENDED ACTIONS &#128712;</label>
-    <input type="radio" name="attr_shipradio" value="1" style="margin:0; width:2%" class="macro" checked="true"/>
-    <div class="spacing" style="width:20%"></div>
-    <label style="width:18%" class="help" title="NPC Shipboard actions and Critical table&#10;&#10;Intended to be used by the GM to control&#10;multiple smaller enemy vessels&#10;&#10;NPC vessels may perform 1 order per round&#10;these orders do not require a test.&#10;&#10;The NPC Critical Hit table is meant to&#10;simplify Critical Hits, and thus is focused only&#10;on effects that matter in starship combat."
-    >NPC SHIP ACTIONS &#128712;</label>
-    <input type="radio" name="attr_shipradio" value="2" style="margin:0; width:2%" class="lance"/>
+    <input type="hidden" class="shiptoggle" name="attr_shiptabtoggle" value="shipmanu"/>
+    <div style="margin: 5px 0">
+        <label class="fancyButton" style="width:20%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipmanu" hidden="true" checked="true"/>
+            <div style="font-size:0px"><span style="width:90%">Advanced Manoeuvres</span>
+            <b style="width:10%" title="Explorers can attempt to perform an Advanced Manoeuvre.&#10;&#10;If the test fails, the Ship performs its Default Manoeuvre.&#10;If Successful, the test modifies the Ships movement (but does not replace it)&#10;&#10;WARNING: For these macros to work properly, the skill -Pilot (Space Craft)-&#10;Must be the FIRST (top of the list) skill in the PILOT SKILL GROUP (Skills Tab)">?</b>
+            </div>
+        </label>
+        <div class="spacing" style="width:7%"></div>
+        <label class="fancyButton" style="width:20%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipaction" hidden="true" />
+            <div style="font-size:0px"><span style="width:90%">Extended Actions</span>
+            <b style="width:10%" title="Extended Shipboard actions use&#10;Skill scores taken from the Skills Tab&#10;&#10;Intended to be used by players from&#10;their own Character Sheets.&#10;&#10;Extented Actions listed difficulty is&#10;already added to the rolls.&#10;&#10;Some actions do require Detection&#10;and Manoeuvrability scores.">?</b>
+            </div>
+        </label>
+        <div class="spacing" style="width:7%"></div>
+        <label class="fancyButton" style="width:20%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipwp4" hidden="true" />
+            <div style="font-size:0px"><span style="width:90%">Complications</span>
+            <b style="width:10%" title="Past Histories, Machine Spirit Oddities and Background.">?</b>
+            </div>
+        </label>
+        <div class="spacing" style="width:6%"></div>
+        <label class="fancyButton" style="width:20%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipnpc" hidden="true" />
+            <div style="font-size:0px"><span style="width:90%">NPC Ship Actions</span>
+            <b style="width:10%" title="NPC Shipboard actions and Critical table&#10;&#10;Intended to be used by the GM to control&#10;multiple smaller enemy vessels&#10;&#10;NPC vessels may perform 1 order per round&#10;these orders do not require a test.&#10;&#10;The NPC Critical Hit table is meant to&#10;simplify Critical Hits, and thus is focused only&#10;on effects that matter in starship combat.">?</b>
+            </div>
+        </label>
+    </div>
     <!--end of line-->
-	<div id="shipwp1">
+	<div class="shipaction">
 		<div class="grid4">
 			<div class="gridbox1">
-				<button style="width:100%" name="roll_PutYourBacks" type="roll" title="Challenging (+0) Intimidate or Charm Test&#10;If he succeeds, he can choose to add +5&#10;to a Ballistic Skill Test to fire 1 Weapon Component&#10;an Emergency Repairs Action, or an attempt to&#10;Put Out a Fire made during this turn.&#10;&#10;He may aid an additional Ballistic Skill&#10;Test, Emergency Repairs Action,&#10;or firefighting, for every three degrees of success."
+				<button style="width:100%" name="roll_PutYourBacks" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to Put Your Backs Into It!**}} {{dosdof=[[(((  ([[( ?{Choose Skill|Intimidate,@{intimidate}|Charm,@{Charm}} + ?{Modifier|0} )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Put Your Backs Into It! &#128712;</label></button>
+					<label style="width:90%">Put Your Backs Into It!</label>
+					<b style="width:10%" title="Challenging (+0) Intimidate or Charm Test&#10;If he succeeds, he can choose to add +5&#10;to a Ballistic Skill Test to fire 1 Weapon Component&#10;an Emergency Repairs Action, or an attempt to&#10;Put Out a Fire made during this turn.&#10;&#10;He may aid an additional Ballistic Skill&#10;Test, Emergency Repairs Action,&#10;or firefighting, for every three degrees of success.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_ActiveAugury" type="roll" title="Challenging (+0) Scrutiny + Detection Test&#10;The character test to scan the area surrounding the ship.&#10;&#10;If the scan is successful, the GM should reveal relevant information&#10;about celestial bodies, phenomena, and ships within 20 VUs of the vessel.&#10;If there is a vessel on Silent Running within scan range, it is immediately detected.&#10;&#10;For every degree of success, the character can extend the range of his scan by 5 VUs"
+				<button style="width:100%" name="roll_ActiveAugury" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts Active Augury}} {{dosdof=[[(((  ([[(@{Scrutiny} + @{ShipDetection} - @{ShipCrippled} - @{detmoralmod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Active Augury &#128712;</label></button>
+					<label style="width:90%">Active Augury</label>
+					<b style="width:10%" title="Challenging (+0) Scrutiny + Detection Test&#10;The character test to scan the area surrounding the ship.&#10;&#10;If the scan is successful, the GM should reveal relevant information&#10;about celestial bodies, phenomena, and ships within 20 VUs of the vessel.&#10;If there is a vessel on Silent Running within scan range, it is immediately detected.&#10;&#10;For every degree of success, the character can extend the range of his scan by 5 VUs">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_FlankSpeed" type="roll" title="Challenging (+0) Tech-Use Test&#10;The character test to nurse the ship’s engines and push them to their limits.&#10;Success means the ship may move an additional VU this turn.&#10;&#10;Every degree of success allows an additional VU of movement.&#10;&#10;Failure by 2 or more degrees means the ship immediately suffers&#10;an Engines Crippled critical hit as the engines are strained too hard."
+				<button style="width:100%" name="roll_FlankSpeed" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to push Flank Speed**}} {{dosdof=[[(((  ([[(@{tech-use} + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Flank Speed &#128712;</label></button>
+					<label style="width:90%">Flank Speed</label>
+					<b style="width:10%" title="Challenging (+0) Tech-Use Test&#10;The character test to nurse the ship’s engines and push them to their limits.&#10;Success means the ship may move an additional VU this turn.&#10;&#10;Every degree of success allows an additional VU of movement.&#10;&#10;Failure by 2 or more degrees means the ship immediately suffers&#10;an Engines Crippled critical hit as the engines are strained too hard.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_LockTarget" type="roll" title="Challenging (+0) Scrutiny + Detection Test&#10;The character test to use the ship’s augers to&#10;calculate firing solutions on an enemy vessel.&#10;&#10;If successful, he adds a +5 bonus to the Ballistic Skill&#10;Test to fire 1 Weapon Component during this turn.&#10;Every 2 additional degrees of success adds +5 more to the same Test."
+				<button style="width:100%" name="roll_LockTarget" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to Lock on Target**}} {{dosdof=[[(((  ([[(@{Scrutiny} + @{ShipDetection} - @{ShipCrippled} - @{detmoralmod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Lock on Target &#128712;</label></button>
+					<label style="width:90%">Lock on Target</label>
+					<b style="width:10%" title="Challenging (+0) Scrutiny + Detection Test&#10;The character test to use the ship’s augers to&#10;calculate firing solutions on an enemy vessel.&#10;&#10;If successful, he adds a +5 bonus to the Ballistic Skill&#10;Test to fire 1 Weapon Component during this turn.&#10;Every 2 additional degrees of success adds +5 more to the same Test.">?</b>
+				</button>
 			</div>
 			<div class="gridbox2">
-				<button style="width:100%" name="roll_AidMachine" type="roll" title="Challenging (+0) Tech-Use Test&#10;The character test to commune with the ship’s machine spirit and aid it.&#10;&#10;On success, the character may add +5 to the ship’s Manoeuvrability&#10;or Detection for the remainder of the turn.&#10;&#10;For every 2 additional degrees of success,&#10;the character may add an additional +5 to the same system."
+				<button style="width:100%" name="roll_AidMachine" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Aid the Machine Spirit}} {{dosdof=[[(((  ([[(@{tech-use} + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Aid the Machine Spirit &#128712;</label></button>
+					<label style="width:90%">Aid the Machine Spirit</label>
+					<b style="width:10%" title="Challenging (+0) Tech-Use Test&#10;The character test to commune with the ship’s machine spirit and aid it.&#10;&#10;On success, the character may add +5 to the ship’s Manoeuvrability&#10;or Detection for the remainder of the turn.&#10;&#10;For every 2 additional degrees of success,&#10;the character may add an additional +5 to the same system.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_FocusedAugury" type="roll" title="Challenging (+0) Scrutiny + Detection Test&#10;The character test to scan a particular ship within 20 VUs of his vessel.&#10;A successful scan reveals a number of Components aboard the target ship.&#10;&#10;-Basic Success: All Essential Components except Auger Arrays and Void Shields.&#10;-1 Degree of Success: All Weapon Components&#10;-2 Degrees of Success: Auger Arrays, Void Shields, and any combat related Components&#10;-3 Degrees of Success: All Components aboard the target ship."
+				<button style="width:100%" name="roll_FocusedAugury" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts Focused Augury}} {{dosdof=[[(((  ([[(@{Scrutiny} + @{ShipDetection} - @{ShipCrippled} - @{detmoralmod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Focused Augury &#128712;</label></button>
+					<label style="width:90%">Focused Augury</label>
+					<b style="width:10%" title="Challenging (+0) Scrutiny + Detection Test&#10;The character test to scan a particular ship within 20 VUs of his vessel.&#10;A successful scan reveals a number of Components aboard the target ship.&#10;&#10;-Basic Success: All Essential Components except Auger Arrays and Void Shields.&#10;-1 Degree of Success: All Weapon Components&#10;-2 Degrees of Success: Auger Arrays, Void Shields, and any combat related Components&#10;-3 Degrees of Success: All Components aboard the target ship.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_PutOutFire" type="roll" title="Difficult (–10) Command Test&#10;The character test to organise firefighting teams&#10;and attempt to put the fire out.&#10;&#10;Multiple characters may organise but only one needs to succeed.&#10;&#10;Alternatively, the ship’s captain can choose&#10;to vent the burning compartments into the void.&#10;See Vent Burning Component in Critical Hits selector."
+				<button style="width:100%" name="roll_PutOutFire" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Put Out a Fire}} {{dosdof=[[(((  ([[(@{Command} - 10 - @{crewmod} - @{moralemod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Put Out Fire &#128712;</label></button>
+					<label style="width:90%">Put Out Fire</label>
+					<b style="width:10%" title="Difficult (–10) Command Test&#10;The character test to organise firefighting teams&#10;and attempt to put the fire out.&#10;&#10;Multiple characters may organise but only one needs to succeed.&#10;&#10;Alternatively, the ship’s captain can choose&#10;to vent the burning compartments into the void.&#10;See Vent Burning Component in Critical Hits selector.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_RepelBorders" type="roll" title="Challenging (+0) Command Test&#10;The character test to organise and arm a portion of the crew.&#10;&#10;If he succeeds, he may add +10 to any opposed Command Test&#10;he performs against enemy borders during subsequent turns&#10;of combat, plus an additional +5 for every degree of success.&#10;&#10;Although the character is not required to make additional&#10;tests on subsequent turns, he will be occupied rallying the&#10;defenders for as long as he wants to maintain the bonus.&#10;&#10;(Tip) this roll can also be used when actually repelling borders&#10;Just add the appropriate Modifier."
+				<button style="width:100%" name="roll_RepelBorders" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Prepare to Repel Borders!}} {{dosdof=[[(((  ([[(@{Command} - @{crewmod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Prepare to Repel Borders! &#128712;</label></button>
+					<label style="width:90%">Prepare to Repel Borders!</label>
+					<b style="width:10%" title="Challenging (+0) Command Test&#10;The character test to organise and arm a portion of the crew.&#10;&#10;If he succeeds, he may add +10 to any opposed Command Test&#10;he performs against enemy borders during subsequent turns&#10;of combat, plus an additional +5 for every degree of success.&#10;&#10;Although the character is not required to make additional&#10;tests on subsequent turns, he will be occupied rallying the&#10;defenders for as long as he wants to maintain the bonus.&#10;&#10;(Tip) this roll can also be used when actually repelling borders&#10;Just add the appropriate Modifier.">?</b>
+				</button>
 			</div>
 			<div class="gridbox3">
-				<button style="width:100%" name="roll_Disinformation" type="roll" title="Difficult (–10) Deceive or Blather Test&#10; If the character succeeds, he can increase the crew’s Morale by 1d5.&#10;for every degree of success for the duration of the combat."
+				<button style="width:100%" name="roll_Disinformation" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to spread Disinformation**}} {{dosdof=[[(((  ([[( ?{Choose Skill|Deceive,@{Deceive}|Blather,@{Deceive}} - 10 + ?{Modifier|0} )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Disinformation &#128712;</label></button>
+					<label style="width:90%">Disinformation</label>
+					<b style="width:10%" title="Difficult (–10) Deceive or Blather Test&#10; If the character succeeds, he can increase the crew’s Morale by 1d5.&#10;for every degree of success for the duration of the combat.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_HoldFast" type="roll" title="*The character must have Air of Authority (or similar Talent at GM’s discretion)&#10;&#10;Challenging (+0) Willpower Test&#10;If he succeeds, he inspires the crew and reduces any damage to Morale by 1&#10;plus 1 for every degree of success to a minimum of 1.&#10;&#10;Hold Fast! may only cancel out Morale damage suffered during the previous turn."
+				<button style="width:100%" name="roll_HoldFast" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} order the Crew to Hold Fast!**}} {{dosdof=[[(((  ([[(@{Willpower} + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Hold Fast! &#128712;</label></button>
+					<label style="width:90%">Hold Fast!</label>
+					<b style="width:10%" title="*The character must have Air of Authority (or similar Talent at GM’s discretion)&#10;&#10;Challenging (+0) Willpower Test&#10;If he succeeds, he inspires the crew and reduces any damage to Morale by 1&#10;plus 1 for every degree of success to a minimum of 1.&#10;&#10;Hold Fast! may only cancel out Morale damage suffered during the previous turn.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_HitRun1" type="roll" title="Challenging (+0) Pilot (Space Craft) - Enemy Ship's Turret Rating (if any) Test&#10;Part 1 of the Hit & Run action.&#10;&#10;The character attemps to approach an Enemy Ship within 5 VUs&#10;In a boarding craft, along a team of raiders.&#10;&#10;If Successful then the character can start the (Raid) action.&#10;If Failed, he is forced to retreat back to his ship&#10;If Failed by 4 or more Degrees, the character either survives stranded or Dies&#10;(at GMs discretion)&#10;&#10;This action can be replaced by:&#10;*Using a Teleportarium component (Enemy Void Shields must be down)&#10;*Boarding Torpedoes (Salvo must score at least 1 Hit)&#10;*Assault Boats (Squadron must score at least 1 Hit)&#10;&#10;WARNING: For this macro to work properly, the skill -Pilot (Space Craft)-&#10;Must be the FIRST (top of the list) skill in the PILOT SKILL GROUP (Skills Tab)"
+				<button style="width:100%" name="roll_HitRun1" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to approach the Enemy Ship! (H&R)**}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot} - ((?{Enemy Turret Rating|0})*10) + ?{Other Modifiers|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Hit & Run (Approach) &#128712;</label></button>
+					<label style="width:90%">Hit & Run (Approach)</label>
+					<b style="width:10%" title="Challenging (+0) Pilot (Space Craft) - Enemy Ship's Turret Rating (if any) Test&#10;Part 1 of the Hit & Run action.&#10;&#10;The character attemps to approach an Enemy Ship within 5 VUs&#10;In a boarding craft, along a team of raiders.&#10;&#10;If Successful then the character can start the (Raid) action.&#10;If Failed, he is forced to retreat back to his ship&#10;If Failed by 4 or more Degrees, the character either survives stranded or Dies&#10;(at GMs discretion)&#10;&#10;This action can be replaced by:&#10;*Using a Teleportarium component (Enemy Void Shields must be down)&#10;*Boarding Torpedoes (Salvo must score at least 1 Hit)&#10;*Assault Boats (Squadron must score at least 1 Hit)&#10;&#10;WARNING: For this macro to work properly, the skill -Pilot (Space Craft)-&#10;Must be the FIRST (top of the list) skill in the PILOT SKILL GROUP (Skills Tab)">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_HitRun2" type="roll" title="Opposed Ordinary (+10) Command Test&#10;Part 2 of the Hit and Run action.&#10;&#10;Test against the commander of the troops aboard the Enemy Ship.&#10;&#10;If the character succeeds, he deals a 1d5 Critical Hit on the Enemy Ship&#10;Plus 1 point of Damage to Hull Integrity for every Degree of Success&#10;&#10;If he Fails, he is forced to retreat dealing No damage or Criticals.&#10;&#10;(optional rule)&#10;If the  character Fails by 4 or more degrees, the character is either&#10;captured (and possibly tortured) or Killed during the Raid. (at GMs discretion)"
+				<button style="width:100%" name="roll_HitRun2" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to Sabotage the Enemy Ship! (H&R)**}} {{dosdof=[[(((  ([[(@{Command} + 10 - @{moralemod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=**On Success H&R deals a [[1d5]] Critical Hit&#10;**Degrees of Success = 1 Hull Int. Damage**}}">
-					<label>Hit & Run (Raid) &#128712;</label></button>
+					<label style="width:90%">Hit & Run (Raid)</label>
+					<b style="width:10%" title="Opposed Ordinary (+10) Command Test&#10;Part 2 of the Hit and Run action.&#10;&#10;Test against the commander of the troops aboard the Enemy Ship.&#10;&#10;If the character succeeds, he deals a 1d5 Critical Hit on the Enemy Ship&#10;Plus 1 point of Damage to Hull Integrity for every Degree of Success&#10;&#10;If he Fails, he is forced to retreat dealing No damage or Criticals.&#10;&#10;(optional rule)&#10;If the  character Fails by 4 or more degrees, the character is either&#10;captured (and possibly tortured) or Killed during the Raid. (at GMs discretion)">?</b>
+				</button>
 			</div>
 			<div class="gridbox4">
-				<button style="width:100%" name="roll_EmRepairs" type="roll" title="Difficult (–10) Tech-Use Test&#10;The character test to direct and aid repair crews. If Successful, he repairs&#10;one Unpowered, Damaged, or Depressurized Component.&#10;&#10;Repairs normally take 1d5 turns, however, this can be reduced by&#10;one turn per Degree of Success, to a minimum of one turn.&#10;Emergency Repairs cannot fix Destroyed Components."
+				<button style="width:100%" name="roll_EmRepairs" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to do Emergency Repairs}} {{dosdof=[[(((  ([[(@{tech-use} - 10 - @{crewmod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Emergency Repairs &#128712;</label></button>
+					<label style="width:90%">Emergency Repairs</label>
+					<b style="width:10%" title="Difficult (–10) Tech-Use Test&#10;The character test to direct and aid repair crews. If Successful, he repairs&#10;one Unpowered, Damaged, or Depressurized Component.&#10;&#10;Repairs normally take 1d5 turns, however, this can be reduced by&#10;one turn per Degree of Success, to a minimum of one turn.&#10;Emergency Repairs cannot fix Destroyed Components.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_JamComm" type="roll" title="Difficult (–10) Tech-Use Test&#10;The character targets a ship within 10 VUs of his vessel.&#10;If he succeeds, that ship is unable to use vox-transmitters or other&#10;technologies to communicate with other ships.&#10;&#10;Psychic (Astropathic) communications are unaffected.&#10;For every degree of success, the range of Jam Communications&#10;is extended by 1 VU."
+				<button style="width:100%" name="roll_JamComm" type="roll"
 				value="@{gmroll}&{template:custom} {{name=**@{character_name} attempts to Jam Communications**}} {{dosdof=[[(((  ([[(@{tech-use} - 10 + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Jam Communications &#128712;</label></button>
+					<label style="width:90%">Jam Communications</label>
+					<b style="width:10%" title="Difficult (–10) Tech-Use Test&#10;The character targets a ship within 10 VUs of his vessel.&#10;If he succeeds, that ship is unable to use vox-transmitters or other&#10;technologies to communicate with other ships.&#10;&#10;Psychic (Astropathic) communications are unaffected.&#10;For every degree of success, the range of Jam Communications&#10;is extended by 1 VU.">?</b>
+				</button>
 				<!-- end of line -->
-				<button style="width:100%" name="roll_Triage" type="roll" title="Difficult (–10) Medicae Test&#10;If he succeeds, he reduces any damage&#10;to Crew Population by 1 plus 1&#10;for every degree of success to a minimum of 1.&#10;&#10;Triage may only cancel Crew Population&#10;damage suffered during the previous Turn."
+				<button style="width:39.5%" name="roll_Triage" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Triage}} {{dosdof=[[(((  ([[(@{Medicae} - 10 + ?{Modifier|0})]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Triage &#128712;</label></button>
-				<!-- end of line -->
-				<button style="width:49.5%" name="roll_RTubes" type="roll" title="Difficult (–10) Command or Tech-Use Test&#10;Normally, it takes a full Strategic Turn in combat&#10;to reload any empty tubes on a vessel, at which point the&#10;torpedoes may be fired in subsequent turns.&#10;&#10;However, performing this extended action successfully&#10;reloads all empty torpedo tubes and may be fired during&#10;the same Strategic Turn."
-				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Reload Torpedo Tubes}} {{dosdof=[[(((  ([[( ?{Choose Skill|Command,@{Command} - @{moralemod}|Tech-Use,@{tech-use}} - 10 + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Reload Tubes &#128712;</label></button>
+					<label style="width:78%">Triage</label>
+					<b style="width:22%" title="Difficult (–10) Medicae Test&#10;If he succeeds, he reduces any damage&#10;to Crew Population by 1 plus 1&#10;for every degree of success to a minimum of 1.&#10;&#10;Triage may only cancel Crew Population&#10;damage suffered during the previous Turn.">?</b>
+				</button>
 				<div class="spacing" style="width:1%"></div>
-				<button style="width:49.5%" name="roll_RSquad" type="roll" title="Ordinary (+10) Command Test&#10;In the midst of battle, things are a little more hectic&#10;and preflight preparations are afforded much less time.&#10;&#10;Success on the test make new squadrons ready for operations.&#10;&#10;The maximum number of squadrons that may be made ready&#10;is equal to the Strength value of the Launch Bay Component being used.&#10;&#10;Multiple Launch Bay Components may be made ready with&#10;a single Extended Action."
+				<button style="width:59.5%" name="roll_RTubes" type="roll"
+				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Reload Torpedo Tubes}} {{dosdof=[[(((  ([[( ?{Choose Skill|Command,@{Command} - @{moralemod}|Tech-Use,@{tech-use}} - 10 + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
+					<label style="width:82%">Reload Tubes</label>
+					<b style="width:18%" title="Difficult (–10) Command or Tech-Use Test&#10;Normally, it takes a full Strategic Turn in combat&#10;to reload any empty tubes on a vessel, at which point the&#10;torpedoes may be fired in subsequent turns.&#10;&#10;However, performing this extended action successfully&#10;reloads all empty torpedo tubes and may be fired during&#10;the same Strategic Turn.">?</b>
+				</button>
+				<!-- end of line -->
+				<button style="width:100%" name="roll_RSquad" type="roll"
 				value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Ready Attack Crafts}} {{dosdof=[[(((  ([[(@{Command} + 10 - @{moralemod} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}">
-					<label>Ready Craft &#128712;</label></button>
+					<label style="width:90%">Ready Attack Craft</label>
+					<b style="width:10%" title="Ordinary (+10) Command Test&#10;In the midst of battle, things are a little more hectic&#10;and preflight preparations are afforded much less time.&#10;&#10;Success on the test make new squadrons ready for operations.&#10;&#10;The maximum number of squadrons that may be made ready&#10;is equal to the Strength value of the Launch Bay Component being used.&#10;&#10;Multiple Launch Bay Components may be made ready with&#10;a single Extended Action.">?</b>
+				</button>
 			</div>
 		</div>
 	</div>
-    <div id="shipwp2">
-        <button style="width:16%" name="roll_NPCShipCritHit" type="roll" title="Shows NPC Ship Critical Hit effect"
-        value="@{gmroll}&{template:custom} {{name=@{ShipName} suffers a Critical Hit!}} {{desc= ?{Select|Crit 1 (Hull Damaged),**Hull Damaged**&#10;Bulkheads rupture and the hull implodes dealing an additional +2 Hull Integrity damage to the vessel. If damaged by a weapon that affects multiple Components it deals +4 Hull Integrity damage instead.|
+    <div class="shipnpc">
+        <div class="grid4">
+            <div class="gridbox1">
+                <button style="width:100%" name="roll_NPCShipCritHit" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{ShipName} suffers a Critical Hit!}} {{desc= ?{Select|Crit 1 (Hull Damaged),**Hull Damaged**&#10;Bulkheads rupture and the hull implodes dealing an additional +2 Hull Integrity damage to the vessel. If damaged by a weapon that affects multiple Components it deals +4 Hull Integrity damage instead.|
                 Crit 2 (Weapon Disabled),**Weapon Disabled**&#10;A lucky strike Disables one Weapon Component of the attacker’s choice.|
                 Crit 3 (Sensors Damaged),**Sensors Damaged**&#10;The ship’s sensor systems are damaged by enemy fire. The ship suffers a –10 penalty to Ballistic Skill Tests until the damage is repaired.|
                 Crit 4 (Thrusters Damaged),**Thrusters Damaged**&#10;Thruster assemblies are torn away or rendered inoperable. The ship suffers a –20 penalty to Manoeuvrability until the damage is repaired.|
                 Crit 5 (Fire!),**Fire!**&#10;Alarms scream through the ship as an inferno rages through passageways and compartments and must be contained and extinguished as soon as possible before it will destroy the ship.&#10;Each turn the ship suffers [[1d10]] damage to both Crew Population and Morale and one Component of the GM choice is Disabled.|
                 Crit 6 (Void Shield Disabled),**Void Shield Disabled**&#10;An extremely powerful blow strips away the target’s Void Shields. The Void Shields are inoperative until the damage is repaired.} }}">
-            <label>Critical Hit &#128712;</label></button>
-        <div class="spacing" style="width:1%"></div>
-        <button style="width:12%" name="roll_NPCShipOrder1" type="roll" title="The ship’s speed this Strategic Turn is increased by a&#10;distance determined by Crew Rating, so long as it&#10;only moved in a straight line." 
-        value="@{gmroll}&{template:custom} {{name=Crew performs&#10;All Ahead Full order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): +1 VU&#10;Competent (30): +[[1d5]] VU&#10;Crack (40): +[[1d5+1]] VU&#10;Veteran (50): +[[1d5+2]] VU&#10;Elite (60): +[[2d5]] VU}}">
-            <label>All Ahead Full &#128712;</label></button>
-        <div class="spacing" style="width:1%"></div>
-        <button style="width:13%" name="roll_NPCShipOrder2" type="roll" title="Components equal to Crew Rating BONUS&#10;are returned to full function or a number of fires&#10;are immediately extinguished.&#10;Turns required are determined by Crew Rating." 
-        value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Damage Control order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): 4 Turns&#10;Competent (30): 4 Turns&#10;Crack (40): 3 Turns&#10;Veteran (50): 2 Turns&#10;Elite (60): 1 Turn}}">
-            <label>Damage Control &#128712;</label></button>
-        <div class="spacing" style="width:1%"></div>
-        <button style="width:12%" name="roll_NPCShipOrder3" type="roll" title="The ship’s launch bays unleash the active attack craft.&#10;This can be used to start multiple attack craft operations&#10;as determined by the ship’s Crew Rating" 
-        value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Launch Attack Craft order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): 1 operation&#10;Competent (30): 1 operation&#10;Crack (40): 2 operations&#10;Veteran (50): 3 operations&#10;Elite (60): 4 operations}}">
-            <label>Launch Craft &#128712;</label></button>
-        <div class="spacing" style="width:1%"></div>
-        <button style="width:15%" name="roll_NPCShipOrder4" type="roll" title="The ship gains a bonus to its Manoeuvrability&#10;characteristic as determined by the ship’s Crew Rating" 
-        value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Prepare to Manoeuvre order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): +5 Manoeuvrability&#10;Competent (30): +5 Manoeuvrability&#10;Crack (40): +10 Manoeuvrability&#10;Veteran (50): +10 Manoeuvrability&#10;Elite (60): +15 Manoeuvrability}}">
-            <label>Prep to Manoeuvre &#128712;</label></button>
-        <div class="spacing" style="width:1%"></div>
-        <button style="width:14%" name="roll_NPCShipOrder5" type="roll" title="Torpedoes are loaded into their tubes and attack craft&#10;are armed and fuelled for an operation." 
-        value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Reload Ordnance order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=The ship’s torpedo tubes are loaded, and a number of attack craft squadrons equal to the total Strength rating of the ship’s launch bays are made active.}}">
-            <label>Reload Ordnance &#128712;</label></button>
-        <div class="spacing" style="width:1%"></div>
-        <button style="width:12%" name="roll_NPCShipOrder6" type="roll" title="The ship gains a bonus to its Detection characteristic&#10;and to all attack rolls as determined by the ship’s Crew Rating." 
-        value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Target Lock order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): +5 Detection +5 to Hit&#10;Competent (30): +5 Detection +10 to Hit&#10;Crack (40): +10 Detection +15 to Hit&#10;Veteran (50): +10 Detection +20 to Hit&#10;Elite (60): +15 Detection +20 to Hit}}">
-            <label>Target Lock &#128712;</label></button>
-    </div>
-    <div id="shipwp3">
-        <div class="grid4">
-            <div class="gridbox1">
-                <button style="width:50%" name="roll_AdjBear" type="roll" title="Adjust Bearing&#10;Challenging (+0) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;On a success, the starship may turn after moving&#10;one VU less than its Speed value.(Half or Full)&#10;&#10;For every degree of success, it may turn after&#10;moving one less VU.&#10;&#10;A starship must move at least one VU before turning.&#10;Once the starship has turned, it must move&#10;the remaining distance so its complete movement&#10;is equal to its half or full Speed value."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Adjust Bearing}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Base ?{Select Speed|Full Speed,Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }}} {{t1=Turn Arc: @{ShipTurnArc}}}">
-                    <label>Adjust Bearing &#128712;</label></button>
-                <button style="width:50%" name="roll_AdjSpeed" type="roll" title="Adjust Speed&#10;Challenging (+0) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;On a success, he may increase or decrease the number&#10;of VUs his ship moves by one.&#10;&#10;For every degree of success, he may increase or decrease&#10;that number by an additional one.&#10;&#10;The starship may not move less than 0 VUs&#10;The starship may not move double&#10;or more its Speed value using this Manoeuvre&#10;(use Flank Speed ext. Action)"
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Adjust Speed}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Base ?{Select Speed|Full Speed,Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }}} {{t1=Turn Arc: @{ShipTurnArc}}}">
-                        <label>Adjust Speed &#128712;</label></button>
+                    <label data-i18n="crit-table">Critical Hit Table</label>
+                </button>
                 <!-- end of line -->
-                <button style="width:100%" name="roll_EvManu" type="roll" title="Evasive Manoeuvres&#10;Difficult (-10) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;This move imposes a -10 penalty on all Shooting Actions&#10;against this Ship on a Success&#10;plus an additional -10 for every Degree of Success&#10;Until the beginning of its Next Turn.&#10;&#10;This Ship also suffers the same penalty&#10;during its own Shooting Action."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to do Evasive Manoeuvres}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-10-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }}">
-                    <label>Evasive Manoeuvres &#128712;</label></button>
+                <button style="width:100%" name="roll_NPCShipOrder1" type="roll"
+                value="@{gmroll}&{template:custom} {{name=Crew performs&#10;All Ahead Full order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): +1 VU&#10;Competent (30): +[[1d5]] VU&#10;Crack (40): +[[1d5+1]] VU&#10;Veteran (50): +[[1d5+2]] VU&#10;Elite (60): +[[2d5]] VU}}">
+                    <label style="width:90%">All Ahead Full</label>
+                    <b style="width:10%" title="The ship’s speed this Strategic Turn is increased by a&#10;distance determined by Crew Rating, so long as it&#10;only moved in a straight line.">?</b>
+                </button>
             </div>
             <div class="gridbox2">
-                <button style="width:100%" name="roll_AdjSpeBear" type="roll" title="Adjust Speed and Bearing&#10;Hard (–20) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;Combines the effects of Adjust Speed and Adjust Bearing&#10;in a single manoeuvre, the limitations of both still apply."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Adjust Speed & Bearing}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-20-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Base ?{Select Speed|Full Speed,Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }}} {{t1=Turn Arc: @{ShipTurnArc}}}">
-                    <label>Adjust Speed and Bearing &#128712;</label></button>
+                <button style="width:100%" name="roll_NPCShipOrder2" type="roll"
+                value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Damage Control order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): 4 Turns&#10;Competent (30): 4 Turns&#10;Crack (40): 3 Turns&#10;Veteran (50): 2 Turns&#10;Elite (60): 1 Turn}}">
+                    <label style="width:90%">Damage Control</label>
+                    <b style="width:10%" title="Components equal to Crew Rating BONUS&#10;are returned to full function or a number of fires&#10;are immediately extinguished.&#10;Turns required are determined by Crew Rating." >?</b>
+                </button>
                 <!-- end of line -->
-                <button style="width:100%" name="roll_RamManu" type="roll" title="Ramming Manoeuvre&#10;Hard (–20) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;If a ship ends its Manoeuvre Action within 1 VU of an enemy vessel&#10;and its Prow is facing said vessel, the ship may give up its&#10;Shooting Action this turn and Ram the ship instead.&#10;&#10;If succeessful, the ship crashes and does damage based on Hull Size&#10;+ Prow Armour + Armored Prow Component (if any)&#10;&#10;The ramming ship then takes damage equal to the&#10;defending ship’s Armour plus 1d5 to their Prow armour&#10;&#10;Damage Inflicted is rolled along the test."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts a Ramming Manoeuvre!}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-20-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{desc=**If Hit ~ Damage dealt** [[( ?{Hull Size|Transport or Raider,1d5|Frigate,1d10|Light Cruiser,2d5|Cruiser,2d10|Larger vessels,3d10} + @{ShipArmour} + @{ShipArmourProw} + ?{Prow is?|Standard (+0),0|Reinforced (+1d5),1d5|Armoured (+1d10),1d10} )]]}}">
-                    <label>Ramming Manoeuvre &#128712;</label></button>
+                <button style="width:100%" name="roll_NPCShipOrder3" type="roll"
+                value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Launch Attack Craft order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): 1 operation&#10;Competent (30): 1 operation&#10;Crack (40): 2 operations&#10;Veteran (50): 3 operations&#10;Elite (60): 4 operations}}">
+                    <label style="width:90%">Launch Craft</label>
+                    <b style="width:10%" title="The ship’s launch bays unleash the active attack craft.&#10;This can be used to start multiple attack craft operations&#10;as determined by the ship’s Crew Rating" >?</b>
+                </button>
             </div>
             <div class="gridbox3">
-                <button style="width:100%" name="roll_ComeNewHead" type="roll" title="Come to New Heading&#10;Difficult (–10) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;Success means the starship may turn when it has&#10;moved half its Speed value, then turn again when&#10;it has moved its full Speed value.&#10;&#10;The ship suffers –20 to any Ballistic Skill Tests to fire, during this turn."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Come to New Heading}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-10-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]&#10;Ship's Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }} {{t1=Turn Arc: @{ShipTurnArc}}}">
-                    <label>Come to New Heading &#128712;</label></button>
+                <button style="width:100%" name="roll_NPCShipOrder4" type="roll"
+                value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Prepare to Manoeuvre order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): +5 Manoeuvrability&#10;Competent (30): +5 Manoeuvrability&#10;Crack (40): +10 Manoeuvrability&#10;Veteran (50): +10 Manoeuvrability&#10;Elite (60): +15 Manoeuvrability}}">
+                    <label style="width:90%">Prep to Manoeuvre</label>
+                    <b style="width:10%" title="The ship gains a bonus to its Manoeuvrability&#10;characteristic as determined by the ship’s Crew Rating" >?</b>
+                </button>
                 <!-- end of line -->
-                <button style="width:100%" name="roll_BoardingManu" type="roll" title="Boarding Action&#10;Hard (–20) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;If a starship ends its Manoeuvre Action within 1 VU of its target&#10;it may give up its shooting action to Board the target.&#10;&#10;If he succeeds, the two ships crash together&#10;and the boarding action begins.&#10;&#10;See Page 215 for rules on Boarding enemy ships."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts a Boarding Action!}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-20-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }}">
-                    <label>Boarding Action &#128712;</label></button>
+                <button style="width:100%" name="roll_NPCShipOrder5" type="roll"
+                value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Reload Ordnance order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=The ship’s torpedo tubes are loaded, and a number of attack craft squadrons equal to the total Strength rating of the ship’s launch bays are made active.}}">
+                    <label style="width:90%">Reload Ordnance</label>
+                    <b style="width:10%" title="Torpedoes are loaded into their tubes and attack craft&#10;are armed and fuelled for an operation." >?</b>
+                </button>
             </div>
             <div class="gridbox4">
-                <button style="width:100%" name="roll_DisManu" type="roll" title="Disengage&#10;Opposed Challenging (+0) Pilot (Space Craft) + Manoeuvrability Test&#10;vs Challenging (+0) Detection + Scrutiny (within 20 VUs.)&#10;&#10;This gives the starship a chance to flee the battle.&#10;Disengage may not be done if the ship is within 8 VUs of any enemy&#10;&#10;If the number of successes is greater than the successes of&#10;each enemy ship, the ship leaves combat, and may not renter it.&#10;&#10;Whether it succeeds or fails, the ship may not&#10;fire any of its Weapons during this turn."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Disengage}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{desc=**Opposed test vs Enemy Detection + Scrutiny (+0)**}}">
-                    <label>Disengage &#128712;</label></button>
-                <!-- end of line -->
-                <button style="width:100%" name="roll_OtherManu" type="roll" title="Other Advanced Manoeuvres&#10;Pilot (Space Craft) + Manoeuvrability + Test Difficulty&#10;&#10;Used to traverse difficult terrain such as&#10;Ice Rings, Asteroid Fields, Gravity Wells, ect.&#10;&#10;This macro does not have any integrated modifiers."
-                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts an Advanced Manoeuvre}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }}">
-                    <label>Other Manoeuvres &#128712;</label></button>
+                <button style="width:100%" name="roll_NPCShipOrder6" type="roll"
+                value="@{gmroll}&{template:custom} {{name=Crew performs&#10;Target Lock order}} {{d1=Crew Rating @{ShipCrewRating}}} {{t1=Incompetent (20): +5 Detection +5 to Hit&#10;Competent (30): +5 Detection +10 to Hit&#10;Crack (40): +10 Detection +15 to Hit&#10;Veteran (50): +10 Detection +20 to Hit&#10;Elite (60): +15 Detection +20 to Hit}}">
+                    <label style="width:90%">Target Lock</label>
+                    <b style="width:10%" title="The ship gains a bonus to its Detection characteristic&#10;and to all shooting action tests as determined by the ship’s Crew Rating." >?</b>
+                </button>
             </div>
         </div>
     </div>
-    <div style="margin-bottom: 5px"><!-- Weapon Capacity section -->
-        <div class="spacing" style="width:6%"></div>
-        <label style="width:25%;font-size: 16px;">WEAPON CAPACITY</label>
-        <label style="width:6%">Dorsal:</label>
+    <div class="shipmanu">
+        <div class="grid4">
+            <div class="gridbox1">
+                <button style="width:100%" name="roll_AdjBear" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Adjust Bearing}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Base ?{Select Speed|Full Speed,Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }}} {{t1=Turn Arc: @{ShipTurnArc}}}">
+                    <label style="width:90%">Adjust Bearing</label>
+                    <b style="width:10%" title="Adjust Bearing&#10;Challenging (+0) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;On a success, the starship may turn after moving&#10;one VU less than its Speed value.(Half or Full)&#10;&#10;For every degree of success, it may turn after&#10;moving one less VU.&#10;&#10;A starship must move at least one VU before turning.&#10;Once the starship has turned, it must move&#10;the remaining distance so its complete movement&#10;is equal to its half or full Speed value.">?</b>
+                </button>
+                <!-- end of line -->
+                <button style="width:100%" name="roll_AdjSpeed" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Adjust Speed}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Base ?{Select Speed|Full Speed,Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }}} {{t1=Turn Arc: @{ShipTurnArc}}}">
+                    <label style="width:90%">Adjust Speed</label>
+                    <b style="width:10%"  title="Adjust Speed&#10;Challenging (+0) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;On a success, he may increase or decrease the number&#10;of VUs his ship moves by one.&#10;&#10;For every degree of success, he may increase or decrease&#10;that number by an additional one.&#10;&#10;The starship may not move less than 0 VUs&#10;The starship may not move double&#10;or more its Speed value using this Manoeuvre&#10;(use Flank Speed ext. Action)">?</b>
+                </button>
+                <!-- end of line -->
+                <button style="width:100%" name="roll_EvManu" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to do Evasive Manoeuvres}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-10-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }}">
+                    <label style="width:90%">Evasive Manoeuvres</label>
+                    <b style="width:10%" title="Evasive Manoeuvres&#10;Difficult (-10) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;This move imposes a -10 penalty on all Shooting Actions&#10;against this Ship on a Success&#10;plus an additional -10 for every Degree of Success&#10;Until the beginning of its Next Turn.&#10;&#10;This Ship also suffers the same penalty&#10;during its own Shooting Action.">?</b>
+                </button>
+            </div>
+            <div class="gridbox2">
+                <button style="width:100%" name="roll_AdjSpeBear" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Adjust Speed & Bearing}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-20-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Base ?{Select Speed|Full Speed,Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]|Half Speed,Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }}} {{t1=Turn Arc: @{ShipTurnArc}}}">
+                    <label style="width:90%">Adjust Speed and Bearing</label>
+                    <b style="width:10%" title="Adjust Speed and Bearing&#10;Hard (–20) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;Combines the effects of Adjust Speed and Adjust Bearing&#10;in a single manoeuvre, the limitations of both still apply.">?</b>
+                </button>
+                <!-- end of line -->
+                <button style="width:100%" name="roll_RamManu" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts a Ramming Manoeuvre!}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-20-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{desc=**If Hit ~ Damage dealt** [[( ?{Hull Size|Transport or Raider,1d5|Frigate,1d10|Light Cruiser,2d5|Cruiser,2d10|Larger vessels,3d10} + @{ShipArmour} + @{ShipArmourProw} + ?{Prow is?|Standard (+0),0|Reinforced (+1d5),1d5|Armoured (+1d10),1d10} )]]}}">
+                    <label style="width:90%">Ramming Manoeuvre</label>
+                    <b style="width:10%" title="Ramming Manoeuvre&#10;Hard (–20) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;If a ship ends its Manoeuvre Action within 1 VU of an enemy vessel&#10;and its Prow is facing said vessel, the ship may give up its&#10;Shooting Action this turn and Ram the ship instead.&#10;&#10;If succeessful, the ship crashes and does damage based on Hull Size&#10;+ Prow Armour + Armored Prow Component (if any)&#10;&#10;The ramming ship then takes damage equal to the&#10;defending ship’s Armour plus 1d5 to their Prow armour&#10;&#10;Damage Inflicted is rolled along the test.">?</b>
+                </button>
+                <!-- end of line -->
+                <button style="width:100%" name="roll_ejump" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{ShipName}&#10;Emergency Warp Jump Engaged!}} {{dosdof=[[(((  ([[(@{repeating_navigation_$0_navigation} -30 + (?{Other Modifiers|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }} {{desc=**Crew Morale Damage** [[1d10]]}}">
+                    <label style="width:90%">Emergency Warp Jump</label>
+                    <b style="width:10%" title="Emergency Warp Jump - Very Hard (–30) Navigation (Warp) Test -&#10;In hopeless situations, the Navigator can try to quickly plot an escape route into the Warp&#10;&#10;During the ship's strategic turn, If the test Succeeds, the ship escapes into the Warp.&#10;It can also be used to escape during Narrative Time.&#10;&#10;However most crew members are horrified of what could happen and as such&#10;after the action is taken the Crew suffers 1d10 to Morale (regardless of the result)&#10;&#10;This Action is not possible if the Warp or Plasma Drive is Damaged&#10;Unpowered or Destroyed.&#10;&#10;What happens after, is up to the GM (but it should be suitably horrible)&#10;&#10;WARNING: For this macro to work properly, the skill -Navigation (Warp)-&#10;Must be the FIRST (top of the list) skill in the NAVIGATION SKILL GROUP (Skills Tab)">?</b>    
+                </button>
+            </div>
+            <div class="gridbox3">
+                <button style="width:100%" name="roll_ComeNewHead" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Come to New Heading}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-10-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{d1=Ship's Full Speed [[@{ShipSpeed}/@{ShipCrippled2}]]&#10;Ship's Half Speed [[ceil((@{ShipSpeed}/@{ShipCrippled2})/2)]] }} {{t1=Turn Arc: @{ShipTurnArc}}}">
+                    <label style="width:90%">Come to New Heading</label>
+                    <b style="width:10%" title="Come to New Heading&#10;Difficult (–10) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;Success means the starship may turn when it has&#10;moved half its Speed value, then turn again when&#10;it has moved its full Speed value.&#10;&#10;The ship suffers –20 to any Ballistic Skill Tests to fire, during this turn.">?</b>
+                </button>
+                <!-- end of line -->
+                <button style="width:100%" name="roll_BoardingManu" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts a Boarding Action!}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-20-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }}">
+                    <label style="width:90%">Boarding Action</label>
+                    <b style="width:10%" title="Boarding Action&#10;Hard (–20) Pilot (Space Craft) + Manoeuvrability Test&#10;&#10;If a starship ends its Manoeuvre Action within 1 VU of its target&#10;it may give up its shooting action to Board the target.&#10;&#10;If he succeeds, the two ships crash together&#10;and the boarding action begins.&#10;&#10;See Page 215 RTC for rules on Boarding enemy ships.">?</b>
+                </button>
+            </div>
+            <div class="gridbox4">
+                <button style="width:100%" name="roll_DisManu" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts to Disengage}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }} {{desc=**Opposed test vs Enemy Detection + Scrutiny (+0)**}}">
+                    <label style="width:90%">Disengage</label>
+                    <b style="width:10%" title="Disengage&#10;Opposed Challenging (+0) Pilot (Space Craft) + Manoeuvrability Test&#10;vs Challenging (+0) Detection + Scrutiny (within 20 VUs.)&#10;&#10;This gives the starship a chance to flee the battle.&#10;Disengage may not be done if the ship is within 8 VUs of any enemy&#10;&#10;If the number of successes is greater than the successes of&#10;each enemy ship, the ship leaves combat, and may not renter it.&#10;&#10;Whether it succeeds or fails, the ship may not&#10;fire any of its Weapons during this turn.">?</b>
+                </button>
+                <!-- end of line -->
+                <button style="width:100%" name="roll_OtherManu" type="roll"
+                value="@{gmroll}&{template:custom} {{name=@{character_name} attempts an Advanced Manoeuvre}} {{dosdof=[[(((  ([[(@{repeating_pilot_$0_pilot}+@{ShipManoeuvrability}-@{ShipCrippled}-@{crewmanu}-@{manumoralmod}+(?{Other Modifiers|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] Degrees}} {{testtarget=$[[0]]}} {{d100=$[[1]]}} {{testresult= }}">
+                    <label style="width:90%">Other Manoeuvres</label>
+                    <b style="width:10%" title="Other Advanced Manoeuvres&#10;Pilot (Space Craft) + Manoeuvrability + Test Difficulty&#10;&#10;Used to traverse difficult terrain such as&#10;Ice Rings, Asteroid Fields, Gravity Wells, ect.&#10;&#10;This macro does not have any integrated modifiers.">?</b>
+                </button>
+            </div>
+        </div>
+    </div>
+    <div class="shipwp4">
+        <div class="grid2">
+            <div class="leftbox">
+                <textarea name="attr_ShipComplications" style="height:300px" placeholder="Complications"></textarea>
+            </div>
+            <div class="rightbox">
+                <textarea name="attr_ShipSpecialActions" style="height:300px" data-i18n-placeholder="special" placeholder="Special"></textarea>
+            </div>
+        </div>
+    </div>
+    <!-- Weapon Capacity section -->
+    <div style="margin: 5px 0">
+        <label style="width:30%;font-size: 16px; text-align:center">WEAPON CAPACITY</label>
+        <label style="width:10%; text-align:right">Dorsal:</label>
+        <div class="spacing" style="width:1%"></div>
         <input name="attr_ShipWeaponDorsal" type="number" style="width:3%"/>
-        <div class="spacing" style="width:3%"></div>
-        <label style="width:6%">Prow:</label>
+        <label style="width:10%; text-align:right">Prow:</label>
+        <div class="spacing" style="width:1%"></div>
         <input name="attr_ShipWeaponProw" type="number" style="width:3%"/>
-        <div class="spacing" style="width:3%"></div>
-        <label style="width:6%">Port:</label>
+        <label style="width:10%; text-align:right">Port:</label>
+        <div class="spacing" style="width:1%"></div>
         <input name="attr_ShipWeaponPort" type="number" style="width:3%"/>
-        <div class="spacing" style="width:3%"></div>
-        <label style="width:9%">Starboard:</label>
+        <label style="width:10%; text-align:right">Starboard:</label>
+        <div class="spacing" style="width:1%"></div>
         <input name="attr_ShipWeaponStarboard" type="number" style="width:3%"/>
-        <div class="spacing" style="width:3%"></div>
-        <label style="width:6%">Keel:</label>
+        <label style="width:10%; text-align:right">Keel:</label>
+        <div class="spacing" style="width:1%"></div>
         <input name="attr_ShipWeaponKeel" type="number" style="width:3%"/>
-        <div class="spacing" style="width:12%"></div>
     </div>
     <fieldset class="repeating_shipweapons">
-            <span class="shipl">Macro Bat.</span>
-            <input type="radio" name="attr_shipradio" value="1" class="macro" checked/>
-            <div class="spacing" style="width:5%"></div>
-            <span class="shipl">Lance Bat.</span>
-            <input type="radio" name="attr_shipradio" value="2" class="lance"/>
-            <div class="spacing" style="width:5%"></div>
-            <span class="shipl">Torpedo</span>
-            <input type="radio" name="attr_shipradio" value="3" class="torpedo"/>
-            <div class="spacing" style="width:5%"></div>
-            <span class="shipl">Att.Craft</span>
-            <input type="radio" name="attr_shipradio" value="4" class="acraft"/>
-            <div class="spacing" style="width:5%"></div>
-            <span class="shipl">Nova Cannon</span>
-            <input type="radio" name="attr_shipradio" value="5" class="novac"/>
-        <div id="shipwp1">
-            <input name="attr_ShipWeaponName" style="width:60%" type="text" placeholder="Macrobattery Name" title="Macrobattery Name"/>
+        <div class="spacing" style="width:100%; height:8px"></div>
+        <input type="hidden" class="shiptoggle" name="attr_shiptabtoggle" value="shipmanu"/>
+        <div class="spacing" style="width:1%"></div>
+        <label class="fancyButton shipweapon" style="width:18.8%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipmanu" hidden="true" checked="true"/>
+            <div>Macro Battery</div>
+        </label>
+        <div class="spacing" style="width:1%"></div>
+        <label class="fancyButton shipweapon" style="width:18.8%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipaction" hidden="true" />
+            <div>Lance Battery</div>
+        </label>
+        <div class="spacing" style="width:1%"></div>
+        <label class="fancyButton shipweapon" style="width:18.8%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipnpc" hidden="true" />
+            <div>Torpedo</div>
+        </label>
+        <div class="spacing" style="width:1%"></div>
+        <label class="fancyButton shipweapon" style="width:18.8%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipwp4" hidden="true" />
+            <div>Attack Craft</div>
+        </label>
+        <div class="spacing" style="width:1%"></div>
+        <label class="fancyButton shipweapon" style="width:18.8%">
+            <input type="checkbox" name="attr_shiptabtoggle" value="shipwp5" hidden="true" />
+            <div>Nova Cannon</div>
+        </label>
+        <div class="spacing" style="width:1%"></div>
+        <div class="shipmanu">
+            <input name="attr_ShipWeaponName" style="width:60%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_shipballistic" style="width:19.5%" title="Shooting Action: Fire Macrobattery&#10;Uses the selected Shooting Action Score&#10;&#10;Deals 1 hit on success +1 hit per degree of success&#10;Up to the weapons Strength value." 
+            <button type="roll" name="roll_shipballistic" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} fires @{ShipWeaponName}**}} {{spmac=[[(((  ([[(@{ShipBallistic} + ?{Range|In Range(+0),0 |Half Range (+10),10 |Twice Range (-10),-10} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] }} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{xd5=[[(ceil(@{ShipWeaponStrength}/@{ShipCrippled2}))]] }} {{xd10=[[@{ShipWeaponCrit}]] }} {{d5=[[1d5]] }}">
-                <label>Fire! &#128712;</label></button>
+                <label style="width:75%">Fire!</label>
+                <b style="width:25%" title="Shooting Action: Fire Macrobattery&#10;Uses the selected Shooting Action Score&#10;&#10;Deals 1 hit on success +1 hit per degree of success&#10;Up to the weapons Strength value." >?</b>
+            </button>
             <div class="spacing" style="width:0.5%"></div>
             <button type="roll" name="roll_shipdamage" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} @{ShipWeaponName}**&#10;**Total Macrobattery Damage**}} {{t1=[[ ?{Number of Hits|1,@{ShipWeaponDamage}|2,@{ShipWeaponDamage}+@{ShipWeaponDamage}|3,@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}|4,@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}|5,@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}
             |6,@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}|7?,@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}|8?,@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage}+@{ShipWeaponDamage} }]] }}">
                 <label>Damage</label></button>
             <!--end of line-->
-            <label style="width:10%" class="help" title="Weapon Strength&#10;&#10;If the ship is Crippled&#10;This value will be halved&#10;(rounding up) when rolling&#10;the Shooting Action.">Str &#128712;:</label>
+            <b style="width:4%" title="Weapon Strength&#10;&#10;If the ship is Crippled&#10;This value will be halved&#10;(rounding up)">?</b>
+            <i style="width:3%">&#10095;</i>
             <input type="number" name="attr_ShipWeaponStrength" style="width:5%"/>
             <div class="spacing" style="width:1%"></div>
-            <input type="text" name="attr_ShipWeaponDamage" style="width:15%" placeholder="Damage" title="Damage Dice"/>
+            <input type="text" name="attr_ShipWeaponDamage" style="width:15%" placeholder="Damage"/>
+            <label style="width:10%; text-align:right">Crit:</label>
             <div class="spacing" style="width:1%"></div>
-            <label style="width:8%" class="help" title="Critical Rating">Crit:</label>
-            <input type="number" name="attr_ShipWeaponCrit" style="width:5%"></input>
+            <input type="number" name="attr_ShipWeaponCrit" style="width:5%"/>
+            <label style="width:13%; text-align:right">Range:</label>
             <div class="spacing" style="width:1%"></div>
-            <label style="width:11%">Range:</label>
-            <input name="attr_ShipWeaponRange" style="width:10%" type="text"></input>
+            <input name="attr_ShipWeaponRange" style="width:10%" type="text"/>
             <div class="spacing" style="width:1%"></div>
-            <select name="attr_ShipWeaponLocation" style="width:28%">
+            <select name="attr_ShipWeaponLocation" style="width:27%">
                 <option disabled style="background:gray;font-weight:bold;color:white;">Firing Arc</option>
                 <option value="Dorsal" selected>F+P+S (&#128962;)</option>
                 <option value="Fore">Fore (&#11165;)</option>
@@ -3874,32 +4168,35 @@
                 <option value="Aft">Aft (&#11167;)</option>
                 <option value="Any">Any (&#128966;)</option>
             </select>
-            <input type="checkbox" style="width:4%" name="attr_HideShipWeapondesc" value="1" class="arrow icon" title="Hide Description"></input>
-            <div class="hbody"><textarea name="attr_ShipWeapondesc" style="height:65px" placeholder="Macrobattery Description"></textarea></div>
+            <input type="checkbox" style="width:4%" name="attr_HideShipWeapondesc" value="1" class="arrow icon"/>
+            <div class="hbody"><textarea name="attr_ShipWeapondesc" style="height:65px"  data-i18n-placeholder="description" placeholder="Description"></textarea></div>
         </div>
-        <div id="shipwp2">
-            <input name="attr_ShipWeaponName2" style="width:60%" type="text" placeholder="Lance Name" title="Lance Name"/>
+        <div class="shipaction">
+            <input name="attr_ShipWeaponName2" style="width:60%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_shipballistic2" style="width:19.5%" title="Shooting Action: Fire Lance&#10;Uses the selected Shooting Action Score&#10;&#10;Deals 1 hit on success +1 hit per 3 degrees of success&#10;Up to the weapons Strength value." 
+            <button type="roll" name="roll_shipballistic2" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} fires @{ShipWeaponName2}**}} {{splan=[[(((  ([[(@{ShipBallistic} + ?{Range|In Range(+0),0 |Half Range (+10),10 |Twice Range (-10),-10} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] }} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{xd5=[[(ceil(@{ShipWeaponStrength2}/@{ShipCrippled2}))]] }} {{xd10=[[@{ShipWeaponCrit2}]]}} {{d5=[[1d5]]}}">
-                <label>Fire! &#128712;</label></button>
+                <label style="width:75%">Fire!</label>
+                <b style="width:25%" title="Shooting Action: Fire Lance&#10;Uses the selected Shooting Action Score&#10;&#10;Deals 1 hit on success +1 hit per 3 degrees of success&#10;Up to the weapons Strength value." >?</b>
+            </button>
             <div class="spacing" style="width:0.5%"></div>
             <button type="roll" name="roll_shipdamage2" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} @{ShipWeaponName2}**&#10;**Lance Damage per Hit**}} {{d1= ?{Number of Hits|1,[[@{ShipWeaponDamage2}]]|2,[[@{ShipWeaponDamage2}]] [[@{ShipWeaponDamage2}]]|3,[[@{ShipWeaponDamage2}]] [[@{ShipWeaponDamage2}]] [[@{ShipWeaponDamage2}]]|4,[[@{ShipWeaponDamage2}]] [[@{ShipWeaponDamage2}]] [[@{ShipWeaponDamage2}]] [[@{ShipWeaponDamage2}]] }}} {{t1=Lance damage ignores target's Armour}}">
                 <label>Damage</label></button>
             <!--end of line-->
-            <label style="width:10%" class="help" title="Weapon Strength&#10;&#10;If the ship is Crippled&#10;This value will be halved&#10;(rounding up) when rolling&#10;the Shooting Action.">Str &#128712;:</label>
-            <input type="number" name="attr_ShipWeaponStrength2" style="width:5%" placeholder="Str"/>
+            <b style="width:4%" title="Weapon Strength&#10;&#10;If the ship is Crippled&#10;This value will be halved&#10;(rounding up)">?</b>
+            <i style="width:3%">&#10095;</i>
+            <input type="number" name="attr_ShipWeaponStrength2" style="width:5%"/>
             <div class="spacing" style="width:1%"></div>
-            <input type="text" name="attr_ShipWeaponDamage2" style="width:15%" placeholder="Damage" title="Damage Dice"/>
+            <input type="text" name="attr_ShipWeaponDamage2" style="width:15%" placeholder="Damage"/>
+            <label style="width:10%; text-align:right">Crit:</label>
             <div class="spacing" style="width:1%"></div>
-            <label style="width:8%" class="help" title="Critical Rating">Crit:</label>
-            <input type="number" name="attr_ShipWeaponCrit2" style="width:5%"></input>
+            <input type="number" name="attr_ShipWeaponCrit2" style="width:5%"/>
+            <label style="width:13%; text-align:right">Range:</label>
             <div class="spacing" style="width:1%"></div>
-            <label style="width:11%">Range:</label>
-            <input name="attr_ShipWeaponRange2" style="width:10%" type="text"></input>
+            <input name="attr_ShipWeaponRange2" style="width:10%" type="text"/>
             <div class="spacing" style="width:1%"></div>
-            <select name="attr_ShipWeaponLocation2" style="width:28%">
+            <select name="attr_ShipWeaponLocation2" style="width:27%">
                 <option disabled style="background:gray;font-weight:bold;color:white;">Firing Arc</option>
                 <option value="Dorsal" selected>F+P+S (&#128962;)</option>
                 <option value="Fore">Fore (&#11165;)</option>
@@ -3909,33 +4206,36 @@
                 <option value="Aft">Aft (&#11167;)</option>
                 <option value="Any">Any (&#128966;)</option>
             </select>
-            <input type="checkbox" style="width:4%" name="attr_HideShipWeapondesc2" value="1" class="arrow icon" title="Hide Description"></input>
-            <div class="hbody"><textarea name="attr_ShipWeapondesc2" style="height:65px" placeholder="Lance Description"></textarea></div>
+            <input type="checkbox" style="width:4%" name="attr_HideShipWeapondesc2" value="1" class="arrow icon"/>
+            <div class="hbody"><textarea name="attr_ShipWeapondesc2" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
         </div>
-        <div id="shipwp3">
-            <input name="attr_TorpedoName" style="width:60%" type="text" placeholder="Torpedo Name" title="Torpedo Name"/>
+        <div class="shipnpc">
+            <input name="attr_TorpedoName" style="width:60%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_shipballistic3" style="width:19.5%" title="Rolls Torpedo salvo Hit&#10;Uses the Shooting Action Score + Torpedo Rating&#10;&#10;Deals 1 hit on success +1 hit per degree of success&#10;Up to the weapons Salvo Strength value." 
-            value="@{gmroll}&{template:custom} {{name=**@{ShipName} @{TorpedoName} Salvo...**}} {{d1=**Salvo Strength: @{TorpedoStrength}**}} {{sptor=[[(((  ([[(@{ShipBallistic} + @{TorpedoRating} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] }} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{xd5=[[@{TorpedoStrength}]] }}">
-                <label>Hit! &#128712;</label></button>
+            <button type="roll" name="roll_shipballistic3" style="width:19.5%"
+            value="@{gmroll}&{template:custom} {{name=@{ShipName} @{TorpedoName}}} {{d1= Salvo Strength: @{TorpedoStrength}}} {{sptor=[[(((  ([[(@{ShipBallistic} + @{TorpedoRating} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] }} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{xd5=[[@{TorpedoStrength}]] }}">
+                <label style="width:75%">Salvo</label>
+                <b style="width:25%" title="Tests Torpedo salvo Hit&#10;Shooting Action Score + Torpedo Rating&#10;&#10;Deals 1 hit on success +1 hit per degree of success&#10;Up to the weapons Salvo Strength value." >?</b>
+            </button>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_shipdamage3" style="width:19.5%" title="Roll Damage&#10;Includes Terminal Pen Rerolls" 
+            <button type="roll" name="roll_shipdamage3" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} @{TorpedoName} Damage per Hit**}} {{tordmg= ?{Number of Hits|1,[[@{TorpedoDamage}]]|2,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]]|3,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]]|4,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]]|
             5,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]]|
             6,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]]|
             7?,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]]|
             8??,[[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] [[@{TorpedoDamage}]] }}} {{d5=[[1d5]]}}">
-                <label>Damage &#128712;</label></button>
+                <label>Damage</label></button>
             <!--end of line-->
-            <label style="width:19%" class="help" title="Salvo Strength&#10;&#10;Determined by how many&#10;torpedo tubes are used.&#10;&#10;Tubes can fire Half or Full Salvos&#10;Adjust number before rolling.">Salvo Str &#128712;:</label>
+            <label style="width:13%; text-align:right" >Salvo</label>
+            <b style="width:6%" title="Salvo Strength&#10;&#10;Determined by how many&#10;torpedo tubes are used.&#10;&#10;Tubes can fire Half or Full Salvos&#10;Adjust number before testing.">?</b>
             <input type="number" name="attr_TorpedoStrength" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:12%">Rating:</label>
-            <input type="number" name="attr_TorpedoRating" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:11%">Speed:</label>
+            <label style="width:14%; text-align:right">Rating:</label>
+            <div class="spacing" style="width:1%"></div>
+            <input type="number" name="attr_TorpedoRating" style="width:7%"/>>
+            <label style="width:14%; text-align:right">Speed:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" name="attr_TorpedoSpeed" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
+            <div class="spacing" style="width:2%"></div>
             <select name="attr_TorpedoDamage" style="width:17%;font-weight:bold;text-align:center" title="Select Damage Dice&#10;&#10;Since Roll formula is complex&#10;this needed to be a selector">
                 <option disabled style="background:gray;font-weight:bold;color:white;">Damage Dice</option>
                 <option value="1d10ro<@{TorpedoPen}cs>@{TorpedoCrit}+@{TorpDamageBonus}">1d10</option>
@@ -3944,29 +4244,32 @@
                 <option value="4d10ro<@{TorpedoPen}cs>@{TorpedoCrit}+@{TorpDamageBonus}">4d10 ?</option>
                 <option value="5d10ro<@{TorpedoPen}cs>@{TorpedoCrit}+@{TorpDamageBonus}">5d10 ??</option>
             </select>
-            <label style="width:4%; font-size:18px; text-align:center; font-weight:bold">+</label>
-            <input type="number" name="attr_TorpDamageBonus" style="width:7%" placeholder="Bonus" title="Damage Dice Bonus&#10;&#10;Eg: 2d10 (+14)"/>
+            <label style="width:4%; font-size:18px; text-align:center;">+</label>
+            <input type="number" name="attr_TorpDamageBonus" style="width:7%" title="Damage Dice Bonus&#10;&#10;Eg: 2d10 (+14)"/>
             <!--end of line-->
-            <label style="width:8%" class="help" title="Critical Rating">Crit:</label>
+            <label style="width:13%; text-align:right">Crit:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" min="0" value="0" name="attr_TorpedoCrit" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:11%">Range:</label>
+            <label style="width:14%; text-align:right">Range:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" name="attr_TorpedoRange" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:12%" class="help" title="Terminal Penetration&#10;Rerolls for TP are already integrated in the Damage Roll.">Pen &#128712;:</label>
+            <label style="width:13%; text-align:right">Pen</label>
+            <b style="width:6%" title="Terminal Penetration&#10;Rerolls for TP are included in Damage macro.">?</b>
             <input type="number" name="attr_TorpedoPen" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:17%" class="help" title="Every ship has a finite supply of torpedoes.&#10;Each Torpedo Tube Component lists how many&#10;torpedoes it is able to hold.">Reserve &#128712;:</label>
+            <label style="width:18%; text-align:right">Reserve:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" name="attr_TorpedoReserve" style="width:7%"/>
-            <div class="spacing" style="width:11%"></div>
-            <input type="checkbox" style="width:4%" name="attr_HideTorpedoDesc" value="1" class="arrow icon" title="Hide Description"/>
-            <div class="hbody"><textarea name="attr_Torpedodesc" style="height:65px" placeholder="Torpedo Description"></textarea></div>
+            <div class="spacing" style="width:1%"></div>
+            <input type="checkbox" style="width:4%" name="attr_HideTorpedoDesc" value="1" class="arrow icon"/>
+            <div class="hbody"><textarea name="attr_Torpedodesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
         </div>
-        <div id="shipwp4">
-            <input name="attr_SquadName" style="width:60%" type="text" placeholder="Attack Craft Name" title="Attack Craft Name"/>
+        <div class="shipwp4">
+            <input name="attr_SquadName" style="width:60%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_squadattack" style="width:19.5%" title="Rolls Squadron Engagement test&#10;this is a Challenging (+0) Command + Craft Rating&#10;&#10;This test has many variables not included.&#10;&#10;See Battlefleet Koronus supplement page 11." 
-            value="@{SquadType}"><label>Engage &#128712;</label></button>
+            <button type="roll" name="roll_squadattack" style="width:19.5%" value="@{SquadType}">
+                <label style="width:75%">Engage</label>
+                <b style="width:25%" title="Squadron Engagement test&#10;Challenging (+0) Command + Craft Rating&#10;&#10;This test has many variables not included.&#10;&#10;See Battlefleet Koronus supplement page 11." >?</b>
+            </button>
             <div class="spacing" style="width:0.5%"></div>
             <select name="attr_SquadStrength" style="width:19.5%">
                 <option disabled style="background:gray;font-weight:bold;color:white;">Squadron Strength</option>
@@ -3984,189 +4287,175 @@
                 <option value="@{gmroll}&{template:custom} {{name=**@{ShipName} @{SquadName} attempt to reach the target vessel**}} {{Squadron Strength=&#160;&#160;**@{SquadStrength}**}} {{dosdof=[[(((  ([[(@{Command} + @{SquadRating} + (?{Modifier|0}) )]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] **Degrees**}} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{testresult= }}"
                 >Assault Boats</option>
             </select>
-            <div class="spacing" style="width:4%"></div>
-            <label style="width:12%">Rating:</label>
+            <label style="width:15%; text-align:right">Rating:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" name="attr_SquadRating" style="width:7%"/>
-            <div class="spacing" style="width:4%"></div>
-            <label style="width:11%">Speed:</label>
+            <label style="width:15%; text-align:right">Speed:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" name="attr_SquadSpeed" style="width:7%"/>
-            <div class="spacing" style="width:4%"></div>
-            <label style="width:9%">Size:</label>
+            <label style="width:15%; text-align:right">Size:</label>
+            <div class="spacing" style="width:1%"></div>
             <input name="attr_SquadSize" style="width:7%" type="number"/>
-            <div class="spacing" style="width:11%"></div>
-            <input type="checkbox" style="width:4%" name="attr_HideSquadDesc" value="1" class="arrow icon" title="Hide Description"/>
-            <div class="hbody"><textarea name="attr_Squaddesc" style="height:65px" placeholder="Attack Craft Description"></textarea></div>
+            <div class="spacing" style="width:7%"></div>
+            <input type="checkbox" style="width:4%" name="attr_HideSquadDesc" value="1" class="arrow icon">
+            <div class="hbody"><textarea name="attr_Squaddesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
         </div>
-        <div id="shipwp5">
-            <input name="attr_NovaName" style="width:60%" type="text" placeholder="Nova Cannon Name" title="Nova Cannon Name"/>
+        <div class="shipwp5">
+            <input name="attr_NovaName" style="width:60%" type="text" data-i18n-placeholder="name" placeholder="Name"/>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_novacannon" style="width:19.5%" title="Shooting Action: Fire Nova Cannon&#10;Uses the selected Shooting Action Score -20 (Nova Cannon penalty)&#10;&#10;If a ship performs a Manoeuvre Action with a total modifier&#10;of greater than Challenging(+0), it may not fire its Nova Cannon&#10;on the same turn. Crippled ships cannot fire.&#10;&#10;Low Accuracy: Failed test.&#10;Average Accuracy: Success on test&#10;High Accuracy: 2 or more Degrees of Success" 
+            <button type="roll" name="roll_novacannon" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} fires its @{NovaName}!!!**}} {{nova1=[[(((  ([[(@{ShipBallistic} + ?{Range|In Range(+0),0 |Half Range (+10),10 |Twice Range (-10),-10} -20 + (?{Modifier|0}))]] - [[1d100cs1cf100]]) * 100 % 999 % 100  )))]] }} {{testtarget= $[[0]] }} {{d100= $[[1]] }} {{d5=[[1d5]]}} {{xd5=[[1d5+2]]}}">
-                <label>Fire!!! &#128712;</label></button>
+                <label style="width:75%">Fire!</label>
+                <b style="width:25%" title="Shooting Action: Fire Nova Cannon&#10;Shooting Action Score -20 (Nova Cannon penalty)&#10;&#10;If a ship performs a Manoeuvre Action with a total modifier&#10;of greater than Challenging(+0), it may not fire its Nova Cannon&#10;on the same turn. Crippled ships cannot fire.&#10;&#10;Low Accuracy: Failed test.&#10;Average Accuracy: Success on test&#10;High Accuracy: 2 or more Degrees of Success" >?</b>
+            </button>
             <div class="spacing" style="width:0.5%"></div>
-            <button type="roll" name="roll_novadmg" style="width:19.5%" title="Roll Damage&#10;&#10;Any Natural 10 roll, scores One Critical Hit&#10;If the rolls have more than One Natural 10&#10;Roll additional 1d5 as needed." 
+            <button type="roll" name="roll_novadmg" style="width:19.5%"
             value="@{gmroll}&{template:custom} {{name=**@{ShipName} @{NovaName} Damage per Hit**}} {{nova2= ?{Number of Hits|1,[[@{NovaDamage}]]|2,[[@{NovaDamage}]] [[@{NovaDamage}]]|3,[[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]]|4,[[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]]|
             5,[[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]]|
             6,[[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]]|
-            7,[[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]]} }} {{d5=[[1d5]]}} {{desc=**Damage ignores ship's Armour**}}">
-                <label>Damage &#128712;</label></button>
+            7,[[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]] [[@{NovaDamage}]]} }} {{desc=**Damage ignores ship's Armour**}}">
+                <label style="width:75%">Damage</label>
+                <b style="width:25%" title="Roll Damage&#10;&#10;Any Natural 10 roll, scores One Critical Hit&#10;Roll 1d5s below for every Natural 10." >?</b>
+            </button>
             <!--end of line-->
-            <label style="width:14%">Damage:</label>
+            <label style="width:14%; text-align:right">Damage:</label>
+            <div class="spacing" style="width:1%"></div>
             <input name="attr_NovaDamage" style="width:12%" type="text"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:17%" class="help" title="Available Ammunition&#10;&#10;Nova Cannons can typically&#10;store up to 20 Rounds">Reserve &#128712;:</label>
+            <label style="width:19%; text-align:right">Reserve:</label>
+            <div class="spacing" style="width:1%"></div>
             <input type="number" name="attr_NovaAmmo" style="width:7%"/>
-            <div class="spacing" style="width:3%"></div>
-            <label style="width:24%">Range: 6 VU &#9205;</label>
-            <input type="number" name="attr_NovaRange" style="width:7%" placeholder="Max" title="Maximun Range"/>
+            <label style="width:24%; text-align:right">Range: 6 VU</label>
+            <i style="width:3%">&#10095;</i>
+            <input type="number" name="attr_NovaRange" style="width:7%"/>
             <div class="spacing" style="width:1%"></div>
-            <button name="roll_novasimpledice" type="roll" style="width:7%" value="@{gmroll}&{template:custom} {{name=Nova Cannon Crit d5}} {{d1= ?{Roll|1 Crit,[[1d5]]|2 Crits,[[1d5]][[1d5]]|3 Crits,[[1d5]][[1d5]][[1d5]]} }}"><span id="tinyroll" title="Roll Crit 1d5">0</span></button>
-            <div class="spacing" style="width:1%"></div>
-            <input type="checkbox" style="width:4%" name="attr_HideNovaDesc" value="1" class="arrow icon" title="Hide Description"/>
-            <div class="hbody"><textarea name="attr_Novadesc" style="height:65px" placeholder="Nova Cannon Description"></textarea></div>
+            <button name="roll_novasimpledice" type="roll" style="width:7%" value="/r ?{Natural 10?|1}d5 [Ignore Total]"><label>1d5</label></button>
+            <input type="checkbox" style="width:4%" name="attr_HideNovaDesc" value="1" class="arrow icon"/>
+            <div class="hbody"><textarea name="attr_Novadesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
         </div>
     </fieldset>
     <!--Essential and supplemental Components-->
-	<div class="grid2">
-		<!--Essential-->
-		<div class="leftbox">
-		<input type="hidden" name="attr_ShipEssentialComponentsPowerTotal" value="0"></input>
-		<input type="hidden" name="attr_ShipEssentialComponentsSpaceTotal" value="0"></input>
-		<input type="hidden" name="attr_ShipEssentialComponentsSPTotal" value="0"></input>
-		<h3>Essential Components</h3>
-		<fieldset class="repeating_shipessentialcomponents" name="attr_repeating_shipessentialcomponents">
-			<input type="text" name="attr_ShipEssentialComponentName" style="width:71%" placeholder="Component Name" title="Component Name"/>
-			<div class="spacing" style="width:0.5%"></div>
-			<input type="number" name="attr_ShipEssentialComponentPower" style="width:8%" value="0" title="Power Used&#10;&#10;If this is the Plasma Drive&#10;Leave Value at 0&#10;Type value in Power Max Field"/>
-			<div class="spacing" style="width:0.5%"></div>
-			<input type="number" name="attr_ShipEssentialComponentSpace" style="width:8%" value="0" title="Space Used"/>
-			<div class="spacing" style="width:0.5%"></div>
-			<input type="number" name="attr_ShipEssentialComponentSP" style="width:8%" value="0" title="SP"/>
-			<div class="spacing" style="width:0.5%"></div>
-			<input type="checkbox" name="attr_HideEssentialcomponent" style="width:3%" value="1" class="arrow icon" title="Hide Description"></input>
-			<div>
-				<div class="spacing" style="width:1%"></div>
-				<label style="width:10%; font-size:11px" class="help" title="Depressurized&#10;Vacuum Effect&#10;Still Functional">Holed &#128712;</label>
-				<input style="width:3%; margin-bottom:4px" name="attr_ShipEssentialHoled" value="1" type="checkbox"/>
-				<div class="spacing" style="width:3%"></div>
-				<label style="width:16%; font-size: 11px" class="help" title="Non-functional&#10;No Gravity&#10;No Lights&#10;Can be Repaired">Unpowered &#128712;</label>
-				<input style="width:3%; margin-bottom:4px" name="attr_ShipEssentialUnpowered" value="1" type="checkbox"/>
-				<div class="spacing" style="width:3%"></div>
-				<label style="width:13%; font-size: 11px" class="help" title="If Fire is not contained it counts as Damaged&#10;Can be Vented but it becomes Holed">On Fire! &#128712;</label>
-				<input style="width:3%; margin-bottom:4px" name="attr_ShipEssentialOnFire" value="1" type="checkbox"/>
-				<div class="spacing" style="width:3%"></div>
-				<label style="width:14%; font-size: 11px" class="help" title="Non-functional&#10;No Gravity&#10;No Lights&#10;Hazardous&#10;Can be Repaired">Damaged &#128712;</label>
-				<input style="width:3%; margin-bottom:4px" name="attr_ShipEssentialDamaged" value="1" type="checkbox"/>
-				<div class="spacing" style="width:3%"></div>
-				<label style="width:15%; font-size: 11px" class="help" title="Non-functional&#10;No Gravity&#10;No Lights&#10;Extremely Hazardous&#10;Cannot be Repaired">Destroyed &#128712;</label>
-				<input style="width:3%; margin-bottom:4px" name="attr_ShipEssentialDestroyed" value="1" type="checkbox"/>
-			</div>
-			<div class="hbody"><textarea name="attr_ShipEssentialComponentdesc" style="height:65px" placeholder="Component Description"></textarea></div>
-		</fieldset>
-		</div>
-		<!--Supplemental-->
-		<div class="rightbox">
-		    <input type="hidden" name="attr_ShipSupplementalComponentsPowerTotal" value="0"></input>
-		    <input type="hidden" name="attr_ShipSupplementalComponentsSpaceTotal" value="0"></input>
-		    <input type="hidden" name="attr_ShipSupplementalComponentsSPTotal" value="0"></input>
-			<h3>Supplemental Components</h3>
-			<fieldset class="repeating_shipsupplementalcomponents" name="attr_repeating_shipsupplementalcomponents">
-				<input type="text" name="attr_ShipSupplementalComponentName" style="width:71%" placeholder="Component Name" title="Component Name"/>
-				<div class="spacing" style="width:0.5%"></div>
-				<input type="number" name="attr_ShipSupplementalComponentPower" style="width:8%" value="0" title="Power Used"/>
-				<div class="spacing" style="width:0.5%"></div>
-				<input type="number" name="attr_ShipSupplementalComponentSpace" style="width:8%" value="0" title="Space Used"/>
-				<div class="spacing" style="width:0.5%"></div>
-				<input type="number" name="attr_ShipSupplementalComponentSP" style="width:8%" value="0" title="SP"/>
-				<div class="spacing" style="width:0.5%"></div>
-				<input type="checkbox" class="arrow icon" style="width:3%" name="attr_HideSupplementalcomponent" value="1" title="Hide Description"></input>
-				<div>
-					<div class="spacing" style="width:1%"></div>
-					<label style="width:10%; font-size:11px" class="help" title="Depressurized&#10;Vacuum Effect&#10;Still Functional">Holed &#128712;</label>
-					<input style="width:3%; margin-bottom:4px" name="attr_ShipSupplementalHoled" value="1" type="checkbox"/>
-					<div class="spacing" style="width:3%"></div>
-					<label style="width:16%; font-size: 11px" class="help" title="Non-functional&#10;No Gravity&#10;No Lights&#10;Can be Repaired">Unpowered &#128712;</label>
-					<input style="width:3%; margin-bottom:4px" name="attr_ShipSupplementalUnpowered" value="1" type="checkbox"/>
-					<div class="spacing" style="width:3%"></div>
-					<label style="width:13%; font-size: 11px" class="help" title="If Fire is not contained it counts as Damaged&#10;Can be Vented but it becomes Holed">On Fire! &#128712;</label>
-					<input style="width:3%; margin-bottom:4px" name="attr_ShipSupplementalOnFire" value="1" type="checkbox"/>
-					<div class="spacing" style="width:3%"></div>
-					<label style="width:14%; font-size: 11px" class="help" title="Non-functional&#10;No Gravity&#10;No Lights&#10;Hazardous&#10;Can be Repaired">Damaged &#128712;</label>
-					<input style="width:3%; margin-bottom:4px" name="attr_ShipSupplementalDamaged" value="1" type="checkbox"/>
-					<div class="spacing" style="width:3%"></div>
-					<label style="width:15%; font-size: 11px" class="help" title="Non-functional&#10;No Gravity&#10;No Lights&#10;Extremely Hazardous&#10;Cannot be Repaired">Destroyed &#128712;</label>
-					<input style="width:3%; margin-bottom:4px" name="attr_ShipSupplementalDestroyed" value="1" type="checkbox"/>
-				</div>
-				<div class="hbody"><textarea name="attr_ShipSupplementalComponentdesc"style="height:65px" placeholder="Component Description"></textarea></div>
-			</fieldset>
-		</div>
-	</div>
-	<!--Complications and Special-->
-	<div class="grid2">
-	    <div class="leftbox">
-	        <h3>Complications</h3>
-		    <textarea name="attr_ShipComplications" style="height:70px" placeholder="Past Histories, Machine Spirit Oddities and Background description"></textarea>
-		</div>
-		<div class="rightbox">
-		    <h3>Special Actions and Notes</h3>
-		    <textarea name="attr_ShipSpecialActions" style="height:70px" placeholder="Description"></textarea>
-		</div>
-	</div>
+    <div class="grid2">
+        <div class="leftbox">
+            <input type="hidden" name="attr_ShipEssentialComponentsPowerTotal" value="0"></input>
+            <input type="hidden" name="attr_ShipEssentialComponentsSpaceTotal" value="0"></input>
+            <input type="hidden" name="attr_ShipEssentialComponentsSPTotal" value="0"></input>
+            <label style="width:71%; text-align:center">ESSENTIAL COMPONENT</label>
+            <b style="width:9%" title="Power Used&#10;&#10;If this is the Plasma Drive&#10;Leave Value at 0&#10;Type value in Power Max Field">e</b>
+            <b style="width:8%" title="Space Used">`</b>
+            <b style="width:9%" title="SP">S</b>
+            <div class="spacing" style="width:3%"></div>
+            <fieldset class="repeating_shipessentialcomponents" name="attr_repeating_shipessentialcomponents">
+                <input type="text" name="attr_ShipEssentialComponentName" style="width:71%" data-i18n-placeholder="name" placeholder="Name"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="number" name="attr_ShipEssentialComponentPower" style="width:8%" value="0"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="number" name="attr_ShipEssentialComponentSpace" style="width:8%" value="0"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="number" name="attr_ShipEssentialComponentSP" style="width:8%" value="0"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="checkbox" name="attr_HideEssentialcomponent" style="width:3%" value="1" class="arrow icon"/>
+                <!--end of line-->
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipEssentialHoled" value="1" hidden="true"/><div>Holed</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipEssentialUnpowered" value="1" hidden="true"/><div>Unpowered</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipEssentialOnFire" value="1" hidden="true"/><div>On Fire!</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipEssentialDamaged" value="1" hidden="true"/><div>Damaged</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipEssentialDestroyed" value="1" hidden="true"/><div>Destroyed</div></label>
+                <div class="hbody"><textarea name="attr_ShipEssentialComponentdesc" style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
+                <div class="spacing" style="width:100%; height:8px"></div>
+            </fieldset>
+        </div>
+        <div class="rightbox">
+            <input type="hidden" name="attr_ShipSupplementalComponentsPowerTotal" value="0"></input>
+            <input type="hidden" name="attr_ShipSupplementalComponentsSpaceTotal" value="0"></input>
+            <input type="hidden" name="attr_ShipSupplementalComponentsSPTotal" value="0"></input>
+            <label style="width:71%; text-align:center">SUPPLEMENTAL COMPONENT</label>
+            <b style="width:9%" title="Power Used">e</b>
+            <b style="width:8%" title="Space Used">`</b>
+            <b style="width:9%" title="SP">S</b>
+            <div class="spacing" style="width:3%"></div>
+            <fieldset class="repeating_shipsupplementalcomponents" name="attr_repeating_shipsupplementalcomponents">
+                <input type="text" name="attr_ShipSupplementalComponentName" style="width:71%" data-i18n-placeholder="name" placeholder="Name"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="number" name="attr_ShipSupplementalComponentPower" style="width:8%" value="0"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="number" name="attr_ShipSupplementalComponentSpace" style="width:8%" value="0"/>
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="number" name="attr_ShipSupplementalComponentSP" style="width:8%" value="0">
+                <div class="spacing" style="width:0.5%"></div>
+                <input type="checkbox" class="arrow icon" style="width:3%" name="attr_HideSupplementalcomponent" value="1"></input>
+                <!--end of line-->
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipSupplementalHoled" value="1" hidden="true"/><div>Holed</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipSupplementalUnpowered" value="1" hidden="true"/><div>Unpowered</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipSupplementalOnFire" value="1" hidden="true"/><div>On Fire!</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipSupplementalDamaged" value="1" hidden="true"/><div>Damaged</div></label>
+                <div class="spacing" style="width:1%"></div>
+                <label class="fancyButton shipweapon" style="width:19.2%"><input type="checkbox" name="attr_ShipSupplementalDestroyed" value="1" hidden="true"/><div>Destroyed</div></label>
+                <div class="hbody"><textarea name="attr_ShipSupplementalComponentdesc"style="height:65px" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
+                <div class="spacing" style="width:100%; height:8px"></div>
+            </fieldset>
+        </div>
+    </div>
 </div>
 <!-- Journal Tab %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <div class="journal">
-    <h3>Experience and Advances &#9734;</h3>
+    <h1>Experience and Advances</h1>
     <div>
-        <label style="width:11%" class="help" title="Remaining XP to spend on Advances">XP to Spend &#128712;</label>
+        <label style="width:12%; text-align:right">XP to Spend</label>
+        <b style="width:3%" title="Remaining XP to spend on Advances">?</b>
         <input name="attr_XPtoSpend" type="text" style="width:7%" value="(@{XPTotal}) - (@{XPSpent})" disabled></input>
-        <div class="spacing" style="width:2%"></div>
-        <label style="width:13%" class="help" title="Total XP Spent determines your character's Rank&#10;&#10;Rank 1: 5,000 - 6,999&#10;Rank 2: 7,000 - 9,999&#10;Rank 3: 10,000 – 12,999&#10;Rank 4: 13,000 – 16,999&#10;Rank 5: 17,000 – 20,999&#10;Rank 6: 21,000 – 24,999&#10;Rank 7: 25,000 – 29,999&#10;Rank 8: 30,000 - 34,999+">Total XP Spent &#128712;</label>
+        <label style="width:12%; text-align:right">Total XP Spent</label>
+        <b style="width:3%" title="Total XP Spent determines your character's Rank&#10;&#10;Rank 1: 5,000 - 6,999&#10;Rank 2: 7,000 - 9,999&#10;Rank 3: 10,000 – 12,999&#10;Rank 4: 13,000 – 16,999&#10;Rank 5: 17,000 – 20,999&#10;Rank 6: 21,000 – 24,999&#10;Rank 7: 25,000 – 29,999&#10;Rank 8: 30,000 - 34,999+">?</b>
         <input name="attr_XPSpent" type="text" style="width:7%" value="(@{advtotal1} + @{advtotal2} + @{advtotal3})" disabled></input>
         <input name="attr_advtotal1" type="hidden" value="0"/>
         <input name="attr_advtotal2" type="hidden" value="0"/>
         <input name="attr_advtotal3" type="hidden" value="0"/>
+        <label style="width:11%; text-align:right">Earned XP</label>
+        <b style="width:3%" title="XP Earned during play&#10;&#10;Characters start with 4500 XP spent on&#10;character creation +500 XP for customizing&#10;&#10;Add a *Character Creation* advance costing&#10;4500 XP for an accurate Rank determination&#10;&#10;A starting Rogue Trader character is near equivalent&#10;to a Rank 5 Dark Heresy character">?</b>
+        <input style="width:7%" name="attr_XPTotal" type="number" value="5000"></input>
         <div class="spacing" style="width:2%"></div>
-        <label style="width:10%" class="help" title="XP Earned during play&#10;&#10;Characters start with 4500 XP spent on&#10;character creation +500 XP for customizing&#10;&#10;Add a *Character Creation* advance costing&#10;4500 XP for an accurate Rank determination&#10;&#10;A starting Rogue Trader character is near equivalent&#10;to a Rank 5 Dark Heresy character">Earned XP &#128712;</label>
-        <input name="attr_XPTotal" type="number" style="width:7%" value="5000"></input>
-        <div class="spacing" style="width:2%"></div>
-        <input name="attr_career_path" type="text" placeholder="Career Path" style="width:25%"></input>
-        <div class="spacing" style="width:1%"></div>
-        <label style="width:5%" >Rank:</label>
-        <input name="attr_rank" type="text" style="width:3%; font-weight:bold" readonly></input>
-        <div class="spacing" style="width:2%"></div>
-        <input name="attr_HideAdvancements" class="arrow icon" type="checkbox" style="width:3%; margin-bottom:5px; font-size: 17px" value="1" title="Toggle view Advances list"></input>
+        <input name="attr_career_path" type="text" placeholder="Career Path" style="width:21%"/>
+        <label style="width:6%; text-align:center" >Rank:</label>
+        <input name="attr_rank" type="text" style="width:3%" readonly/>
+        <input name="attr_HideAdvancements" class="arrow icon" type="checkbox" style="width:3%; margin-bottom:5px; font-size: 18px" value="1"></input>
         <div class="hbody">
             <fieldset class="repeating_advancements">
-                <input style="width:27%" name="attr_advancementRe1" type="text" placeholder="Advance Name"></input>
-                <input style="width: 5%" name="attr_advancementRe1xp" type="number" value="0" title="XP Cost"></input>
+                <input style="width:27%" name="attr_advancementRe1" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
+                <input style="width: 5%" name="attr_advancementRe1xp" type="number" value="0"></input>
                 <div class="spacing" style="width:2%"></div>
-                <input style="width:27%" name="attr_advancementRe2" type="text" placeholder="Advance Name"></input>
-                <input style="width: 5%" name="attr_advancementRe2xp" type="number" value="0" title="XP Cost"></input>
+                <input style="width:27%" name="attr_advancementRe2" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
+                <input style="width: 5%" name="attr_advancementRe2xp" type="number" value="0"></input>
                 <div class="spacing" style="width:2%"></div>
-                <input style="width:27%" name="attr_advancementRe3" type="text" placeholder="Advance Name"></input>
-                <input style="width: 5%" name="attr_advancementRe3xp" type="number" value="0" title="XP Cost"></input>
+                <input style="width:27%" name="attr_advancementRe3" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
+                <input style="width: 5%" name="attr_advancementRe3xp" type="number" value="0"></input>
             </fieldset>
         </div> 
     </div>
-    <h3>Origin Path &#9099;</h3>
+    <h1>Origin Path</h1>
     <div class="grid3">
         <div class="gridbox1st">
             <div>
                 <input name="attr_Homeworld" type="text" placeholder="Homeworld" style="width:85%"></input>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_homedesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Homeworld}} {{desc=**@{Homeworld}**&#10;@{homedesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                <input style="width:4%" type="checkbox" name="attr_hidehomedesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_homedesc" placeholder="Homeworld description and effects"></textarea></div>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Homeworld}} {{desc=**@{Homeworld}**&#10;@{homedesc}}}"><label class="shct">R</label></button>
+                <input style="width:4%" type="checkbox" name="attr_hidehomedesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_homedesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>
             <!--end of line-->
             <div>
                 <input name="attr_Trials" type="text" placeholder="Trials and Travails" style="width:85%"></input>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_trialsdesc" type="roll" style="width:10%"
-                   value="@{gmroll}&{template:custom} {{name=@{character_name}'s Trials and Travails}} {{desc=**@{trials}**&#10;@{trialsdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                <input style="width:4%" type="checkbox" name="attr_hidetrialsdesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_trialsdesc" placeholder="Trials and Travails description and effects"></textarea></div>
+                   value="@{gmroll}&{template:custom} {{name=@{character_name}'s Trials and Travails}} {{desc=**@{trials}**&#10;@{trialsdesc}}}"><label class="shct">R</label></button>
+                <input style="width:4%" type="checkbox" name="attr_hidetrialsdesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_trialsdesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>    
         </div>
         <div class="gridbox2nd">
@@ -4174,37 +4463,37 @@
                 <input name="attr_Birthright" type="text" placeholder="Birthright" style="width:85%"></input>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_Birthrightdesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Birthright}} {{desc=**@{Birthright}**&#10;@{Birthrightdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                <input style="width:4%" type="checkbox" name="attr_hideBirthrightdesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_Birthrightdesc" placeholder="Birthright description and effects"></textarea></div>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Birthright}} {{desc=**@{Birthright}**&#10;@{Birthrightdesc}}}"><label class="shct">R</label></button>
+                <input style="width:4%" type="checkbox" name="attr_hideBirthrightdesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_Birthrightdesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>
             <!--end of line-->
             <div>
                 <input name="attr_Motivation" type="text" placeholder="Motivation" style="width:85%"></input>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_Motivationdesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Motivation}} {{desc=**@{Motivation}**&#10;@{Motivationdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                <input style="width:4%" type="checkbox" name="attr_hideMotivationdesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_Motivationdesc" placeholder="Motivation description and effects"></textarea></div>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Motivation}} {{desc=**@{Motivation}**&#10;@{Motivationdesc}}}"><label class="shct">R</label></button>
+                <input style="width:4%" type="checkbox" name="attr_hideMotivationdesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_Motivationdesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>  
         </div>
         <div class="gridbox3rd">
             <div>
-                <input name="attr_lureotvoid" type="text" placeholder="Lure of The Void" style="width:85%"></input>
+                <input name="attr_lureotvoid" type="text" placeholder="Lure of the Void" style="width:85%"></input>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_luredesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Lure of The Void}} {{desc=**@{lureotvoid}**&#10;@{luredesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                <input style="width:4%" type="checkbox" name="attr_hideluredesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_luredesc" placeholder="Lure of The Void description and effects"></textarea></div>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Lure of The Void}} {{desc=**@{lureotvoid}**&#10;@{luredesc}}}"><label class="shct">R</label></button>
+                <input style="width:4%" type="checkbox" name="attr_hideluredesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_luredesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>
             <!--end of line-->
             <div>
                 <input name="attr_CharLineage" type="text" placeholder="Lineage" style="width:85%"></input>
                 <div class="spacing" style="width:1%"></div>
                 <button name="roll_CharLineagedesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Lineage}} {{desc=**@{CharLineage}**&#10;@{CharLineagedesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                <input style="width:4%" type="checkbox" name="attr_hideCharLineagedesc" value="1" class="arrow icon" title="Hide Description"></input>
-                <div class="hbody"><textarea style="height:65px" name="attr_CharLineagedesc" placeholder="Lineage description and effects"></textarea></div>
+                    value="@{gmroll}&{template:custom} {{name=@{character_name}'s Lineage}} {{desc=**@{CharLineage}**&#10;@{CharLineagedesc}}}"><label class="shct">R</label></button>
+                <input style="width:4%" type="checkbox" name="attr_hideCharLineagedesc" value="1" class="arrow icon"></input>
+                <div class="hbody"><textarea style="height:65px" name="attr_CharLineagedesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
             </div>
         </div>
     </div>
@@ -4213,12 +4502,12 @@
             <h2>Acquisitions</h2>
             <fieldset class="repeating_acquisitions">
                 <div class="quickborder">
-                    <input name="attr_acquisitionsname" style="width:85%" type="text" placeholder="Acquisition Name"></input>
+                    <input name="attr_acquisitionsname" style="width:85%" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_acquisitiondesc" type="roll" style="width:10%"
-                    value="@{gmroll}&{template:custom} {{name=@{acquisitionsname}}} {{desc=@{acquisitiondesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                    <input style="width:4%" type="checkbox" name="attr_hideacquisitiondesc" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_acquisitiondesc" placeholder="Acquisition Description"></textarea></div>
+                    value="@{gmroll}&{template:custom} {{name=@{acquisitionsname}}} {{desc=@{acquisitiondesc}}}"><label class="shct">R</label></button>
+                    <input style="width:4%" type="checkbox" name="attr_hideacquisitiondesc" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height:65px" name="attr_acquisitiondesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
@@ -4226,12 +4515,12 @@
             <h2>Misfortunes</h2>
             <fieldset class="repeating_misfortunes">
                 <div class="quickborder">
-                    <input name="attr_misfortunename" style="width:85%" type="text" placeholder="Misfortune Name"></input>
+                    <input name="attr_misfortunename" style="width:85%" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_misfortunedesc" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=@{misfortunename}}} {{desc=@{misfortunedesc}}}"><label class="shct" title="Send to Chat">R</label></button>
-                    <input style="width:4%" type="checkbox" name="attr_hidemisfortunedesc" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_misfortunedesc" placeholder="Misfortune Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=@{misfortunename}}} {{desc=@{misfortunedesc}}}"><label class="shct">R</label></button>
+                    <input style="width:4%" type="checkbox" name="attr_hidemisfortunedesc" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height:65px" name="attr_misfortunedesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
@@ -4239,12 +4528,12 @@
             <h2>Endeavours</h2>
             <fieldset class="repeating_endeavours">
                 <div class="quickborder">
-                    <input name="attr_EndeavoursName" style="width:85%" type="text" placeholder="Endeavour Name"></input>
+                    <input name="attr_EndeavoursName" style="width:85%" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_Endeavours" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=@{EndeavoursName}}} {{desc=@{EndeavoursNotes}}}"><label class="shct" title="Send to Chat">R</label></button>
-                    <input style="width:4%" type="checkbox" name="attr_HideEndeavours" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height: 65px" name="attr_EndeavoursNotes" placeholder="Endeavour Description"></textarea></div>
+                        value="@{gmroll}&{template:custom} {{name=@{EndeavoursName}}} {{desc=@{EndeavoursNotes}}}"><label class="shct">R</label></button>
+                    <input style="width:4%" type="checkbox" name="attr_HideEndeavours" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height: 65px" name="attr_EndeavoursNotes" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>    
             </fieldset>
         </div>
@@ -4254,13 +4543,13 @@
             <h2>Alternate Career Ranks</h2>
             <fieldset class="repeating_altcareer">
                 <div class="quickborder">
-                    <input name="attr_altcareername" style="width:85%" type="text" placeholder="Alternate Career Name"></input>
+                    <input name="attr_altcareername" style="width:85%" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_altcareerdesc" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=@{character_name}'s Alternate Career}} {{desc=**@{altcareername}**&#10;@{altcareerdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=@{character_name}'s Alternate Career}} {{desc=**@{altcareername}**&#10;@{altcareerdesc}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_hidealtcareer" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_altcareerdesc" placeholder="Alternate Career description and notes&#10;&#10;Original fields can be found in the EXTRAS tab"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_hidealtcareer" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height:65px" name="attr_altcareerdesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
@@ -4272,13 +4561,13 @@
             <h2>Special Notes</h2>
             <fieldset class="repeating_specialnotes">
                 <div class="quickborder">
-                    <input name="attr_specialnotesname" style="width:85%" type="text" placeholder="Note Name"></input>
+                    <input name="attr_specialnotesname" style="width:85%" type="text" data-i18n-placeholder="name" placeholder="Name"></input>
                     <div class="spacing" style="width:1%"></div>
                     <button name="roll_specialnotesdesc" type="roll" style="width:10%"
-                        value="@{gmroll}&{template:custom} {{name=@{specialnotesname}}} {{desc=@{specialnotesdesc}}}"><label class="shct" title="Send to Chat">R</label></button>
+                        value="@{gmroll}&{template:custom} {{name=@{specialnotesname}}} {{desc=@{specialnotesdesc}}}"><label class="shct">R</label></button>
                     <div class="spacing" style="width:1%"></div>
-                    <input style="width:3%" type="checkbox" name="attr_hidespecialnotes" value="1" class="arrow icon" title="Hide Description"></input>
-                    <div class="hbody"><textarea style="height:65px" name="attr_specialnotesdesc" placeholder="Note Description"></textarea></div>
+                    <input style="width:3%" type="checkbox" name="attr_hidespecialnotes" value="1" class="arrow icon"></input>
+                    <div class="hbody"><textarea style="height:65px" name="attr_specialnotesdesc" data-i18n-placeholder="description" placeholder="Description"></textarea></div>
                 </div>
             </fieldset>
         </div>
@@ -4287,25 +4576,42 @@
 <!-- Config Tab %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <div class="config">
     <div>
-        <h3>Extras</h3>
-        <input style="width:100%; font-size:10px" class="arrow icon" type="checkbox" name="attr_HideExtras" value="1" title="Hide Extras"></input>
+        <h1>Extras</h1>
+        <input style="width:100%; font-size:10px" class="arrow icon" type="checkbox" name="attr_HideExtras" value="1"></input>
         <div class="hbody">
-            <input name="attr_altcareer1" type="text" placeholder="Alternate Career 1" style="width:15%"></input>
-            <input name="attr_AltRank1" type="text" placeholder="Rank" style="width:4%"></input>
+            <div>
+            <label style="width:23%">Custom Move</label>
+            <label style="width:8%">Half:</label>
+            <input name="attr_CustomHalfMove" type="number" style="width:8%"/>
+            <div class="spacing" style="width:3%"></div>
+            <label style="width:8%">Full:</label>
+            <input name="attr_CustomFullMove" type="number" style="width:8%"/>
+            <div class="spacing" style="width:3%"></div>
+            <label style="width:12%">Charge:</label>
+            <input name="attr_CustomChargeMove" type="number" style="width:8%"/>
+            <div class="spacing" style="width:3%"></div>
+            <label style="width:8%">Run:</label>
+            <input name="attr_CustomRunMove" type="number" style="width:8%"/>
+            <!-- obsolete movement fields -->
+            <label style="width:23%">Flyer Trait</label>
+            <label style="width:8%">Half:</label>
+            <input name="attr_FlyerHalfMove" type="number" style="width:8%"/>
+            <div class="spacing" style="width:3%"></div>
+            <label style="width:8%">Full:</label>
+            <input name="attr_FlyerFullMove" type="number" style="width:8%"/>
+            <div class="spacing" style="width:3%"></div>
+            <label style="width:12%">Charge:</label>
+            <input name="attr_FlyerChargeMove" type="number" style="width:8%"/>
+            <div class="spacing" style="width:3%"></div>
+            <label style="width:8%">Run:</label>
+            <input name="attr_FlyerRunMove" type="number" style="width:8%"/>
+            <label style="width:13%; text-align:right">Leap:</label>
             <div class="spacing" style="width:1%"></div>
-            <input name="attr_altcareer2" type="text" placeholder="Alternate Career 2" style="width:15%"></input>
-            <input name="attr_AltRank2" type="text" placeholder="Rank" style="width:4%"></input>
-            <div class="spacing" style="width:1%"></div>
-            <input name="attr_altcareer3" type="text" placeholder="Alternate Career 3" style="width:15%"></input>
-            <input name="attr_AltRank3" type="text" placeholder="Rank" style="width:4%"></input>
-            <div class="spacing" style="width:1%"></div>
-            <input name="attr_altcareer4" type="text" placeholder="Alternate Career 4" style="width:15%"></input>
-            <input name="attr_AltRank4" type="text" placeholder="Rank" style="width:4%"></input>
-            <div class="spacing" style="width:1%"></div>
-            <input name="attr_altcareer5" type="text" placeholder="Alternate Career 5" style="width:15%"></input>
-            <input name="attr_AltRank5" type="text" placeholder="Rank" style="width:4%"></input>
-            <!--end of line-->
-            <h3>DO NOT DELETE THE REPEATING FIELD, THESE FIELDS WILL BE REMOVED LATER</h3>
+            <input name="attr_CustomLeap" type="number" style="width:8%"/>
+            <label style="width:12%; text-align:right">Jump:</label>
+            <input name="attr_CustomJump" type="number" style="width:8%"/>
+            </div>
+            <h1>DO NOT DELETE THE REPEATING FIELD, THESE FIELDS WILL BE REMOVED LATER</h1>
             <fieldset class="repeating_vehicles">
                 <!--weapon 1-->
                 <div style="width:33%; display:inline-block">
@@ -4491,138 +4797,118 @@
             </div>
             </fieldset>
         </div>
-        <h1>Homebrew Content</h1>
-        <span style="width:50%">Warp Travel Revised (click to expand)</span>
-        <span style="width:50%">Cover Rules Revised (click to expand)</span>
+        <h2>Warp Travel Revised</h2>
+        <span style="width:100%; font-size:17px">see new rules at</span>
+        <span class="hpl" style="width:100%">https://wiki.roll20.net/Rogue_trader_improved#Warp_Travel_.28revised.29</span>
         <!--end of line-->
-        <textarea class="rulesbox" readonly
-        >**Stage 1 Pre-Travel preparations:
-        The ship will spend 10 days (or 2d10) to reach the jump point
-        outside the system's gravity well (unless the ship is in open space)
-        Then the Navigator takes an Awareness Test (Difficulty set by GM)
-        in order to locate the Holy Astronomican and chart a route.
-        Other characters may assist this test by praying or giving speeches
-        (these may require other tests at GMs discretion)&#10;
-        Each Degree of Success Reduces travel time by 5 days,
-        Failure Increases travel time by 30 days with each Degree adding 10 days.
-        Then the GM determines Travel Time in Days (see Travel Time below).
-        Be mindful that the ships supplies are limited (see Ship Supplies below)&#10;
-        **Stage 2 The Journey:
-        Based on travel time the GM determines the number of Warp Travel
-        Encounters the ship will face (one encounter every 10 days is reasonable)
-        (if the Journey lasts less than 10 days, the ship should face at least one)
-        Then the GM (in secret) will Roll the Warp Travel Encounters button
-        The Gellar Field provides +15 to every roll for as long as its functional
-        *The Chaos Cult plot is optional* if undesired, replace all related
-        results with the Alls Well encounter.(makes the journey easier)&#10;
-        **Stage 3 The Arrival:
-        To re-enter realspace, the navigator must take a Challenging (+0)
-        Navigation (Warp) Test and again, other characters may assist this test.&#10;
-        Success means the ship arrived at its correct destination on time.
-        Each Degree of Success restores Crew Morale by 1 (up to limit)
-        Failure means the ship is off-course by 30 days, with each Degree 
-        of Failure adding 10 days each, and reducing Crew Morale by 1d5+1.
-        4 or more Degrees of Failure also throws the ship off-time...
-        Backward? Forward? Still? (GM discretion advised)</textarea>
-        <div class="spacing" style="width:1%"></div>
-        <textarea class="rulesbox" readonly
-        >*Cover is any object that can be used to hide behind it, classified as:&#10;
-        *Half Cover will block any Ranged Attack hit to the LEGS location.
-        If the character goes Prone behind it, then its considered Full Cover.&#10;
-        *Full Cover will block any Ranged Attack hit to ALL locations.&#10;
-        Any ranged attack that would have Hit the character, 
-        hits the cover instead, Roll the weapon Damage + Pen
-        (if any) the total is dealt to the cover's "Durability" points&#10;
-        *Durability is similar "wounds", this list provides some examples:
-        -Soft materials: plastic, furniture and thin metal (20 DP)
-        -Semi-durable: wood, storage crates, metal doors (100 DP) 
-        -Durable: sandbags, barricades, metal structures (250 DP)
-        -Very Durable: bulkheads, solid rockcrete, stone (600 DP)
-        -Reinforced: Plasteel structures, Armaplas structures (1500 DP)&#10;
-        **Exceptions:
-        *Flanking happens when the attack comes from an angle the cover does
-        not protect against, such as been hit from behind (at GMs discretion)
-        *Weapons with the Blast Quality ignore cover.
-        *Pyschic/Warp attacks that DO NOT have a physical projectile
-        also ignore cover. (e.g. psychic scream)&#10;
-        Characters behind cover are still visible to attackers.&#10;
-        Characters larger than Hulking do not benefit from (most) cover.&#10;
-        The Overwatch action can be used to attack a character "As they come
-        out of cover" to attack or move. Cover is ignored but the test is at -20</textarea>
+        <div class="spacing" style="width:35%"></div>
+        <button name="roll_warptravel" type="roll" style="width:30%; margin-top:10px" value="@{gmroll}&{template:custom} {{name=**The Warp is calling...**}} {{warpt=[[(1d100 + @{geller} + ?{Modifier|0} )]]}} {{xd5=[[1d5+2]]}} {{d5=[[1d5]]}} {{d10=[[1d10]]}} {{xd10=[[2d10]]}} {{d100h=[[1d100]]}} {{psydmg=[[1d10+6]]}} {{psypen=[[3d10]]}} {{hitloc=[[4d10]]}}">
+            <div class="spacing" style="width:8%"></div>
+            <label style="width:84%">Warp Travel Encounters</label>
+            <b style="width:8%" title="Rolls a 1d100 on the Warp Travel Encounters table&#10;&#10;The Gellar Field provides a +15 modifier&#10;If the Gellar Field is Damaged, Unpowered or Destroyed&#10;Set Gellar Field switch to 'X' (+0)">?</b>
+        </button>
+        <div class="spacing" style="width:35%"></div>
         <!--end of line-->
         <input type="radio" style="width:2%; margin-bottom: 3px;" name="attr_geller" value="15" checked/>
-        <label style="width:17%">&#9204;&#9989; Gellar Field &#10060;&#9205;</label>
+        <i style="width:4%">&#10094;&#9989;</i>
+        <label style="width:13%; text-align:center" >Gellar Field</label>
+        <i style="width:4%">&#10060;&#10095;</i>
         <input type="radio" style="width:2%; margin-bottom: 3px;" name="attr_geller" value="0"/>
-        <div class="spacing" style="width:2%"></div>
-        <button name="roll_warptravel" type="roll" style="width:22%" title="Rolls a 1d100 on the Warp Travel Encounters table&#10;&#10;The Gellar Field provides a +15 modifier&#10;If its Damaged, Unpowered or Destroyed&#10;it is considered Offline, set Gellar Field to ( X ) (no bonus)&#10;&#10;Over 80 unique encounters!&#10;There is a 25% chance for Alls Well (good)&#10;Results in between 86 to 60 are not too bad&#10;but results of 59 or under... The Emperor Protects...&#10;&#10;GMs discretion advised."
-        value="@{gmroll}&{template:custom} {{name=**The Warp is calling...**}} {{warpt=[[(1d100 + @{geller} + ?{Modifier|0} )]]}} {{xd5=[[1d5+2]]}} {{d5=[[1d5]]}} {{d10=[[1d10]]}} {{xd10=[[2d10]]}} {{d100h=[[1d100]]}} {{psydmg=[[1d10+6]]}} {{psypen=[[3d10]]}} {{hitloc=[[4d10]]}}">
-            <label>Warp Travel Encounters &#128712;</label></button>
-        <div class="spacing" style="width:2%"></div>
-        <label style="width:12%" class="help" title="Travel Time (in days)&#10;The GM determines total travel time as described above&#10;taking into consideration several factors such as:&#10;Is the route charted?, is the Astronomican obscured?, how far is the destination?&#10;See Navis Primer page 38 for details and estimates.&#10;&#10;In RT a *Week* is 5 days (as opposed to 7) and a *Month* is 30 days&#10;Some Warp Drive models modify travel time substantially&#10;&#10;GMs TIP: assign atribute TravelTime&#10;to a hidden token bubble for easier addition/substraction.">Travel Time &#128712;&#9205;</label>
-        <input name="attr_TravelTime" style="width:4%" type="number" placeholder="days"/>
-        <div class="spacing" style="width:2%"></div>
-        <label style="width:13%" class="help" title="Ship Supplies (in days)&#10;Most Ships have up to 180 days of supplies (6 months)&#10;Supply capacity can be increased with some Ship Components or rationing&#10;&#10;Every 30 days spent beyond the supply limit deals -2 Crew Morale&#10;&#10;Other events may happen after supplies run out&#10;See page 227 for details.&#10;&#10;GMs TIP: assign atribute ShipSupplies&#10;to a hidden token bubble for easier addition/substraction.">Ship Supplies &#128712;&#9205;</label>
-        <input name="attr_ShipSupplies" style="width:4%" type="number" placeholder="days"/>
-        <div class="spacing" style="width:2%"></div>
-        <label style="width:12%" class="help" title="Expected Warp Travel Encounters&#10;The number of encounters is determined by the GM&#10;taking into consideration travel time, route and destination&#10;&#10;Some Gellar Field models and some special Ship Components&#10;affect how many encounters are expected and their severity.&#10;&#10;Too many encounters may bore players, GM discretion advised&#10;&#10;GMs TIP: assign atribute WarpEncounter&#10;to a hidden token bubble for easier addition/substraction.">Encounters &#128712;&#9205;</label>
-        <input name="attr_WarpEncounter" style="width:4%" type="number" placeholder="?"/>
+        <label style="width:19%; text-align:right">Travel Time</label>
+        <b style="width:3%" title="Travel Time (in days)&#10;The GM determines total travel time as described in the rules (see article)&#10;taking into consideration several factors such as:&#10;Is the route charted?, is the Astronomican obscured?, how far is the destination?&#10;See Navis Primer supplement page 38 for details and estimates.&#10;&#10;In RT a 'Week' is 5 days (as opposed to 7) and a 'Month' is 30 days&#10;Some Warp Drive Components can modify travel time.">?</b>
+        <input name="attr_TravelTime" style="width:4%" type="number"/>
+        <label style="width:19%; text-align:right" >Ship Supplies</label>
+        <b style="width:3%" title="Ship Supplies (in days)&#10;Most Ships have up to 180 days of supplies (6 months)&#10;Supply capacity can be increased with specific&#10;Ship Components (such as Cargo Holds) or rationing supplies&#10;&#10;When Ship Supplies run out, the Ship and should suffer a misfortune&#10;as described in page 227 RTC.">?</b>
+        <input name="attr_ShipSupplies" style="width:4%" type="number"/>
+        <label style="width:16%; text-align:right" >Encounters</label>
+        <b style="width:3%" title="Expected Warp Travel Encounters&#10;The number of encounters is determined by the GM&#10;taking into consideration travel time, route and destination&#10;&#10;Some Gellar Field models and some special Ship Components&#10;affect how many encounters are expected and their severity.">?</b>
+        <input name="attr_WarpEncounter" style="width:4%" type="number"/>
         <!--end of line-->
-        <label style="width:100%; text-align:center" class="help" 
-        title="The Chaos Cult will manifest and grow in Strength during certain encounters&#10;These encounters will *Increase Cult Strenght by (X) Steps*&#10;&#10;Cult Strength starts at *Crushed* and advances to the right&#10;When a step is reached, apply the corresponding effect below&#10;&#10;Some encounters provide ways to reduce Cult Strength&#10;If the Cult *Reduces Strength* (step back) the effects below are ignored&#10;&#10;The finer details on how to deal with the cult are up to the GM"
-        >Chaos Cult Strenght &#128712;</label>
+        <h2>Chaos Cult mini-game</h2>
+        <b style="width:100%; font-size:18px" title="The Chaos Cult will only act during Warp Travel encounters&#10;These encounters will 'Increase Cult Strenght by (X) Steps'&#10;&#10;Cult Strength starts at 'Crushed' and advances to the right&#10;When a step is reached, apply the corresponding effect below&#10;&#10;Some encounters provide ways to reduce Cult Strength&#10;If the Cult 'Reduces Strength' (step back) the effects below are ignored.">?</b>
         <!--end of line-->
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="0" checked/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="1"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="2"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="3"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="4"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="5"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="6"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="7"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="8"/>
-        <input type="radio" style="width:10%" name="attr_chaoscult" value="9"/>
+        <div class="spacing" style="width:1%"></div>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="0" checked/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="1"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="2"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="3"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="4"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="5"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="6"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="7"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="8"/>
+        <i style="width:2%">&#10095;</i>
+        <input type="radio" style="width:8%" name="attr_chaoscult" value="9"/>
+        <div class="spacing" style="width:1%"></div>
         <!--end of line-->
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="It is said that heresy is like a tree&#10;Its roots lie in darkness&#10;You can prune off its branches&#10;even cut the tree to the ground&#10;but it will grow again...&#10;ever stronger...&#10;&#10;When dealing with heresy&#10;no sacrifice is too great&#10;no trechery too small.">Crushed &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult spreads lies and rumors&#10;to get the weak minded to join&#10;&#10;the Crew suffers 1 Morale Damage.">Demoralization &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult attemps to obtain the favor&#10;of their dark gods, by sacrificing several&#10;crew members already inducted.&#10;&#10;the Crew suffers 1 Crew Pop Damage.">Human Sacrifice &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult has infiltrated several key&#10;positions amongs the ranks&#10;&#10;Any Crew Test or Command Test&#10;that involves the crew, gets a -15 penalty">Infiltration &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult attempts to start a crisis&#10;by sabotaging the ships supplies&#10;&#10;Ship Supplies are reduced by *Half* of their current value&#10;Explorers can mitigate this loss at GMs discretion">Supplies Sabotaged &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult conspires to sabotage&#10;the Gellar Field!&#10;&#10;The Gellar Field Component&#10;is Destroyed">Gellar Field Sabotaged &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult figures they need to keep the ship&#10;in the Warp for as long as possible&#10;&#10;The ship suffers an *Engines Crippled* Critical Hit (#6)&#10;If the Ships Speed is reduced by half&#10;Double the current travel time&#10;If the Ships Speed is reduced to 1&#10;Quadruple the current Travel Time&#10;&#10;The Engines cannot be repaired until the vessel exits the Warp">Engines Sabotaged &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult attempts to destabilize leadership&#10;by killing important crew members&#10;such as deck officers, enforcers&#10;and even the Top Brass&#10;&#10;the GM chooses an important NPC&#10;(or PC) to be assasinated&#10;details about this plot&#10;or how to prevent it&#10;are up to the GM.">Assasination &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached&#10;The Cult attempts to take over the ship!&#10;A mutiny starts, about half of the remaining Crew joins it&#10;See rules on mutiny on page 225 RTC&#10;&#10;The Cult leaders have 65 score in all skills involved&#10;If the Mutiny is suppresed the Cult looses a lot of power&#10;Reduce Cult Strenght by 5 Steps">Cult Mutiny &#128712;</label>
-        <label style="width:10%; height:35px; text-align:center; cursor:help" title="When this step is reached...&#10;&#10;The Cult attempts to bring their dark masters onboard&#10;&#10;The Cult summons a Greater Daemon and/or&#10;a legion of lesser daemons to ravage the crew&#10;Many cultists also join in the fight&#10;&#10;Combat Encounter at GMs discretion&#10;&#10;If the Daemons and cultist are defeated&#10;then the Cult is Crushed.... for now">Daemon Summoning &#128712;</label>
-        <div class="spacing" style="width:100%;height:20px"></div>
+        <div class="spacing" style="width:0.5%"></div>
+        <label style="width:9.9%; text-align:center" >Crushed</label>
+        <label style="width:9.9%; text-align:center" >Rumors</label>
+        <label style="width:9.9%; text-align:center" >Infiltration</label>
+        <label style="width:9.9%; text-align:center" >Sacrifice</label>
+        <label style="width:9.9%; text-align:center" >Supplies</label>
+        <label style="width:9.9%; text-align:center" >Gellar Field</label>
+        <label style="width:9.9%; text-align:center" >Engines</label>
+        <label style="width:9.9%; text-align:center" >Assasination</label>
+        <label style="width:9.9%; text-align:center" >Mutiny</label>
+        <label style="width:9.9%; text-align:center" >Summoning</label>
+        <div class="spacing" style="width:0.5%"></div>
         <!--end of line-->
-        <h1>Roll20 Wiki Link</h1>
-        <span class="hpl" style="width:100%" title="Click to select all > Right click > Open link in new tab&#10;&#10;Roll20 does not allow hyperlinks :(">https://wiki.roll20.net/Rogue_trader_improved</span>
-        <h1>Credits</h1>
+        <b style="width:10%" title="It is said that heresy is like a tree&#10;Its roots lie in darkness&#10;You can prune off its branches&#10;even cut the tree to the ground&#10;but it will grow again&#10;ever stronger...&#10;&#10;When dealing with heresy&#10;no sacrifice is too great&#10;no trechery too small.">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult spreads lies and rumors&#10;to get the weak minded to join&#10;&#10;the Crew suffers 1 Morale Damage.">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult has infiltrated several key&#10;positions amongst the ranks&#10;&#10;Any Crew Test or Command Test&#10;that involves the crew, gets a -10 penalty">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult attemps to obtain the favor&#10;of their dark gods, by sacrificing several&#10;crew members already inducted.&#10;&#10;the Crew suffers 1d5 Crew Pop Damage.">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult attempts to start a crisis&#10;by sabotaging the ships supplies&#10;&#10;Ship Supplies are reduced by HALF of their current value.">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult conspires to sabotage&#10;the Gellar Field!&#10;&#10;The Gellar Field Component&#10;is Destroyed">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult figures they need to keep the ship&#10;in the Warp for as long as possible&#10;&#10;The ship suffers an *Engines Crippled* Critical Hit (#6)&#10;If the Ships Speed is reduced by half&#10;Double the current travel time&#10;If the Ships Speed is reduced to 1&#10;Quadruple the current Travel Time&#10;&#10;The Engines cannot be repaired until the vessel exits the Warp">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult attempts to destabilize leadership&#10;by killing important crew members&#10;such as deck officers, enforcers&#10;and even the Top Brass&#10;&#10;the GM chooses an important NPC&#10;(or PC) to be assasinated&#10;details about this plot&#10;or how to prevent it&#10;are up to the GM.">?</b>
+        <b style="width:10%" title="When this step is reached&#10;The Cult attempts to take over the ship!&#10;A mutiny starts, about half of the remaining Crew joins it&#10;See rules on mutiny on page 225 RTC&#10;&#10;The Cult leaders have 65 score in all skills involved&#10;If the Mutiny is suppresed the Cult looses a lot of power&#10;Reduce Cult Strenght by 5 Steps">?</b>
+        <b style="width:10%" title="When this step is reached...&#10;&#10;The Cult attempts to bring their dark masters onboard&#10;&#10;The Cult summons a Greater Daemon and/or&#10;a legion of lesser daemons to ravage the crew&#10;Many cultists also join in the fight&#10;&#10;Combat Encounter at GMs discretion&#10;&#10;If the Daemons and cultist are defeated&#10;then the Cult is Crushed.... for now">?</b>
+        <div class="spacing" style="width:100%;height:15px"></div>
+        <!--end of line-->
+        <h2>Credits</h2>
         <span style="width:100%">Redesigned and improved by author Mago with support from Andy</span>
         <span style="width:100%">Original sheet layout based on Dark Heresy 2nd Edition Character Sheet created by Daniel D., Michael R and Samuel L.</span>
-        <h1>Special Thanks</h1>
+        <h2>Special Thanks</h2>
+        <span style="width:100%">Baleini for providing sheet Translation coding and Streamlining</span>
         <span style="width:100%">RainbowEncoder for providing vital support with macros using reused rolls and decimal removal</span>
         <span style="width:100%">GiGs and Scott C. for providing advice with this sheet layout, including resolution to the infamous "input inside a button" problem</span>
         <span style="width:100%">Oosh for assisting with the Damage Calculator macro</span>
         <span style="width:100%">Andreas j. for providing support on this sheet wiki page</span>
-        <span style="width:100%">Baleini for providing many ideas for sheet streamlining</span>
-        <div class="logo" style="width:100%"><img style="display:block; margin-left:auto; margin-right:auto" src="https://raw.githubusercontent.com/roguetradermago/Rogue-Trader-improved-assets/main/rogue-trader-logo-lg.png"></div>
-        <span style="width:100%; margin-bottom:10px">Rogue Trader Improved Rev.7 May 2025</span>
     </div>
 </div>
+<!-- Footer %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
+<div style="margin-top: 10px">
+    <span style="width:50%; margin-bottom:10px">Rogue Trader Improved Rev.8 Sep. 2025</span>
+    <span class="hpl" style="width:50%">https://wiki.roll20.net/Rogue_trader_improved</span>
+    <!-- end of line -->
+    <span style="width:8%; text-align:right">Tooltip:</span>
+    <b style="width:3%">?</b>
+    <div class="spacing" style="width:5%"></div>
+    <span style="width:12%; text-align:right">Post on Chat:</span>
+    <b style="width:3%">R</b>
+    <div class="spacing" style="width:5%"></div>
+    <span style="width:15%; text-align:right">Toggle Visibility:</span>
+    <b style="width:2.5%">{</b>
+    <b style="width:2.5%">}</b>
+    <div class="spacing" style="width:5%"></div>
+    <span style="width:13%; text-align:right">Add Section:</span>
+    <b style="width:3%">&</b>
+    <div class="spacing" style="width:5%"></div>
+    <span style="width:13%; text-align:right">Edit Section:</span>
+    <b style="width:3%">y</b>
+</div>
 </main>
 <!-- Script Section %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
 <script type="text/worker">
-/* --- script for the crp attack macro unfinished--- 
-on("clicked:repeating_rangedweapons:guncrp", function(eventInfo) {
-    getAttrs(["repeating_rangedweapons_gunroll"], function(values) {
-        let diceRoll = values["repeating_rangedweapons_gunroll"] || "[[1d100]]";
-        startRoll(diceRoll, (r) => {
-            finishRoll(r.rollId);
-        });
-    });
-});
-
-
 /* --- script for crew morale--- */
 on("change:crewmorale sheet:opened", function() {
     getAttrs(["crewmorale"], function(values) {
@@ -4751,22 +5037,22 @@ on("change:corruption sheet:opened", function() {
       let maligMod = 0;
       
       if (cp === 0) {
-         corruptionDegree = "Pure (0 CP)";
+         corruptionDegree = "Degree of Corruption: Pure (0 CP)";
          maligMod = 0;
       } else if (cp >= 1 && cp <= 30) {
-         corruptionDegree = "Tainted (1-30 CP) - Malignancy Mod +0";
+         corruptionDegree = "Degree of Corruption: Tainted (1-30 CP) ~ Malignancy Mod +0";
          maligMod = 0;
       } else if (cp >= 31 && cp <= 60) {
-         corruptionDegree = "Soiled (31-60 CP) - Malignancy Mod -10";
+         corruptionDegree = "Degree of Corruption: Soiled (31-60 CP) ~ Malignancy Mod -10";
          maligMod = 10;
       } else if (cp >= 61 && cp <= 90) {
-         corruptionDegree = "Debased (61-90 CP) - Malignancy Mod -20";
+         corruptionDegree = "Degree of Corruption: Debased (61-90 CP) ~ Malignancy Mod -20";
          maligMod = -20;
       } else if (cp >= 91 && cp <= 99) {
-         corruptionDegree = "Profaned (91-99 CP) - Malignancy Mod -30";
+         corruptionDegree = "Degree of Corruption: Profaned (91-99 CP) ~ Malignancy Mod -30";
          maligMod = -30;
       } else {
-         corruptionDegree = "Damned (100+ CP)";
+         corruptionDegree = "Degree of Corruption: Damned (100+ CP)";
          maligMod = -99;
       }
 
@@ -4787,22 +5073,22 @@ on("change:insanity sheet:opened", function() {
       
       if (ip >= 0 && ip <= 9) {
          mod = 10;
-         desc = "Stable (0-9 IP) - Trauma Mod +10";
+         desc = "Degree of Madness: Stable (0-9 IP) ~ Trauma Mod +10";
       } else if (ip >= 10 && ip <= 39) {
          mod = 10;
-         desc = "Unsettled (10-39 IP) - Trauma Mod +10";
+         desc = "Degree of Madness: Unsettled (10-39 IP) ~ Trauma Mod +10";
       } else if (ip >= 40 && ip <= 59) {
          mod = 0;
-         desc = "Disturbed (40-59 IP) - Trauma Mod +0";
+         desc = "Degree of Madness: Disturbed (40-59 IP) ~ Trauma Mod +0";
       } else if (ip >= 60 && ip <= 79) {
          mod = -10;
-         desc = "Unhinged (60-79 IP) - Trauma Mod -10";
+         desc = "Degree of Madness: Unhinged (60-79 IP) ~ Trauma Mod -10";
       } else if (ip >= 80 && ip <= 99) {
          mod = -20;
-         desc = "Deranged (80-99 IP) - Trauma Mod -20";
+         desc = "Degree of Madness: Deranged (80-99 IP) ~ Trauma Mod -20";
       } else if (ip >= 100) {
          mod = -99;
-         desc = "Terminally Insane (100+ IP)";
+         desc = "Degree of Madness: Terminally Insane (100 IP)";
       }
 
       setAttrs({
@@ -5487,7 +5773,7 @@ on("change:startingFEL change:AdvancedFEL1 change:AdvancedFEL2 change:AdvancedFE
             {{/nova1}}
             {{#nova2}}
                 <div class="sheet-result">{{nova2}}<br>
-                    {{#rollWasCrit() nova2 }}Critical Hit! {{d5}}{{/rollWasCrit() nova2 }}
+                    {{#rollWasCrit() nova2 }}Critical Hit!{{/rollWasCrit() nova2 }}
                 </div>
             {{/nova2}}
         <!--section for nav mutation table -->
@@ -5568,35 +5854,43 @@ on("change:startingFEL change:AdvancedFEL1 change:AdvancedFEL2 change:AdvancedFE
             {{/psytable}}
         <!--section for shock table -->
             {{#shocktable}}
-                <div class="sheet-desc">{{shocktable}}<br>
-                    {{#rollBetween() shocktable 1 20}}The character is badly startled. He may only take a **single Half Action** in his next Turn, but afterwards he may act normally.{{/rollBetween() shocktable 1 20}}
-                    {{#rollBetween() shocktable 21 40}}Fear grips the character and he begins to shake and tremble. He takes a **–10 penalty on all Tests for the rest of the encounter unless he can snap out of it**.{{/rollBetween() shocktable 21 40}}
-                    {{#rollBetween() shocktable 41 60}}Reeling with shock, the character backs away from the thing that confronts them. The character **cannot willingly approach the object of his fear**, but may otherwise act normally, with a **–10 penalty on all Tests** until the end of the encounter. The character gains **1 Insanity Point**.{{/rollBetween() shocktable 41 60}}
-                    {{#rollBetween() shocktable 61 80}}The character is frozen by terror. The character may take **no Actions until he snaps out of it**. After snapping out of it, the character will make **all Tests with a –10 penalty for the rest of the encounter**. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 61 80}}
-                    {{#rollBetween() shocktable 81 100}}Panic grips the character. He must **flee the source of his fear**, if able, as fast as he can, and if prevented from doing so, he may only take **Half Actions** and takes a **–20 penalty to all Tests**. The character gains {{d5}} **Insanity Points**. Once away from the danger, he must successfully **snap out of it** to regain control.{{/rollBetween() shocktable 81 100}}
-                    {{#rollBetween() shocktable 101 120}}Fainting dead away, the character keels over and remains **unconscious for** {{d5}} **Rounds**. Once he regain consciousness, he is still shaken and takes **all Tests with a –10 penalty until the end of the encounter**. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 101 120}}
-                    {{#rollBetween() shocktable 121 130}}Totally overwhelmed, the character screams and vomits uncontrollably for {{d5}} **Rounds**. During this time he is **helpless**, may do nothing and drop anything he is holding. Afterwards, until the end of the encounter, the character may only take a **single Half Action each Turn until he can rest**. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 121 130}}
-                    {{#rollBetween() shocktable 131 140}}The character laughs hysterically and **randomly attacks anything near him** in a manic frenzy, firing wildly or using whatever weapon he has in hand. This effect lasts until the character **snaps out of it**, or until he is knocked unconscious. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 131 140}}
-                    {{#rollBetween() shocktable 141 160}}The character **falls to the ground for** {{xd5}} Rounds** sobbing, babbling, and tearing at his own flesh, and may do nothing. Even after he returns to his senses, he is a complete mess and takes a **–20 penalty on all Tests until the end of the encounter**. The character gains {{xd5}} **Insanity Points**.{{/rollBetween() shocktable 141 160}}
-                    {{#rollBetween() shocktable 161 170}}The character’s mind snaps and he becomes **catatonic for** {{d5}} **hours** and may not be roused. The character gains {{d10}} **Insanity Points**.{{/rollBetween() shocktable 161 170}}
-                    {{#rollTotal() shocktable 171}}The character is so affected that he begins to see strange and terrible visions as his hold on reality shatters. The character suffers the effects of **“Acute Hallucinations”** for {{xd10}} **Rounds**. After the hallucinations fade, the character will take **all Tests with a –20 penalty while the encounter lasts**. The character gains {{xd10}} **Insanity Points** and takes {{d10}} points of **permanent Willpower damage**.{{/rollTotal() shocktable 171}}
-                    {{#rollGreater() shocktable 171}}The character is so affected that he begins to see strange and terrible visions as his hold on reality shatters. The character suffers the effects of **“Acute Hallucinations”** for {{xd10}} **Rounds**. After the hallucinations fade, the character will take **all Tests with a –20 penalty while the encounter lasts**. The character gains {{xd10}} **Insanity Points** and takes {{d10}} points of **permanent Willpower damage**.{{/rollGreater() shocktable 171}}
+                <div class="sheet-desc">
+                    {{#rollLess() d100 testtarget }}**Success** &#9989;{{/rollLess() d100 testtarget }}
+                    {{#rollTotal() d100 testtarget }}**Success** &#9989;{{/rollTotal() d100 testtarget }}
+                    {{#rollGreater() d100 testtarget }}**Failure** &#10060;<br><br>**Table Result** {{shocktable}}<br>
+                        {{#rollBetween() shocktable 1 20}}The character is badly startled. He may only take a **single Half Action** in his next Turn, but afterwards he may act normally.{{/rollBetween() shocktable 1 20}}
+                        {{#rollBetween() shocktable 21 40}}Fear grips the character and he begins to shake and tremble. He takes a **–10 penalty on all Tests for the rest of the encounter unless he can snap out of it**.{{/rollBetween() shocktable 21 40}}
+                        {{#rollBetween() shocktable 41 60}}Reeling with shock, the character backs away from the thing that confronts them. The character **cannot willingly approach the object of his fear**, but may otherwise act normally, with a **–10 penalty on all Tests** until the end of the encounter. The character gains **1 Insanity Point**.{{/rollBetween() shocktable 41 60}}
+                        {{#rollBetween() shocktable 61 80}}The character is frozen by terror. The character may take **no Actions until he snaps out of it**. After snapping out of it, the character will make **all Tests with a –10 penalty for the rest of the encounter**. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 61 80}}
+                        {{#rollBetween() shocktable 81 100}}Panic grips the character. He must **flee the source of his fear**, if able, as fast as he can, and if prevented from doing so, he may only take **Half Actions** and takes a **–20 penalty to all Tests**. The character gains {{d5}} **Insanity Points**. Once away from the danger, he must successfully **snap out of it** to regain control.{{/rollBetween() shocktable 81 100}}
+                        {{#rollBetween() shocktable 101 120}}Fainting dead away, the character keels over and remains **unconscious for** {{d5}} **Rounds**. Once he regain consciousness, he is still shaken and takes **all Tests with a –10 penalty until the end of the encounter**. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 101 120}}
+                        {{#rollBetween() shocktable 121 130}}Totally overwhelmed, the character screams and vomits uncontrollably for {{d5}} **Rounds**. During this time he is **helpless**, may do nothing and drop anything he is holding. Afterwards, until the end of the encounter, the character may only take a **single Half Action each Turn until he can rest**. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 121 130}}
+                        {{#rollBetween() shocktable 131 140}}The character laughs hysterically and **randomly attacks anything near him** in a manic frenzy, firing wildly or using whatever weapon he has in hand. This effect lasts until the character **snaps out of it**, or until he is knocked unconscious. The character gains {{d5}} **Insanity Points**.{{/rollBetween() shocktable 131 140}}
+                        {{#rollBetween() shocktable 141 160}}The character **falls to the ground for** {{xd5}} Rounds** sobbing, babbling, and tearing at his own flesh, and may do nothing. Even after he returns to his senses, he is a complete mess and takes a **–20 penalty on all Tests until the end of the encounter**. The character gains {{xd5}} **Insanity Points**.{{/rollBetween() shocktable 141 160}}
+                        {{#rollBetween() shocktable 161 170}}The character’s mind snaps and he becomes **catatonic for** {{d5}} **hours** and may not be roused. The character gains {{d10}} **Insanity Points**.{{/rollBetween() shocktable 161 170}}
+                        {{#rollTotal() shocktable 171}}The character is so affected that he begins to see strange and terrible visions as his hold on reality shatters. The character suffers the effects of **“Acute Hallucinations”** for {{xd10}} **Rounds**. After the hallucinations fade, the character will take **all Tests with a –20 penalty while the encounter lasts**. The character gains {{xd10}} **Insanity Points** and takes {{d10}} points of **permanent Willpower damage**.{{/rollTotal() shocktable 171}}
+                        {{#rollGreater() shocktable 171}}The character is so affected that he begins to see strange and terrible visions as his hold on reality shatters. The character suffers the effects of **“Acute Hallucinations”** for {{xd10}} **Rounds**. After the hallucinations fade, the character will take **all Tests with a –20 penalty while the encounter lasts**. The character gains {{xd10}} **Insanity Points** and takes {{d10}} points of **permanent Willpower damage**.{{/rollGreater() shocktable 171}}
+                    {{/rollGreater() d100 testtarget }}
                 </div>
             {{/shocktable}}
         <!--section for trauma table -->
             {{#traumatable}}
-                <div class="sheet-desc">{{traumatable}}<br>
-                    {{#rollBetween() traumatable 1 40}}The character becomes withdrawn and quiet. The character takes a **–10 penalty to all Fellowship-based Tests**. This lasts for {{xd10}} **hours**.{{/rollBetween() traumatable 1 40}}
-                    {{#rollBetween() traumatable 41 70}}The character must compulsively perform an action such as fevered praying, frantically cleaning a weapon, reciting verse, and so on, and pays little attention to anything else. **All Tests that are based on Intelligence, Fellowship, or Perception suffer a –10 penalty**. This effect lasts for {{xd10}} **hours**.{{/rollBetween() traumatable 41 70}}
-                    {{#rollBetween() traumatable 71 100}}The character is constantly fearful, seeing danger everywhere, and is extremely jumpy. The character gains a **+10 bonus to all Perception based Tests and a –10 penalty to his Willpower for the next** {{d5}} **days**.{{/rollBetween() traumatable 71 100}}
-                    {{#rollBetween() traumatable 101 120}}The character suffers from a temporary **severe phobia**. This effect lasts for {{d5}} **days**.{{/rollBetween() traumatable 101 120}}
-                    {{#rollBetween() traumatable 121 130}}The character reacts to the slightest stress or pressure by becoming extremely agitated. **When performing any task that involves a Test**, the character must first pass a **Challenging (+0) Willpower Test or suffer a –10 penalty to the test**. If the character gets into combat, **all Tests during combat suffer a –10 penalty**. This effect lasts for {{d5}} **days**.{{/rollBetween() traumatable 121 130}}
-                    {{#rollBetween() traumatable 131 140}}The character suffers vivid and extreme nightmares whenever he tries to sleep. **The next day and for the next** {{d10}} **days**, the character will be exhausted by lack of sleep and gains **1 level of fatigue**. This effect lasts for {{d5}} **days**.{{/rollBetween() traumatable 131 140}}
-                    {{#rollBetween() traumatable 141 150}}The character is struck dumb and is **unable to speak**. This lasts for {{d5}} **days**.{{/rollBetween() traumatable 141 150}}
-                    {{#rollBetween() traumatable 151 160}}Extremely distressed and unfocused, the character refuses to eat or drink and looks in a terrible state. **The character takes a –10 penalty to all Characteristics** (no Characteristic can be reduced below 1) for {{d10}} **days**.{{/rollBetween() traumatable 151 160}}
-                    {{#rollBetween() traumatable 161 170}}The character temporarily becomes hysterically **blind or deaf**. This effect lasts for {{d10}} **days**.{{/rollBetween() traumatable 161 170}}
-                    {{#rollTotal() traumatable 171}}The character becomes completely traumatised and virtually unresponsive. **He can’t initiate actions but may be gently led**. This effect lasts for {{d10}} **days**.{{/rollTotal() traumatable 171}}
-                    {{#rollGreater() traumatable 171}}The character becomes completely traumatised and virtually unresponsive. **He can’t initiate actions but may be gently led**. This effect lasts for {{d10}} **days**.{{/rollGreater() traumatable 171}}
+                <div class="sheet-desc">
+                    {{#rollLess() d100 testtarget }}**Success** &#9989;{{/rollLess() d100 testtarget }}
+                    {{#rollTotal() d100 testtarget }}**Success** &#9989;{{/rollTotal() d100 testtarget }}
+                    {{#rollGreater() d100 testtarget }}**Failure** &#10060;<br><br>**Table Result** {{traumatable}}<br>
+                        {{#rollBetween() traumatable 1 40}}The character becomes withdrawn and quiet. The character takes a **–10 penalty to all Fellowship-based Tests**. This lasts for {{xd10}} **hours**.{{/rollBetween() traumatable 1 40}}
+                        {{#rollBetween() traumatable 41 70}}The character must compulsively perform an action such as fevered praying, frantically cleaning a weapon, reciting verse, and so on, and pays little attention to anything else. **All Tests that are based on Intelligence, Fellowship, or Perception suffer a –10 penalty**. This effect lasts for {{xd10}} **hours**.{{/rollBetween() traumatable 41 70}}
+                        {{#rollBetween() traumatable 71 100}}The character is constantly fearful, seeing danger everywhere, and is extremely jumpy. The character gains a **+10 bonus to all Perception based Tests and a –10 penalty to his Willpower for the next** {{d5}} **days**.{{/rollBetween() traumatable 71 100}}
+                        {{#rollBetween() traumatable 101 120}}The character suffers from a temporary **severe phobia**. This effect lasts for {{d5}} **days**.{{/rollBetween() traumatable 101 120}}
+                        {{#rollBetween() traumatable 121 130}}The character reacts to the slightest stress or pressure by becoming extremely agitated. **When performing any task that involves a Test**, the character must first pass a **Challenging (+0) Willpower Test or suffer a –10 penalty to the test**. If the character gets into combat, **all Tests during combat suffer a –10 penalty**. This effect lasts for {{d5}} **days**.{{/rollBetween() traumatable 121 130}}
+                        {{#rollBetween() traumatable 131 140}}The character suffers vivid and extreme nightmares whenever he tries to sleep. **The next day and for the next** {{d10}} **days**, the character will be exhausted by lack of sleep and gains **1 level of fatigue**. This effect lasts for {{d5}} **days**.{{/rollBetween() traumatable 131 140}}
+                        {{#rollBetween() traumatable 141 150}}The character is struck dumb and is **unable to speak**. This lasts for {{d5}} **days**.{{/rollBetween() traumatable 141 150}}
+                        {{#rollBetween() traumatable 151 160}}Extremely distressed and unfocused, the character refuses to eat or drink and looks in a terrible state. **The character takes a –10 penalty to all Characteristics** (no Characteristic can be reduced below 1) for {{d10}} **days**.{{/rollBetween() traumatable 151 160}}
+                        {{#rollBetween() traumatable 161 170}}The character temporarily becomes hysterically **blind or deaf**. This effect lasts for {{d10}} **days**.{{/rollBetween() traumatable 161 170}}
+                        {{#rollTotal() traumatable 171}}The character becomes completely traumatised and virtually unresponsive. **He can’t initiate actions but may be gently led**. This effect lasts for {{d10}} **days**.{{/rollTotal() traumatable 171}}
+                        {{#rollGreater() traumatable 171}}The character becomes completely traumatised and virtually unresponsive. **He can’t initiate actions but may be gently led**. This effect lasts for {{d10}} **days**.{{/rollGreater() traumatable 171}}
+                    {{/rollGreater() d100 testtarget }}
                 </div>
             {{/traumatable}}
         <!--section for malignancy table -->
diff --git a/Rogue Trader Improved/sheet.json b/Rogue Trader Improved/sheet.json
index 9734f50050..4917d5b5ab 100644
--- a/Rogue Trader Improved/sheet.json	
+++ b/Rogue Trader Improved/sheet.json	
@@ -4,6 +4,6 @@
     "authors": "Mago",
     "roll20userid": "986445",
     "preview": "RTimprovedPreview.png",
-    "instructions": "Character Sheet for Warhammer 40k Rogue Trader pen & paper RPG originally published by Fantasy Flight Games (2009) now published by Cubicle 7.\n\n* Sheet functions are described with INFO TOOLTIPS hover over fields and buttons to see them.\n\n* For full documentation and latest updates visit [Rogue Trader Improved Wiki](https://wiki.roll20.net/Rogue_trader_improved) \n\n* If you have any feedback, send a private message to [Author Mago](https://app.roll20.net/users/986445/mago) \n\n* -Revision 7- March 2025",
+    "instructions": "Character Sheet for Warhammer 40k Rogue Trader pen & paper RPG originally published by Fantasy Flight Games (2009) now published by Cubicle 7.\n\n* Sheet functions are described with INFO TOOLTIPS within the Question Mark icons.\n\n* For full documentation and latest updates visit [Rogue Trader Improved Wiki](https://wiki.roll20.net/Rogue_trader_improved) \n\n* If you have any feedback, send a private message to [Author Mago](https://app.roll20.net/users/986445/mago) \n\n* Rev-8 Sep. 2025",
     "legacy": false
 }
\ No newline at end of file
diff --git a/Rogue Trader Improved/translation.json b/Rogue Trader Improved/translation.json
new file mode 100644
index 0000000000..80f8eebd57
--- /dev/null
+++ b/Rogue Trader Improved/translation.json	
@@ -0,0 +1,18 @@
+{
+	"gmroll": "GM Roll",
+	"fatigue": "Fatigue",
+	"charname": "Character Name",
+	"playername": "Player Name",
+	"name": "Name",
+	"description": "Description",
+	"mastery": "Mastery",
+	"special": "Special",
+	"armour-points-acronim": "AP",
+	"option-no": "No",
+	"option-yes": "Yes",
+	"traits": "Traits",
+	"encumbered": "Encumbered",
+	"CrewTest": "Crew Test",
+	"crippled": "Crippled",
+	"crit-table": "Critical Hit Table"
+}
\ No newline at end of file